From 713f85184b73e02e95007e9ecd8d48615f08affa Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 9 Jun 2022 13:50:16 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E6=94=B9?= =?UTF-8?q?=E4=B8=BA0=C2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/hmi/ui/widget/SteeringWheelView.java | 4 ++-- .../src/main/res/layout/hmi_steering_wheel_taxi.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java index 83d493d085..f82b4e3db7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java @@ -78,11 +78,11 @@ public class SteeringWheelView extends ConstraintLayout { steeringCircularV = findViewById(R.id.steering_circular); steeringCircularV.setBackWidth(8); steeringCircularV.setBackColor(R.color.hmi_light_back_bg); - steeringCircularV.setProgress((int) (270 * 100) / 360, 20); + steeringCircularV.setProgress((int) (0 * 100) / 360, 20); steeringCircularV.setProgColor(R.color.hmi_light_blue, R.color.hmi_dark_blue); if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { steeringCircularVAlpha = findViewById(R.id.steering_circular_alpha); - steeringCircularVAlpha.setProgress((int) (270 * 100) / 360, 20); + steeringCircularVAlpha.setProgress((int) (0 * 100) / 360, 20); steeringCircularV.setProgColor(R.color.hmi_dark_blue, R.color.hmi_light_blue); steeringCircularVAlpha.setBackWidth(8); steeringCircularVAlpha.setBackColor(R.color.hmi_clear_00); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml index eb4ea8ea6b..9fe0f33c09 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml @@ -24,7 +24,7 @@ android:layout_marginTop="@dimen/dp_130" android:layout_marginRight="-10px" android:gravity="right" - android:text="180°" + android:text="0°" android:textColor="#FFFFFFFF" android:textSize="@dimen/dp_37" android:visibility="invisible" @@ -38,7 +38,7 @@ android:layout_marginLeft="-10px" android:layout_marginTop="@dimen/dp_130" android:gravity="left" - android:text="180°" + android:text="0°" android:textColor="#FFFFFFFF" android:textSize="@dimen/dp_37" app:layout_constraintLeft_toRightOf="@+id/autopilot_iv" From d293c92b0ffd5892affc13a11a8d742f5b67f4f9 Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 9 Jun 2022 14:27:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[=E7=8A=B6=E6=80=81=E6=A0=8F]=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E5=85=A8=E9=83=A8=E6=94=B9=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [RouterOpt]测试代码 --- .../status/flow/nets/NetsImpl.kt | 2 +- .../mogo_core_function_devatools/status/ui/StatusView.kt | 3 --- .../status/ui/adapter/StatusAdapter.kt | 8 ++++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt index a7e6c9ebdb..4ea16362fb 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt @@ -94,7 +94,7 @@ internal class NetsImpl(ctx: Context): IFlow(ctx) { private fun checkAndSend() { val connectionInfo = wifiMgr.connectionInfo val enabled = isNetConnected() - val name = if (isLocationEnabled()) connectionInfo.ssid?.replace(Regex("[\\W]"), "") else "Wi-Fi" + val name = if (isLocationEnabled()) connectionInfo.ssid?.replace(Regex("[\\W]"), "") else "WI-FI" loopCheckAndSendJob?.safeCancel() launch(Dispatchers.Default) { delay(1000); checkAndSend() }.also { loopCheckAndSendJob = it } var tr = 0 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt index 647483f81b..7c9013a2dd 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt @@ -5,7 +5,6 @@ import android.content.* import android.graphics.* import android.graphics.drawable.* import android.transition.* -import android.util.* import android.view.* import androidx.appcompat.widget.* import androidx.constraintlayout.widget.* @@ -80,8 +79,6 @@ internal class StatusView(private val model: StatusModel, ctx: Context): Constra dot.visibility = View.INVISIBLE } val old = adapter.data - Log.d(TAG, "receive update --new - data: ${data.second.joinToString(",")}") - Log.d(TAG, "receive update --old - data: ${old.joinToString(",")}") val result = DiffUtil.calculateDiff(StatusDiffCallback(old, data.second)) adapter.data = data.second result.dispatchUpdatesTo(adapter) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt index 727fb1d199..6a1085ed3d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt @@ -50,15 +50,15 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList): Rec } else { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_can_disable) } - tv.text = "Can" + tv.text = "CAN" } is NetStatus -> { if (status.enabled) { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_net_enable) - tv.text = status.name ?: "Wi-Fi" + tv.text = status.name ?: "WI-FI" } else { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_net_disable) - tv.text = "Wi-Fi" + tv.text = "WI-FI" } } is GpsStatus -> { @@ -67,7 +67,7 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList): Rec } else { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_gps_disable) } - tv.text = "Gps" + tv.text = "GPS" } is TracingStatus -> { when(status.state) { From 7658e3a5466368045943833cedd14598385f79d1 Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 9 Jun 2022 14:27:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[=E7=8A=B6=E6=80=81=E6=A0=8F]=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E5=85=A8=E9=83=A8=E6=94=B9=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [RouterOpt]测试代码 --- .../status/flow/nets/NetsImpl.kt | 2 +- .../mogo_core_function_devatools/status/ui/StatusView.kt | 3 --- .../status/ui/adapter/StatusAdapter.kt | 8 ++++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt index a7e6c9ebdb..4ea16362fb 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt @@ -94,7 +94,7 @@ internal class NetsImpl(ctx: Context): IFlow(ctx) { private fun checkAndSend() { val connectionInfo = wifiMgr.connectionInfo val enabled = isNetConnected() - val name = if (isLocationEnabled()) connectionInfo.ssid?.replace(Regex("[\\W]"), "") else "Wi-Fi" + val name = if (isLocationEnabled()) connectionInfo.ssid?.replace(Regex("[\\W]"), "") else "WI-FI" loopCheckAndSendJob?.safeCancel() launch(Dispatchers.Default) { delay(1000); checkAndSend() }.also { loopCheckAndSendJob = it } var tr = 0 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt index 647483f81b..7c9013a2dd 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt @@ -5,7 +5,6 @@ import android.content.* import android.graphics.* import android.graphics.drawable.* import android.transition.* -import android.util.* import android.view.* import androidx.appcompat.widget.* import androidx.constraintlayout.widget.* @@ -80,8 +79,6 @@ internal class StatusView(private val model: StatusModel, ctx: Context): Constra dot.visibility = View.INVISIBLE } val old = adapter.data - Log.d(TAG, "receive update --new - data: ${data.second.joinToString(",")}") - Log.d(TAG, "receive update --old - data: ${old.joinToString(",")}") val result = DiffUtil.calculateDiff(StatusDiffCallback(old, data.second)) adapter.data = data.second result.dispatchUpdatesTo(adapter) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt index 727fb1d199..6a1085ed3d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt @@ -50,15 +50,15 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList): Rec } else { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_can_disable) } - tv.text = "Can" + tv.text = "CAN" } is NetStatus -> { if (status.enabled) { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_net_enable) - tv.text = status.name ?: "Wi-Fi" + tv.text = status.name ?: "WI-FI" } else { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_net_disable) - tv.text = "Wi-Fi" + tv.text = "WI-FI" } } is GpsStatus -> { @@ -67,7 +67,7 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList): Rec } else { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_gps_disable) } - tv.text = "Gps" + tv.text = "GPS" } is TracingStatus -> { when(status.state) { From 0f9adfcd2f2390fd8c9d19c976ba5124b7e46b23 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 9 Jun 2022 15:46:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[taxi=20280]=20taxi=20=E5=81=B6=E7=8E=B0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=B8=83=E5=B1=80=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/TaxiBeingServerdOrdersFragment.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java index 08784db7bb..cb44bb6d29 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java @@ -500,15 +500,20 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement */ public void isHaveBeingOrder(boolean being) { CallerLogger.INSTANCE.d(M_TAXI + TAG, "isHaveBeingOrder = " + being); - if (being) { - mNoDataView.setVisibility(View.GONE); - mBeingOrderLayout.setVisibility(View.VISIBLE); - mTaxiFragment.changeOperationViewVisible(View.GONE); - } else { - mNoDataView.setVisibility(View.VISIBLE); - mNoDatasTv.setText("暂无进行中订单"); - mBeingOrderLayout.setVisibility(View.GONE); - mTaxiFragment.changeOperationViewVisible(View.VISIBLE); + try { + if (being) { + mNoDataView.setVisibility(View.GONE); + mBeingOrderLayout.setVisibility(View.VISIBLE); + mTaxiFragment.changeOperationViewVisible(View.GONE); + } else { + mNoDataView.setVisibility(View.VISIBLE); + mNoDatasTv.setText("暂无进行中订单"); + mBeingOrderLayout.setVisibility(View.GONE); + mTaxiFragment.changeOperationViewVisible(View.VISIBLE); + } + + }catch (NullPointerException e){ //可能会出现订单信息已经轮询回来，但进行中页面控件还未初始化完成的情况 + TaxiModel.getInstance().clearCurrentOCHOrder(); } } From 218f098375b5694ff81913237e8731aed1cf057b Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Thu, 9 Jun 2022 19:23:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=B0=B4=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 水印只在司机端显示，在乘客端不再显示 --- .../function/hmi/ui/widget/VersionNameView.kt | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt index 6408ce2e05..011782035c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt @@ -6,16 +6,18 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.widget.LinearLayout import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.AppUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.view_version_name.view.* /** * @author XuXinChao - * @description APP版本号+MAP版本号水印显示 + * @description APP版本号+MAP版本号水印显示(只在司机屏展示) * @since: 2022/5/20 */ class VersionNameView @JvmOverloads constructor( @@ -36,8 +38,11 @@ class VersionNameView @JvmOverloads constructor( } private fun initView(){ - showCurrentPadVersion() - showCurrentMapVersion() + //版本水印只在司机端展示 + if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ + showCurrentPadVersion() + showCurrentMapVersion() + } } /** @@ -66,12 +71,18 @@ class VersionNameView @JvmOverloads constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() - CallerAutoPilotStatusListenerManager.addListener(TAG, this) + //版本水印只在司机端展示 + if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ + CallerAutoPilotStatusListenerManager.addListener(TAG, this) + } } override fun onDetachedFromWindow() { super.onDetachedFromWindow() - CallerAutoPilotStatusListenerManager.removeListener(TAG) + //版本水印只在司机端展示 + if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ + CallerAutoPilotStatusListenerManager.removeListener(TAG) + } } override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {