From c38f29e56f85f57c691c7b8802b1af72630ffad4 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 18 Apr 2023 11:15:28 +0800
Subject: [PATCH] =?UTF-8?q?[3.2.0]=20m1=20=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=91=E5=AE=9A=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/charter/fragment/DriverM1Fragment.kt  | 30 +++++++++++++++++++
 .../function/hmi/ui/tools/BusOperationView.kt |  3 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
index 57179f887d..9dffaf103c 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
@@ -1,5 +1,6 @@
 package com.magic.mogo.och.charter.fragment
 
+import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.view.View.GONE
@@ -12,15 +13,20 @@ import com.magic.mogo.och.charter.constant.CharterConst.Companion.LOOP_PERIOD_60
 import com.magic.mogo.och.charter.net.login.LoginDriverM1Impl
 import com.magic.mogo.och.charter.presenter.DriverM1Presenter
 import com.magic.mogo.och.charter.view.SlidePanelView
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.temp.EventLogout
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.och.common.module.biz.constant.OchCommonConst
 import com.mogo.och.common.module.biz.provider.LoginService
 import com.mogo.och.common.module.utils.DateTimeUtil
+import com.mogo.och.common.module.utils.createQRCodeWithPicture
+import com.mogo.och.common.module.wigets.BindQRCodeDialog
 import com.mogo.och.common.module.wigets.OCHCommitDialog
 import kotlinx.android.synthetic.driverm1.bus_no_line_view.*
 import kotlinx.android.synthetic.driverm1.fragment_driver_m1.*
+import me.jessyan.autosize.utils.AutoSizeUtils
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
@@ -104,6 +110,30 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
         if (eventLogout.messgae == EventLogout.LOGOUT_TYPE) {
             d(SceneConstant.M_CHARTER_D + TAG, "changeOverview Event消息去登出")
             mPresenter?.logout()
+        }else if (eventLogout.messgae == EventLogout.SHOW_QR_TYPE){
+            //显示二维码
+            d(SceneConstant.M_BUS + TAG, "changeOverview Event qrcode，sn = "
+                        + MoGoAiCloudClientConfig.getInstance().sn)
+            val qrUrl = String.format(FunctionBuildConfig.urlJson.bindDriverQRUrl,
+                MoGoAiCloudClientConfig.getInstance().sn)
+
+            val bmQr = createQRCodeWithPicture(
+                BitmapFactory.decodeResource(resources, R.drawable.icon_qr_center_logo),
+                qrUrl,
+                AutoSizeUtils.dp2px(context, 340f),
+                AutoSizeUtils.dp2px(context, 340f),
+                true
+            )
+            if (bmQr != null) {
+                val builder = BindQRCodeDialog.Builder()
+                context?.let {
+                    builder.title(getString(R.string.bind_driver_qr_title))
+                        .cancelStr(getString(R.string.qr_cancel))
+                        .qrBm(bmQr).build(it)
+                }!!.show()
+            } else {
+                d(SceneConstant.M_BUS + TAG, "bmQr = null ")
+            }
         }
     }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt
index a77c2a1970..39982a3752 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt
@@ -47,7 +47,8 @@ class BusOperationView @JvmOverloads constructor(
             ivGotoPersonalInfo.visibility = GONE
         }
 
-        if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
+        if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode) ||
+            AppIdentityModeUtils.isCharter(FunctionBuildConfig.appIdentityMode)) {
             actvAccountQR.visibility = VISIBLE
         }else{
             actvAccountQR.visibility = GONE