Commit 0b8423a0 authored by yinjiacheng's avatar yinjiacheng

fix SHQCLIENT-1546 点击自提点联系人判断手机号是否为空

parent adb984b1
...@@ -45,6 +45,7 @@ class OrderPickupPointInfoView @JvmOverloads constructor(context: Context, attrs ...@@ -45,6 +45,7 @@ class OrderPickupPointInfoView @JvmOverloads constructor(context: Context, attrs
private fun registerUIEvent() { private fun registerUIEvent() {
// 监听点击联系自提点 // 监听点击联系自提点
vm.contractPickupPoint.observe(context as LifecycleOwner, { phone -> vm.contractPickupPoint.observe(context as LifecycleOwner, { phone ->
if (phone.isNullOrEmpty()) return@observe
// 先判断权限 // 先判断权限
RxPermissions(context as FragmentActivity).request(Manifest.permission.CALL_PHONE).subscribe { granted -> RxPermissions(context as FragmentActivity).request(Manifest.permission.CALL_PHONE).subscribe { granted ->
if (granted) { if (granted) {
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
<import type="android.view.View" /> <import type="android.view.View" />
<import type="android.text.TextUtils" />
<variable <variable
name="vm" name="vm"
type="com.yidian.shenghuoquan.buserorder.viewmodel.OrderPickupPointViewModel" /> type="com.yidian.shenghuoquan.buserorder.viewmodel.OrderPickupPointViewModel" />
...@@ -88,7 +90,7 @@ ...@@ -88,7 +90,7 @@
android:text="@{@string/pickup_point_contract(data.contactName, data.phone)}" android:text="@{@string/pickup_point_contract(data.contactName, data.phone)}"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="@dimen/sp14" android:textSize="@dimen/sp14"
android:visibility="@{data != null ? View.VISIBLE : View.GONE}" android:visibility="@{!TextUtils.isEmpty(data.contactName) || !TextUtils.isEmpty(data.phone) ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_pickup_point_name" app:layout_constraintStart_toStartOf="@id/tv_pickup_point_name"
app:layout_constraintTop_toBottomOf="@id/tv_pickup_point_address" app:layout_constraintTop_toBottomOf="@id/tv_pickup_point_address"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment