|
@@ -399,9 +399,9 @@ class MainActivity :BaseActivity<MainActivityPresenter, ActivityMainLayoutBindin
|
|
|
view_title_layout_tv_no.text = "ID: " + deviceInfo.id
|
|
|
initialized = true
|
|
|
|
|
|
- /*if (Constant.PART_ID != null) {
|
|
|
+ if (Constant.PART_ID != null) {
|
|
|
presenter.loadPartSettings(Constant.PART_ID)
|
|
|
- }*/
|
|
|
+ }
|
|
|
|
|
|
//正式版本开机启动自动检查升级
|
|
|
if (!BuildConfig.DEBUG) {
|
|
@@ -424,7 +424,6 @@ class MainActivity :BaseActivity<MainActivityPresenter, ActivityMainLayoutBindin
|
|
|
|
|
|
if (BuildConfig.VERSION_CODE < appInfo.versionNo) {
|
|
|
if (!updating) {
|
|
|
- //showMessage("即将升级...")
|
|
|
Constant.APP_PATH = appInfo.appPath
|
|
|
updating = true
|
|
|
AppTool.Time.delay(200) {
|
|
@@ -433,8 +432,6 @@ class MainActivity :BaseActivity<MainActivityPresenter, ActivityMainLayoutBindin
|
|
|
} else {
|
|
|
showMessage("正在升级中...")
|
|
|
}
|
|
|
- } else {
|
|
|
- showMessage("当前已是最新版本")
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -575,9 +572,9 @@ class MainActivity :BaseActivity<MainActivityPresenter, ActivityMainLayoutBindin
|
|
|
if (tcpModel.getAction() == TcpAction.DeviceAction.APP_UPDATE) {
|
|
|
checkAppVersion()
|
|
|
} else if (tcpModel.action == TcpAction.DeviceAction.SYSTEM_SETTING) {
|
|
|
- /*if (Constant.PART_ID != null) {
|
|
|
+ if (Constant.PART_ID != null) {
|
|
|
presenter.loadPartSettings(Constant.PART_ID)
|
|
|
- }*/
|
|
|
+ }
|
|
|
} else if (tcpModel.action == TcpAction.DeviceAction.RESTART) {
|
|
|
AppUpdateHelper.restartApp(activity)
|
|
|
} else if (tcpModel.action == TcpAction.DeviceAction.SERVER_CHANGE) {
|