modify upgrade

core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java

@@ -81,7 +81,7 @@ public class UpgradeAppNetWorkManager {
                             CallerLogger.INSTANCE.d(TAG, "UpgradeAppInfo url = " + info.result.getAppUrl() + "----code = " + info.result.getVersionCode());
                             Log.d(TAG, "UpgradeAppInfo url = " + info.result.getAppUrl() + "----code = " + info.result.getVersionCode() + "--versionCode =" + versionCode + "--info.result = " + info.result);
                             if (info.result.getVersionCode() > versionCode) {
-                                CallerHmiManager.INSTANCE.showUpgradeDialog(info.result.getAppUrl().substring(info.result.getAppUrl().lastIndexOf("/")+1), info.result.getAppUrl(), info.result.getInstallTitle(), info.result.getInstallContent());
+                                CallerHmiManager.INSTANCE.showUpgradeDialog(info.result.getAppUrl().substring(info.result.getAppUrl().lastIndexOf("/")+1), info.result.getAppUrl(), info.result.getInstallTitle(), info.result.getInstallContent(), info.result.getInstallType());
                             }
                         } else {
                             Log.e(TAG, "onNext info == null");

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

@@ -1304,11 +1304,12 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
     /**
      * 升级app弹框
      */
-    override fun showUpgradeDialog(name: String, url: String, title: String, content: String) {
+    override fun showUpgradeDialog(name: String, url: String, title: String, content: String, installType: String) {
         if (upgradeAppDialog == null) {
             upgradeAppDialog = UpgradeAppDialog(requireContext())
         }
-        upgradeAppDialog!!.showUpgradeAppDialog(name, url, title, content)
+        upgradeAppDialog!!.setCanceledOnTouchOutside(false)
+        upgradeAppDialog!!.showUpgradeAppDialog(name, url, title, content, installType)
     }
 
     /**

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

@@ -1,7 +1,9 @@
 package com.mogo.eagle.core.function.hmi.ui.bindingcar
 
 import android.content.Context
+import android.opengl.Visibility
 import android.util.Log
+import android.view.View
 import android.widget.TextView
 import androidx.lifecycle.LifecycleObserver
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
@@ -23,6 +25,8 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb
     private var cancleTv: TextView? = null
     private var upgradeTitleTv: TextView? = null
     private var upgradeContentTv: TextView? = null
+    private var verticalLineView: View? = null
+    private var confirmForceTv: TextView? = null
     private var tag: String? = null
     private var downloarUrl: String? = null
 
@@ -34,6 +38,8 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb
         upgradeContentTv = findViewById(R.id.tv_upgrade_content)
         confirmTv = findViewById(R.id.tv_upgrade_confirm)
         cancleTv = findViewById(R.id.tv_upgrade_cancel)
+        verticalLineView = findViewById(R.id.view_vertical_line)
+        confirmForceTv = findViewById(R.id.tv_upgrade_confirm_force)
 
         confirmTv?.setOnClickListener {
             downloadApp()
@@ -42,6 +48,11 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb
         cancleTv?.setOnClickListener {
             dismiss()
         }
+
+        confirmForceTv?.setOnClickListener {
+            downloadApp()
+        }
+
     }
 
     /**
@@ -58,16 +69,31 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb
         super.dismiss()
     }
 
-    fun showUpgradeAppDialog(name: String, url: String, title: String, content: String) {
+    // 升级类型 1:提示升级 2:静默升级 3:强制升级
+    fun showUpgradeAppDialog(name: String, url: String, title: String, content: String, installType: String) {
         if (isShowing) {
             return
         }
         tag = name
         downloarUrl = url
-
         upgradeTitleTv?.text = title
         upgradeContentTv?.text = content
 
+        if (installType.equals("1")) {
+            confirmForceTv?.visibility = View.GONE
+            confirmTv?.visibility = View.VISIBLE
+            cancleTv?.visibility = View.VISIBLE
+            verticalLineView?.visibility = View.VISIBLE
+        } else if (installType.equals("3")) {
+            confirmTv?.visibility = View.GONE
+            cancleTv?.visibility = View.GONE
+            verticalLineView?.visibility = View.GONE
+
+            confirmForceTv?.visibility = View.VISIBLE
+        } else if (installType.equals("2")) {
+            //静默安装
+        }
+
         show()
     }
 

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

@@ -93,5 +93,18 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/view_horizontal_line" />
 
+    <TextView
+        android:id="@+id/tv_upgrade_confirm_force"
+        android:layout_width="match_parent"
+        android:layout_height="100px"
+        android:gravity="center"
+        android:text="@string/confirm"
+        android:textColor="#FFFFFFFF"
+        android:textSize="46px"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@id/view_vertical_line"
+        app:layout_constraintTop_toBottomOf="@id/view_horizontal_line" />
 
 </com.mogo.eagle.core.widget.RoundConstraintLayout>