[6.8.4]

[fea] [all] [访客模式标识]
2024-12-26 17:31:22 +08:00
parent 434d781511
commit 75f557ed6d
12 changed files with 73 additions and 12 deletions
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonDialogStatus.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonDialogStatus.kt
@@ -176,8 +176,8 @@ class CommonDialogStatus: BaseFloatDialog, LifecycleObserver {
        var statusEnum: Status = Status.ask
        var titleStr:String = ""
        var tipsStr:String = ""
-        var confirmStr:String = ""
-        var cancelStr:String = ""
+        var confirmStr:String = ResourcesUtils.getString(R.string.confirm)
+        var cancelStr:String = ResourcesUtils.getString(R.string.cancel)
        var countDownValue: Int = 0
        var showClose:Boolean =false
        var cancelTextColor:Int = R.color.common_ffffffff
--- a/OCH/common/data/src/main/java/com/mogo/och/data/db/exception/DbException.kt
+++ b/OCH/common/data/src/main/java/com/mogo/och/data/db/exception/DbException.kt
@@ -3,7 +3,6 @@ package com.mogo.och.data.db.exception
 class DbException: RuntimeException {
    var code:Int = 0
    var msg:String = ""
-    constructor() : super()
    constructor(code:Int, message: String) : super("${code}_${message}"){
        this.code = code
        this.msg = message
--- a/OCH/facade/src/main/java/com/mogo/och/facade/view/OchCustomViewProvider.kt
+++ b/OCH/facade/src/main/java/com/mogo/och/facade/view/OchCustomViewProvider.kt
@@ -24,7 +24,6 @@ class OchCustomViewProvider : IOchCustomViewProvider {

    override fun init(context: Context?) {
        CallerLogger.d(TAG, "init")
-        getCommontService(context)
    }

    private fun getCommontService(context: Context?){
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt
@@ -39,7 +39,7 @@ object TaskSiteDb : IDbRepository {
        var startTime = System.currentTimeMillis()
        val querySites = SiteDb.querySiteByLineId(linId)?.distinctBy { it.siteId }
        if (querySites.isNullOrEmpty()) {
-            throw DbException("没有站点数据")
+            throw DbException(DbException.NEEDSYNDATA,"没有站点数据")
        }
        CallerLogger.d(TAG, "查询站点用时:${System.currentTimeMillis() - startTime}")
        startTime = System.currentTimeMillis()
@@ -50,7 +50,7 @@ object TaskSiteDb : IDbRepository {
        )
        CallerLogger.d(TAG, "数据转换用时:${System.currentTimeMillis() - startTime}")
        if (toTaskSiteDatas.size < 2) {
-            throw DbException("站点数据不全请稍后再试")
+            throw DbException(DbException.NEEDSYNDATA,"站点数据不全请稍后再试")
        }
        // 把线路所有的站点搬迁到运行中表格中
        startTime = System.currentTimeMillis()
@@ -123,7 +123,7 @@ object TaskSiteDb : IDbRepository {
        // 获取线路的站点
        val querySites = SiteDb.querySiteByLineId(lineInfo.lineId!!)?.distinctBy { it.siteId }
        if (querySites.isNullOrEmpty()) {
-            throw DbException("没有站点数据")
+            throw DbException(DbException.NEEDSYNDATA,"没有站点数据")
        }
 //        val toTaskSiteDatas = TaskSiteDataBean.toTaskSiteDatas(
 //            querySites,
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/fragment/OfflineFragment.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/fragment/OfflineFragment.kt
@@ -5,10 +5,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.mogo.commons.mvp.MvpFragment
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
 import com.mogo.och.bridge.ui.drawline.LineView
 import com.mogo.och.offline.R
+import com.mogo.och.offline.ui.sattusbar.OfflineStateView
 import kotlinx.android.synthetic.main.offline_base_fragment.mapContainerLayout

 /**
@@ -54,6 +56,9 @@ class OfflineFragment : MvpFragment<OfflineFragment?, OfflinePresenter?>() {
    override fun onResume() {
        super.onResume()
        mapContainerLayout?.onResume()
+        context?.let {
+            CallerHmiManager.updateStatusBarLeftView(true,"OFFLINEICON", OfflineStateView(it))
+        }
    }

    override fun onCreateView(
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/sattusbar/OfflineStateView.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/sattusbar/OfflineStateView.kt
@@ -0,0 +1,21 @@
+package com.mogo.och.offline.ui.sattusbar
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.och.offline.R
+
+class OfflineStateView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : ConstraintLayout(context, attrs){
+
+    companion object {
+        const val TAG = "OfflineStateView"
+    }
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.offline_status_bar, this, true)
+    }
+
+}
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwitchLineView.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwitchLineView.kt
@@ -6,6 +6,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import com.mogo.eagle.core.utilcode.kotlin.onClick
@@ -29,16 +30,16 @@ import kotlinx.android.synthetic.main.offline_switch_line.view.switch_line_rv
 import me.jessyan.autosize.utils.AutoSizeUtils


-class SwitchLineView: WindowRelativeLayout, SwtichLineModel.SwtichLineViewCallback {
+class SwitchLineView: ConstraintLayout, SwtichLineModel.SwtichLineViewCallback {


-    constructor(context: Context?) : super(context)
+    constructor(context: Context) : super(context)

-    constructor(context: Context?, attributeSet: AttributeSet) : super(context, attributeSet)
+    constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet)

-    constructor(context: Context?, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr)
+    constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr)

-    constructor(context: Context?, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes)
+    constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes)


    companion object {
--- a/OCH/offline/driver/src/main/res/drawable-nodpi/offline_status_icon.png
+++ b/OCH/offline/driver/src/main/res/drawable-nodpi/offline_status_icon.png
--- a/OCH/offline/driver/src/main/res/layout/offline_status_bar.xml
+++ b/OCH/offline/driver/src/main/res/layout/offline_status_bar.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:src="@drawable/offline_status_icon"
+        android:layout_width="@dimen/dp_54"
+        android:layout_height="@dimen/dp_54"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
@@ -7,6 +7,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.app.AppConfigInfo
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.datacenter.IDataCenterBizListener
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
@@ -154,6 +155,14 @@ class CarInfoTabView @JvmOverloads constructor(
        MogoData.mogoMapData.get()?.isCityDataCached {
            updateHDDataCacheStatus(it)
        }
+
+        if(FunctionBuildConfig.isOffLine){
+            tvCarLoginInfo.visibility = VISIBLE
+            tvCarLoginInfo.text = resources.getString(R.string.tab_login_norphone)
+            tvCarLoginInfo.setTextColor(resources.getColor(R.color.color_FFFFCD3D))
+            tvCarExit.text = resources.getString(R.string.tab_login_gophone)
+            tvCarExit.setTextColor(resources.getColor(R.color.color_FF2EACFF))
+        }
    }

    private fun showCurrentPadVersion() {
@@ -168,6 +177,13 @@ class CarInfoTabView @JvmOverloads constructor(
            } else {
                tvCarLoginInfo.text = ""
            }
+            if(FunctionBuildConfig.isOffLine){
+                tvCarLoginInfo.visibility = VISIBLE
+                tvCarLoginInfo.text = resources.getString(R.string.tab_login_norphone)
+                tvCarLoginInfo.setTextColor(resources.getColor(R.color.color_FFFFCD3D))
+                tvCarExit.text = resources.getString(R.string.tab_login_gophone)
+                tvCarExit.setTextColor(resources.getColor(R.color.color_FF2EACFF))
+            }
        }
    }

--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
@@ -45,6 +45,7 @@
    <color name="color_E6FFFFFF">#E6FFFFFF</color>
    <color name="color_D945D3FF">#D945D3FF</color>
    <color name="color_D93261B6">#D93261B6</color>
+    <color name="color_FFFFCD3D">#FFCD3D</color>

    <color name="background_wtf">#FF999900</color>
    <color name="background_error">#FFCC0000</color>
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
@@ -14,6 +14,8 @@
    <string name="tab_version_hdmap_info">HDMAP：</string>
    <string name="tab_version_admap_info">ADMAP：</string>
    <string name="tab_version_update">检查更新</string>
+    <string name="tab_login_norphone">  访客（未登录）</string>
+    <string name="tab_login_gophone">登录</string>

    <string name="log_min">最小化</string>
    <string name="log_info">日志</string>