yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
lixiaopeng
2022-11-25 16:14:25 +08:00
parent 3f3c7406e6
commit 80b651802a
3 changed files with 67 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
View File

@@ -64,17 +64,12 @@ class SystemVersionView @JvmOverloads constructor(
showCurrentPadVersion()
showCurrentAdVersion()
val builder = NotificationCompat.Builder(context)
builder.setSmallIcon(R.mipmap.icon1001)
builder.setContentTitle("下载")
builder.setContentText("正在下载")
val manager: NotificationManager? = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager?
//鹰眼版本视图点击事件
ivPadVersion.setOnClickListener {
CallerLogger.i("$M_HMI$$TAG", "pad version view clicked")
CallerBindingcarManager.getBindingcarProvider().queryAppUpgrade()
//弹框和下载回调
// showUpgradeDialog(
// "",
// "",
@@ -82,11 +77,17 @@ class SystemVersionView @JvmOverloads constructor(
// "",
// "1"
// )
// val builder = NotificationCompat.Builder(context)
// builder.setSmallIcon(R.mipmap.icon1001)
// builder.setContentTitle("下载")
// builder.setContentText("正在下载")
// val manager: NotificationManager? = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager?
//
// CallerDevaToolsUpgradeListenerManager.registerDevaToolsUpgradeListener(TAG,
// object : IMogoDevaToolsUpgradeListener {
// override fun onStart(url: String?) {
// Log.d("Package-DownLoad", " SystemVersionView onStart --------> ")
//// Log.d("Package-DownLoad", " SystemVersionView onStart --------> ")
// }
//
// override fun onPause(url: String?) {
@@ -94,36 +95,27 @@ class SystemVersionView @JvmOverloads constructor(
// }
//
// override fun onProgress(url: String?, length: Int) {
// Log.d("Package-DownLoad", " SystemVersionView onProgress length = $length")
//// Log.d("Package-DownLoad", " SystemVersionView onProgress length = $length")
// builder.setProgress(100, length,false)
// manager?.notify(0x3,builder.build())
// //下载进度提示
// if (length == 99) {
// UiThreadHandler.postDelayed({
// length == 100
// builder.setContentText("已下载" + length + "%")
//
// UiThreadHandler.postDelayed({
// manager?.cancel(0x3)
// }, 1000L)
//
// }, 1500L)
// }
//
// builder.setContentText("已下载" + length + "%")
// }
//
// override fun onFinished(url: String?) {
// Log.d("Package-DownLoad", " SystemVersionView onFinished ------> ")
//// Log.d("Package-DownLoad", " SystemVersionView onFinished ------> ")
// builder.setContentText("已下载" + 100 + "%")
// UiThreadHandler.postDelayed({
// manager?.cancel(0x3)
// }, 500L)
// }
//
// override fun onError(url: String?, errorMsg: String?) {
// Log.d("Package-DownLoad", " errorMsg = $errorMsg")
//// Log.d("Package-DownLoad", " errorMsg = $errorMsg")
// }
// })
}
//工控机版本视图点击事件
ivAdVersion.setOnClickListener {
CallerLogger.i("$M_HMI$$TAG", "ad version view clicked")

52
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
View File

@@ -2,10 +2,14 @@ package com.mogo.eagle.core.function.main;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI;
import android.app.NotificationManager;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Process;
import androidx.annotation.Nullable;
import androidx.core.app.NotificationCompat;
import com.bytedance.boost_multidex.BoostMultiDex;
import com.elegant.utils.UiThreadHandler;
import com.mogo.cloud.socket.SocketBuildConfig;
@@ -18,8 +22,11 @@ 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.api.devatools.IMogoDevaToolsUpgradeListener;
import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager;
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsUpgradeListenerManager;
import com.mogo.eagle.core.function.hmi.R;
import com.mogo.eagle.core.function.msgbox.db.MsgBoxDb;
import com.mogo.eagle.core.function.overview.OverviewDb;
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
@@ -69,6 +76,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
queryAppUpgrade();
clearMessageBoxTable();
checkMonitorDb();
upgradeProgressListener();
}
@Override
@@ -116,6 +124,50 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
}).start();
}
private void upgradeProgressListener() {
final NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
builder.setSmallIcon(R.mipmap.icon1001);
builder.setContentTitle("下载");
builder.setContentText("正在下载");
final NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
CallerDevaToolsUpgradeListenerManager.INSTANCE.registerDevaToolsUpgradeListener(TAG, new IMogoDevaToolsUpgradeListener() {
@Override
public void onStart(@Nullable String url) {
}
@Override
public void onPause(@Nullable String url) {
}
@Override
public void onProgress(@Nullable String url, int length) {
builder.setProgress(100, length,false);
manager.notify(0x3, builder.build());
//下载进度提示
builder.setContentText("已下载" + length + "%");
}
@Override
public void onFinished(@Nullable String url) {
builder.setContentText("已下载" + 100 + "%");
UiThreadHandler.postDelayed(new Runnable() {
@Override
public void run() {
manager.cancel(0x3);
}
}, 1000);
}
@Override
public void onError(@Nullable String url, @Nullable String errorMsg) {
}
});
}
private void initKoom() {
KoomInitTask.INSTANCE.init(this);
}