Bladeren bron

## [1.0.3] version 4 - 2020-07-03
### Changed
- 修改设置中升级事件
- 修改 TcpHandleService 中的 isUpdating 为静态变量

allen 4 jaren geleden
bovenliggende
commit
ba760b4425

+ 2 - 2
build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 3
+    ext.app_version_code = 4
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.0.3"
+    ext.app_version = "1.0.4"
 
     /**
      * 项目依赖库

+ 9 - 2
home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchUserSettingActivity.java

@@ -2,6 +2,7 @@ package com.wdkl.ncs.android.component.home.activity;
 
 import android.Manifest;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
@@ -18,6 +19,7 @@ import android.widget.TextView;
 import com.hp.hpl.sparta.xpath.ThisNodeTest;
 import com.wdkl.ncs.android.component.home.BuildConfig;
 import com.wdkl.ncs.android.component.home.R;
+import com.wdkl.ncs.android.component.home.service.TcpHandleService;
 import com.wdkl.ncs.android.component.home.settingconfig.SettingConfig;
 import com.wdkl.ncs.android.component.home.util.NetHelper;
 import com.wdkl.ncs.android.component.nursehome.common.Constants;
@@ -124,11 +126,16 @@ public class WatchUserSettingActivity extends Activity {
             //TODO
         }
 
-
+        final Context _this = this;
         update_app_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                EventBus.getDefault().post(new MessageEvent("", 13));
+                if (!TcpHandleService.instance.isUpdating()) {
+                    Intent intent = new Intent();
+                    intent.setClass(_this, AppUpdateActivity.class);
+                    TcpHandleService.instance.setUpdating(true);
+                    startActivity(intent);
+                }
             }
         });
 

+ 3 - 1
home/src/main/code/com/wdkl/ncs/android/component/home/service/TcpHandleService.kt

@@ -27,7 +27,9 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
 class TcpHandleService : Service(){
-    var isUpdating : Boolean = false
+    companion object instance {
+        var isUpdating : Boolean = false
+    }
 
     override fun onBind(intent: Intent?): IBinder? {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.

+ 5 - 0
readme.md

@@ -25,6 +25,11 @@
 在发布新版本时,可以直接将Unreleased区块中的内容移动至新发 布版本的描述区块就可以了
 
 ---
+## [1.0.3] version 4 - 2020-07-03
+### Changed
+- 修改设置中升级事件
+- 修改 TcpHandleService 中的 isUpdating 为静态变量
+---
 ## [1.0.2] version 3 - 2020-07-03
 ### Changed
 - 优化升级,已经在升级时,不再处理升级事件