From 36078df8b6d9c142c0c88ec0ab74c00bb1cc05c6 Mon Sep 17 00:00:00 2001 From: lijia Date: Mon, 20 May 2024 16:43:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B8=E8=B4=A7=E5=9C=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../push/TagAliasOperatorHelper.java | 4 ++-- .../ui/waybill/activity/WaybillAppraiseActivity.kt | 6 +++--- .../ui/waybill/activity/WaybillUnlLoadActivity.kt | 6 +++--- .../ui/waybill/activity/WaybillUpPicActivity.kt | 3 +++ app/src/main/res/layout/activity_waybill_unload.xml | 4 ++-- app/src/main/res/layout/activity_waybill_uppic.xml | 1 + 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java index 472dc4b..757567c 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java @@ -91,11 +91,11 @@ public class TagAliasOperatorHelper { init(context); if(jPushMessage.getErrorCode() == 0){ Log.i(TAG,"action - set mobile number Success,sequence:"+sequence); - ToastUtils.showToast(context,"modify success"); +// ToastUtils.showToast(context,"modify success"); }else{ String logs = "Failed to set mobile number, errorCode:" + jPushMessage.getErrorCode(); Log.e(TAG, logs); - ToastUtils.showToast(context,logs); +// ToastUtils.showToast(context,logs); // MMKV.defaultMMKV().putString(AdvActivity.MN_DATA, ""); } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillAppraiseActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillAppraiseActivity.kt index d2a7972..67f716d 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillAppraiseActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillAppraiseActivity.kt @@ -128,7 +128,7 @@ class WaybillAppraiseActivity : BaseActivity() { if (::gdLatLng.isInitialized) { distance = LocationUtils.getInstance().getDistance( gdLatLng, - loadPos + unLoadPos ) + "km" } var goods = @@ -277,10 +277,10 @@ class WaybillAppraiseActivity : BaseActivity() { it.getLongitude()//经 度 it.getLatitude()//纬 度 gdLatLng = LatLng(it.latitude, it.longitude) - if (::loadPos.isInitialized) { + if (::unLoadPos.isInitialized) { var distance = LocationUtils.getInstance().getDistance( gdLatLng, - loadPos + unLoadPos ) + "km" binding.tvLoadDis.text = distance } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUnlLoadActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUnlLoadActivity.kt index 6f5bc9c..e5c5e93 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUnlLoadActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUnlLoadActivity.kt @@ -136,7 +136,7 @@ class WaybillUnlLoadActivity : BaseActivity() { if (::gdLatLng.isInitialized) { distance = LocationUtils.getInstance().getDistance( gdLatLng, - loadPos + unLoadPos ) + "km" } var goods = @@ -290,10 +290,10 @@ class WaybillUnlLoadActivity : BaseActivity() { it.getLongitude()//经 度 it.getLatitude()//纬 度 gdLatLng = LatLng(it.latitude, it.longitude) - if (::loadPos.isInitialized) { + if (::unLoadPos.isInitialized) { var distance = LocationUtils.getInstance().getDistance( gdLatLng, - loadPos + unLoadPos ) + "km" binding.tvLoadDis.text = distance } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUpPicActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUpPicActivity.kt index 9bb0480..5748590 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUpPicActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillUpPicActivity.kt @@ -82,6 +82,9 @@ class WaybillUpPicActivity : BaseActivity() { } } binding.run { + ivBack.setOnClickListener { + finish() + } tvPosi.setOnClickListener { getLocation() } diff --git a/app/src/main/res/layout/activity_waybill_unload.xml b/app/src/main/res/layout/activity_waybill_unload.xml index 72bba18..acebad2 100644 --- a/app/src/main/res/layout/activity_waybill_unload.xml +++ b/app/src/main/res/layout/activity_waybill_unload.xml @@ -251,7 +251,7 @@ android:layout_below="@+id/tvLoadDis" android:layout_marginTop="@dimen/dp_5" android:gravity="center" - android:text="距装货地约" + android:text="距卸货地约" android:textColor="@color/color_9" android:textSize="@dimen/sp_12" android:textStyle="bold" /> @@ -275,7 +275,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_6" - android:text="去装货地" + android:text="去卸货地" android:textColor="@color/main_blue" android:textSize="@dimen/dp_9" /> diff --git a/app/src/main/res/layout/activity_waybill_uppic.xml b/app/src/main/res/layout/activity_waybill_uppic.xml index 6aaa581..e880a86 100644 --- a/app/src/main/res/layout/activity_waybill_uppic.xml +++ b/app/src/main/res/layout/activity_waybill_uppic.xml @@ -24,6 +24,7 @@ android:textSize="@dimen/sp_17" />