From c7741d3d535a21e1fef6db856f2575d18fcc40e8 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Tue, 3 Feb 2026 16:25:58 +0800 Subject: [PATCH] =?UTF-8?q?[8.4.0]=20=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unmanned/ShuttleDriverUnmannedProvider.kt | 8 +- .../com/mogo/och/unmanned/ui/qr/QrOpenView.kt | 80 ------------------ .../drawable-nodpi/unmanned_bus_open_qr.png | Bin 2295 -> 0 bytes 3 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ui/qr/QrOpenView.kt delete mode 100644 OCH/shuttle/driver_unmanned/src/main/res/drawable-nodpi/unmanned_bus_open_qr.png diff --git a/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ShuttleDriverUnmannedProvider.kt b/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ShuttleDriverUnmannedProvider.kt index 56e5d4c949..18d17f4091 100644 --- a/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ShuttleDriverUnmannedProvider.kt +++ b/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ShuttleDriverUnmannedProvider.kt @@ -20,7 +20,6 @@ import com.mogo.och.unmanned.repository.db.repository.TaskDb import com.mogo.och.unmanned.repository.db.repository.TaskSiteDb import com.mogo.och.unmanned.repository.db.repository.WriteOffDb import com.mogo.och.unmanned.ui.fragment.ShuttleFragment -import com.mogo.och.unmanned.ui.qr.QrOpenView import com.mogo.och.unmanned.util.BusAnalyticsManager import com.mogo.och.unmanned.util.BusTrajectoryManager @@ -74,12 +73,7 @@ class ShuttleDriverUnmannedProvider : CommonServiceImpl() { } override fun createOchBindQRCodeView(context: Context?): View? { - if (FunctionBuildConfig.urlJson.bindDriverQRUrl.isNullOrEmpty()) { - return null - } - return context?.let { - QrOpenView(it) - } + return null } override fun createStartAutopilotView(context: Context?): View? { diff --git a/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ui/qr/QrOpenView.kt b/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ui/qr/QrOpenView.kt deleted file mode 100644 index f8ecd2be48..0000000000 --- a/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ui/qr/QrOpenView.kt +++ /dev/null @@ -1,80 +0,0 @@ -package com.mogo.och.unmanned.ui.qr - -import android.content.Context -import android.util.AttributeSet -import androidx.appcompat.widget.AppCompatImageView -import com.mogo.commons.storage.SharedPrefsMgr -import com.mogo.eagle.core.data.config.FunctionBuildConfig -import com.mogo.eagle.core.utilcode.kotlin.onClick -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS -import com.mogo.eagle.core.utilcode.util.ActivityUtils -import com.mogo.eagle.core.utilcode.util.ImageUtils -import com.mogo.och.common.module.utils.ResourcesUtils -import com.mogo.och.common.module.utils.createQRCodeWithPicture -import com.mogo.och.common.module.wigets.BindQRCodeDialog -import com.mogo.och.shuttle.unmanned.R -import com.mogo.skin.utils.SkinResources -import me.jessyan.autosize.utils.AutoSizeUtils - -class QrOpenView : AppCompatImageView { - - private val TAG = M_BUS + "QrOpenView" - - constructor(context: Context) : super(context) - - constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) - - constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super( - context, - attributeSet, - defStyleAttr - ) - - private fun initView() { - setImageResource(R.drawable.unmanned_bus_open_qr) - } - - override fun onAttachedToWindow() { - super.onAttachedToWindow() - - onClick { - d( - TAG, "changeOverview Event qrcodeļ¼Œsn = " - + SharedPrefsMgr.getInstance().sn - ) - val qrUrl = String.format( - FunctionBuildConfig.urlJson.bindDriverQRUrl, - SharedPrefsMgr.getInstance().sn - ) - val qrCenterLogoDrawable = - SkinResources.getInstance().getDrawable(R.drawable.icon_qr_center_logo) - val qrCenterLogoBitmap = ImageUtils.drawable2Bitmap(qrCenterLogoDrawable) - - val bmQr = createQRCodeWithPicture( - qrCenterLogoBitmap, - qrUrl, AutoSizeUtils.dp2px(context, 340f), - AutoSizeUtils.dp2px(context, 340f), true - ) - if (bmQr != null) { - val builder = BindQRCodeDialog.Builder() - builder.title(ResourcesUtils.getString(R.string.bind_driver_qr_title)) - .cancelStr(ResourcesUtils.getString(R.string.qr_cancel)) - .qrBm(bmQr).build(ActivityUtils.getTopActivity())!!.show() - } else { - d(TAG, "bmQr = null ") - } - } - } - - - init { - try { - initView() - } catch (e: Exception) { - e.printStackTrace() - } - } - - -} \ No newline at end of file diff --git a/OCH/shuttle/driver_unmanned/src/main/res/drawable-nodpi/unmanned_bus_open_qr.png b/OCH/shuttle/driver_unmanned/src/main/res/drawable-nodpi/unmanned_bus_open_qr.png deleted file mode 100644 index 8bc506534972159e115dc76d5261617576f805e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2295 zcmVPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91MxX-#1ONa40RR91MgRZ+0B$7!7ytkWVM#&iwDpna7dxOWcnKJxh^uuSu4b7>wv( zDs3=T@`AOrwA_Uu8ZnR`Rpp_3fU+tqQ^tEWH8uOS437XdiA*Cg<6$TbsqMnpK@|%+ zopoYN4bIKY9X8=XV&jsSAPKPP`p*)BpVFO_jRga4b-sqOV-Ty=g(T_;w-IDkIfP$$ zvAVkY3*u=%LqkI$whON1#2x%bDlTqqZOy^X4hY)JByz~DFxT3fo11Sy$(MwC2$vFO z5LU=6hA}INr~TyR<&C-(0x1via`sVgIYHJ&67B>$xO3-DSt_`CToc2ad)oNUzO0u&$PqPP?__26U?u6?OvBaB%<@9a3rI3KN5M9*WbZR-${@II-MX`gf6byIhF^Tjl4pfo6SHQ`nhtu+gGl@% zNoo)AYDj5I!aPSk45gftCr@t1F4@~9znD(22e8?xmmBSLO^irkz4AVWlrd};qWI?C z-riEbND=vNhmzE(udk0`*9MLyXOR?Vd*ife)2;^lQ1abAuANds0fxwa=DS3Cy!=*H zR-VC@gX!AismG+N^xsf_ToS|QoUEVVWt|v~81mH~gpbjVJJm9oPG_AMrc#X864(;HZvLoOo74;U}R5mRv>q7}2qaB8uu(Vp~p>no~iT3yR|D@WD^F0QpeO6J+ zWiZ_*XDF_h%YGTeu=u8~u1@3UWT8a?mI9oyZ< z#rTd0@nOO#cErb1Y22<|yJoZCn}Zy&bqM>;5c)8_A97xDJ~NC=(qR z82FXt!)YlO;saV4Uin?(x0)(u5Ic-P_w$v|I3>rwcDA73j|+QMUI=VaD~`gh7d4-dJfOp2^>?t}eB=B-DAh zQjn%`zow4(zP76ehrIzh+m5Z72X|)&ZF>V&@ zajKWaycO(;jvDmq)8x5AQP)EW1$RS=5HK@I(Il{T$k~{LWg;rOd}&}O;WxrDg6z^S zHoeQy>g9%T8JOvD-(w(P6H}~_Y4YkD8X6kcuV3$U?aO3Hs#q68cCM)~FHDXL(!T!} zmp$yd$H2)vlVNdeQb|e40*Cx`vpk&(c~R<`7?fP>hUAbJLsG006fq$$#C+n=h*Kv{ zoH*i;pKexQ#CVyNo}qQi2s6}H;$xnOUqMr|{7PGiVTf-*zc2S{kagBIF*v^;+uGU| zvuqcFRuZNn=nzId&oSkGzZkH{u@b{lVT+}XC)hPHqJ@LyU-&8aq%plpR$|fhT!@oNWi_SM$b{-p|QY;2qb|97Z(BJD)X(jYDZ(qpv4aArB}-x?$gHvK}%T+bIU9W3Re3woHlail8L(|-yvtvVhU(otSs-m7Ypzdgcde4ygCv=?IVOHO2N4RiPK zNsMShX^^)z#i*|^uG-dE?$*ey&5sGm4KVr`n+zwMHYdwX6zykdKMN