diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java index bb70ada193..6fe3c77764 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java @@ -59,16 +59,15 @@ public class UpgradeAppNetWorkManager { * 获取app升级信息 */ public void getAppUpgradeInfo(Context context, String screenType) { - String sn = "X20202203105S688HZ"; - int versionCode = 2070000; - String versionName = "2.7.0"; - String screenType1 = "1"; +// String sn = "X20202203105S688HZ"; +// int versionCode = 2070000; +// String versionName = "2.7.0"; -// String sn = MoGoAiCloudClientConfig.getInstance().getSn(); -// String versionCode = AppUtils.getAppVersionCode(); -// String versionName = AppUtils.getAppVersionName(); + String sn = MoGoAiCloudClientConfig.getInstance().getSn(); + int versionCode = AppUtils.getAppVersionCode(); + String versionName = AppUtils.getAppVersionName(); - UpgradeAppRequest request = new UpgradeAppRequest(sn, versionCode, versionName, screenType1); + UpgradeAppRequest request = new UpgradeAppRequest(sn, versionCode, versionName, screenType); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); mUpgradeApiService.getUpgradeInfo("apps_control", requestBody) .subscribeOn(Schedulers.io()) @@ -76,24 +75,22 @@ public class UpgradeAppNetWorkManager { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.d("liyz", "UpgradeAppInfo ------> "); } @Override public void onNext(@NonNull UpgradeAppInfo info) { - Log.d("liyz", "onNext -------> " + info.code + "----msg =" + info.msg); - if (info != null && info.getData() != null) { - Log.d("liyz", "UpgradeAppInfo url = " + info.getData().getApp_url() + "----code = " + info.getData().getVersion_code()); - //TODO 弹框 - if (info.getData().getVersion_code() >= versionCode) { - CallerHmiManager.INSTANCE.showUpgradeDialog("appupgrade", info.getData().getApp_url()); + if (info != null && info.getData() != null && info.getData().size() > 0) { + CallerLogger.INSTANCE.e(TAG, "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "---info.getData().get(0).getVersion_code() = " + info.getData().get(0).getVersion_code()); + Log.d("liyz", "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "----code = " + info.getData().get(0).getVersion_code()); + if (info.getData().get(0).getVersion_code() > versionCode) { + CallerHmiManager.INSTANCE.showUpgradeDialog(info.getData().get(0).getApp_url().substring(info.getData().get(0).getApp_url().lastIndexOf("/")+1), info.getData().get(0).getApp_url()); } } } @Override public void onError(@NonNull Throwable e) { - CallerLogger.INSTANCE.e(TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); + CallerLogger.INSTANCE.e(TAG, "UpgradeAppInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); Log.e("liyz", "UpgradeAppInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/ipcupgrade/IPCUpgradeManager.kt b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/ipcupgrade/IPCUpgradeManager.kt index 769fafaec6..e00a1d7c21 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/ipcupgrade/IPCUpgradeManager.kt +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/ipcupgrade/IPCUpgradeManager.kt @@ -1,7 +1,6 @@ package com.mogo.eagle.core.function.ipcupgrade import android.content.Context -import android.util.Log import com.mogo.aicloud.services.socket.IMogoOnMessageListener import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager import com.mogo.cloud.passport.MoGoAiCloudClient diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt index 77bd028a93..884236f730 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt @@ -8,6 +8,7 @@ import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.toast.TipToast +import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.module.common.dialog.BaseFloatDialog import com.mogo.service.IMogoServiceApis import com.mogo.service.statusmanager.IMogoStatusChangedListener @@ -49,9 +50,11 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb } /** - * 去下载 TODO 成功或者失败 + * 去下载 */ fun downloadApp() { + Log.d("liyz", "UpgradeAppDialog tag = $tag ---- downloarUrl = $downloarUrl") + ToastUtils.showLong("开始下载APK,稍后可前往downloads文件夹查看") tag?.let { downloarUrl?.let { it1 -> CallerDevaToolsManager.downLoadPackage(it, it1) } } dismiss() @@ -67,7 +70,6 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb } tag = name downloarUrl = url - Log.d("liyz", "tag = $tag ---- downloarUrl = $downloarUrl") show() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt index 19bb89cca6..4dec896fc6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt @@ -61,8 +61,7 @@ class SystemVersionView @JvmOverloads constructor( //鹰眼版本视图点击事件 ivPadVersion.setOnClickListener { CallerLogger.i("$M_HMI$$TAG", "pad version view clicked") -// CallerBindingcarManager.getBindingcarProvider().queryAppUpgrade() - + CallerBindingcarManager.getBindingcarProvider().queryAppUpgrade() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 0ce8578500..abacc0ee53 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -6,6 +6,7 @@ import android.content.Context; import android.os.Process; import com.bytedance.boost_multidex.BoostMultiDex; +import com.elegant.utils.UiThreadHandler; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.cloud.socket.SocketBuildConfig; import com.mogo.commons.AbsMogoApplication; @@ -13,6 +14,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.constants.MoGoConfig; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.function.api.chat.biz.ChatConsts; +import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager; import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager; import com.mogo.eagle.core.function.notice.PushUIConstants; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; @@ -51,6 +53,9 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { initLogConfig(); initTipToast(); initModules(); + + //查询是否有版本的更新 + queryAppUpgrade(); } @Override @@ -59,6 +64,15 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { return ProcessUtils.isMainProcess(this); } + private void queryAppUpgrade() { + UiThreadHandler.postDelayed(new Runnable() { + @Override + public void run() { + CallerBindingcarManager.getBindingcarProvider().queryAppUpgrade(); + } + },3000); + } + /** * 初始化异常采集配置 */ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml index 3ee8397d47..0850212f75 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml @@ -28,7 +28,7 @@ android:textSize="43px" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_bindingcar_title" /> + app:layout_constraintTop_toBottomOf="@id/tv_upgrade_title" /> + app:layout_constraintTop_toBottomOf="@id/tv_upgrade_tips" /> data; - public AppInfo getData() { + public ArrayList getData() { return data; } - public void setData(AppInfo data) { + public void setData(ArrayList data) { this.data = data; }