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 8bc5065349..0000000000 Binary files a/OCH/shuttle/driver_unmanned/src/main/res/drawable-nodpi/unmanned_bus_open_qr.png and /dev/null differ