[6.7.0] ui

OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt

@@ -152,6 +152,7 @@ class LoginProvider : LoginService {
             this.loginInfo = loginInfo
         }
 
+        CallerEagleBaseFunctionCall4OchManager.setOchLoginNo(loginInfo.phone)
         CallerEagleBaseFunctionCall4OchManager.setOchCarModel(Carmodel.getCarModelFromServerName(loginInfo.carModel))
         CallerEagleBaseFunctionCall4OchManager.setOchPlateNumber(loginInfo.plateNumber)
 

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/DataCenterProvider.kt

@@ -4,6 +4,8 @@ import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.api.datacenter.IDataCenterProvider
+import com.mogo.eagle.core.function.call.datacenter.CallerDataCenterBizListener
+import com.mogo.eagle.core.function.call.datacenter.CallerDataCenterBizManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.function.datacenter.location.MoGoLocationDispatcher
 import com.mogo.eagle.core.function.datacenter.v2x.RoadLineEventManager
@@ -22,6 +24,7 @@ class DataCenterProvider: IDataCenterProvider {
         MoGoLocationDispatcher.initListener()
         mContext = context
         mContext?.let {
+            CallerDataCenterBizManager.init()
             CallerMsgBoxManager.queryAllMessages(it)
             TrafficLightDispatcher.INSTANCE.initServer(it)
             SpeedLimitDispatcher.INSTANCE.initLimit(it)

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/biz/DataCenterBizProvider.kt

@@ -14,8 +14,11 @@ class DataCenterBizProvider:IDataCenterBizProvider {
         get() = "DataCenterBizProvider"
 
 
-    override fun init(context: Context?) {
+    override fun init(context: Context?) {}
+    override fun init(){}
 
+    override fun notifyLoginInfo(loginNo: String?) {
+        CallerDataCenterBizListener.invokeLoginNo(loginNo)
     }
 
     override fun notifyCarMode(carModel: Carmodel) {

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt

@@ -7,25 +7,18 @@ 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.enums.Carmodel
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
 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.datacenter.msgbox.IMsgBoxEventListener
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
 import com.mogo.eagle.core.function.api.hmi.autopilot.IMoGoCheckAutoPilotBtnListener
-import com.mogo.eagle.core.function.api.och.IOchFunctionCallNotify
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
 import com.mogo.eagle.core.function.call.datacenter.CallerDataCenterBizListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
-import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.function.hmi.bone.BoneTabLayout
 import com.mogo.eagle.core.function.hmi.ui.tools.OfflineMapDialog
 import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -36,7 +29,6 @@ import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.map.MogoData
-import kotlinx.android.synthetic.main.view_bone_container.view.clBoneTab
 import kotlinx.android.synthetic.main.view_car_info_tab.view.ivCarType
 import kotlinx.android.synthetic.main.view_car_info_tab.view.tvADMapVersion
 import kotlinx.android.synthetic.main.view_car_info_tab.view.tvADVersionName
@@ -48,13 +40,13 @@ import kotlinx.android.synthetic.main.view_car_info_tab.view.tvHDMapVersion
 import kotlinx.android.synthetic.main.view_car_info_tab.view.tvPADUpdate
 import kotlinx.android.synthetic.main.view_car_info_tab.view.tvPadVersion
 import kotlinx.android.synthetic.main.view_car_info_tab.view.tvSnInfo
-import mogo.telematics.pad.MessagePad
 import system_master.SsmInfo
 import system_master.SystemStatusInfo
 
 private fun String.parsePlateNo(): String {
     return " " + substring(0, 2) + " " + substring(2) + " "
 }
+
 private fun String.parsePhoneNo(): String {
     return take(3) + "****" + takeLast(4)
 }
@@ -131,7 +123,7 @@ class CarInfoTabView @JvmOverloads constructor(
             if (isHDCached) { // 已缓存
                 ToastUtils.showShort(resources.getString(R.string.offline_had_downloaded))
             } else {// 未缓存
-                if(!NetworkUtils.isConnected(context)){
+                if (!NetworkUtils.isConnected(context)) {
                     ToastUtils.showShort(resources.getString(R.string.offline_update_tip))
                     return@setOnClickListener
                 }
@@ -156,6 +148,15 @@ class CarInfoTabView @JvmOverloads constructor(
         tvPadVersion.text = tvPadVersion.text.toString() + AppUtils.getAppVersionName()
     }
 
+    override fun invokeLoginNo(loginNo: String?) {
+        super.invokeLoginNo(loginNo)
+        UiThreadHandler.post {
+            loginNo?.let {
+                tvCarLoginInfo.text = it
+            }
+        }
+    }
+
     override fun invokeCarRes(res: Int) {
         super.invokeCarRes(res)
         UiThreadHandler.post {

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml

@@ -166,7 +166,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_20"
                 android:gravity="start"
-                android:lines="2"
+                android:maxLines="2"
                 android:textColor="@color/white"
                 android:textSize="@dimen/dp_32"
                 app:layout_constraintRight_toRightOf="@+id/tvADUpdate"

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/IDataCenterBizListener.kt

@@ -2,6 +2,8 @@ package com.mogo.eagle.core.function.api.datacenter
 
 interface IDataCenterBizListener {
 
+    fun invokeLoginNo(loginNo:String?){}
+
     fun invokeCarRes(res:Int){}
 
     fun invokeCarNo(no:String?){}

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IEagleBaseFunctionCall4Och.kt

@@ -71,4 +71,9 @@ interface IEagleBaseFunctionCall4Och {
      */
     fun setOchPlateNumber(plateNumber: String?) {}
 
+    /**
+     * Och设置 登录手机号
+     */
+    fun setOchLoginNo(loginNo: String?){}
+
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCallNotify.kt

@@ -7,10 +7,12 @@ import com.mogo.eagle.core.data.enums.Carmodel
  */
 interface IOchFunctionCallNotify {
 
+    fun init(){}
+
     /**
      * 网约车回调登陆信息
      */
-    fun notifyLoginInfo() {}
+    fun notifyLoginInfo(loginNo: String?) {}
 
     // 车型变化回调
     fun notifyCarMode(carModel: Carmodel)
@@ -18,6 +20,6 @@ interface IOchFunctionCallNotify {
     // 车牌变化回调
     fun notifyPlateNumber(plateNumber: String?)
 
-    fun LoginOut() {}
+    fun loginOut() {}
 
 }

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizListener.kt

@@ -6,6 +6,7 @@ import com.mogo.eagle.core.function.call.base.CallerBase
 object CallerDataCenterBizListener : CallerBase<IDataCenterBizListener>() {
 
     private var res:Int = 0
+    private var loginNo:String? = null
     private var no:String? = null
 
     override fun doSomeAfterAddListener(tag: String, listener: IDataCenterBizListener) {
@@ -14,6 +15,13 @@ object CallerDataCenterBizListener : CallerBase<IDataCenterBizListener>() {
         listener.invokeCarNo(no)
     }
 
+    fun invokeLoginNo(loginNo: String?){
+        this.loginNo = loginNo
+        M_LISTENERS.forEach {
+            it.value.invokeLoginNo(loginNo)
+        }
+    }
+
     fun invokeCarRes(res: Int) {
         this.res = res
         M_LISTENERS.forEach {

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizManager.kt

@@ -12,6 +12,14 @@ object CallerDataCenterBizManager: IOchFunctionCallNotify {
         get() = ARouter.getInstance().build(MogoServicePaths.PATH_DATA_CENTER_BIZ_FUNCTION)
             .navigation() as? IDataCenterBizProvider
 
+    override fun init() {
+        dataCenterBizProviderApi?.init()
+    }
+
+    override fun notifyLoginInfo(loginNo: String?) {
+       dataCenterBizProviderApi?.notifyLoginInfo(loginNo)
+    }
+
     override fun notifyCarMode(carModel: Carmodel) {
         dataCenterBizProviderApi?.notifyCarMode(carModel)
     }
@@ -20,5 +28,4 @@ object CallerDataCenterBizManager: IOchFunctionCallNotify {
         dataCenterBizProviderApi?.notifyPlateNumber(plateNumber)
     }
 
-
 }

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerEagleBaseFunctionCall4OchManager.kt

@@ -99,4 +99,8 @@ object CallerEagleBaseFunctionCall4OchManager : IEagleBaseFunctionCall4Och {
     override fun setOchPlateNumber(plateNumber: String?) {
         CallerDataCenterBizManager.notifyPlateNumber(plateNumber)
     }
+
+    override fun setOchLoginNo(loginNo: String?) {
+        CallerDataCenterBizManager.notifyLoginInfo(loginNo)
+    }
 }