Merge branch 'dev_MogoAP_eagle-220_211207_8.0.17_merge' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_MogoAP_eagle-220_211207_8.0.17_merge

core/function-impl/mogo-core-function-hmi/build.gradle

@@ -59,8 +59,8 @@ dependencies {
 
 
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        implementation rootProject.ext.dependencies.androidxrecyclerview
         implementation rootProject.ext.dependencies.modulecommon
+        compileOnly rootProject.ext.dependencies.mogoserviceapi
         implementation project(':libraries:map-usbcamera')
 
         implementation rootProject.ext.dependencies.mogo_core_res
@@ -76,7 +76,7 @@ dependencies {
         implementation project(':core:mogo-core-res')
         implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-utils')
-        implementation project(':core:mogo-core-res')
+        implementation project(':core:mogo-core-network')
         implementation project(':core:mogo-core-function-api')
         implementation project(':core:mogo-core-function-call')
     }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt

@@ -102,6 +102,8 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
     private var onBadCaseShow: (() -> View)? = null
     private var onBadCaseHide: (() -> Unit)? = null
 
+    private var upgradeTipsView: (() -> View)? = null
+
     companion object {
         private const val MSG_WHAT_DISMISS_BAD_CASE_ENTRY = 0x1010
         private val CASE_EXPIRE_DURATION = TimeUnit.HOURS.toMillis(4)
@@ -362,6 +364,14 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
         onBadCaseHide = onHide
     }
 
+    /**
+     *注册工控机升级提示圆点View的回调
+     * @param 提示圆点View
+     */
+    override fun registerUpgradeTipsCallback(tipsView: () -> View) {
+        upgradeTipsView = tipsView
+    }
+
     /**
      * 工控机重启返回结果
      * @param code
@@ -1093,11 +1103,21 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
             upgradeStatus: Int
     ) {
         ThreadUtils.runOnUiThread {
+            val tipsView = upgradeTipsView?.invoke()
             //如果工控机处于“下载中”、“可升级（下载完成）”、“升级中”、“升级失败”状态时，工具箱入口显示红色角标
             if (AdUpgradeStateHelper.showUpgradeTips(downloadStatus, upgradeStatus)) {
-                viewUpgradeTips.visibility = View.VISIBLE
+                if (HmiBuildConfig.isShowUpgradeTipsView){
+                    viewUpgradeTips?.visibility = View.VISIBLE
+                }else{
+                    tipsView?.let {
+                        it.visibility = View.VISIBLE
+                    }
+                }
             } else {
-                viewUpgradeTips.visibility = View.GONE
+                viewUpgradeTips?.visibility = View.GONE
+                tipsView?.let {
+                    it.visibility = View.GONE
+                }
             }
             //将状态同步到工具箱
             toolsView?.showAdUpgradeStatus(upgradeMode, downloadStatus, currentProgress, totalProgress, downloadVersion, upgradeStatus)

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

@@ -112,8 +112,8 @@
 
     <View
         android:id="@+id/viewUpgradeTips"
-        android:layout_width="20px"
-        android:layout_height="20px"
+        android:layout_width="22px"
+        android:layout_height="22px"
         app:layout_constraintCircle="@id/ivToolsIcon"
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="60px"