## [1.0.6] version 6 - 2020-07-03

### Changed
- 检测升级按钮点击后10秒以上可用
- 服务器发送的升级命令10秒以上可用

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 5
+    ext.app_version_code = 6
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.0.5"
+    ext.app_version = "1.0.6"
 
     /**
      * 项目依赖库

home/src/main/code/com/wdkl/ncs/android/component/home/activity/AppUpdateActivity.kt

@@ -57,7 +57,7 @@ class AppUpdateActivity :BaseActivity<AppUpdatePresenter, ActivityAppUpdateBindi
             showMessage("本机已经是最新版本")
             activity_calling_bed_text_download.text = "本机已经是最新版本"
             activity_appupdate_dialog_progressview.visibility = View.GONE
-            TcpHandleService.isUpdating = false
+            TcpHandleService.updateLastTime = System.currentTimeMillis() / 1000
             AppTool.Time.delay(1000){
                 finish()
             }

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchUserSettingActivity.java

@@ -15,7 +15,9 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.SeekBar;
 import android.widget.TextView;
+import android.widget.Toast;
 
+import com.google.common.base.Strings;
 import com.hp.hpl.sparta.xpath.ThisNodeTest;
 import com.wdkl.ncs.android.component.home.BuildConfig;
 import com.wdkl.ncs.android.component.home.R;
@@ -23,6 +25,7 @@ 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;
+import com.wdkl.ncs.android.lib.base.BaseApplication;
 import com.wdkl.ncs.android.lib.utils.ExtendMethodsKt;
 import com.wdkl.ncs.android.middleware.tcp.TcpClient;
 import com.wdkl.ncs.android.middleware.tcp.channel.DeviceUtil;
@@ -74,10 +77,12 @@ public class WatchUserSettingActivity extends Activity {
         tv_device_imei.setText("设备IMEI: " + Constants.Companion.getImei());
         tvDeviceIp.setText("设备IP: " + NetHelper.getInstance().getLocalIP());
         tvDeviceUser.setText("当前用户: " + Constants.Companion.getUser_name());
-        if(Constants.Companion.getUser_role_name().contains("腕表")){
-            tv_device_user_role_name.setText( "用户角色: " +Constants.Companion.getUser_role_name().substring(0,(Constants.Companion.getUser_role_name()).indexOf("腕表")));
-        }else{
-            tv_device_user_role_name.setText("用户角色: " + Constants.Companion.getUser_role_name());
+        if (!Strings.isNullOrEmpty(Constants.Companion.getUser_role_name())) {
+            if (Constants.Companion.getUser_role_name().contains("腕表")) {
+                tv_device_user_role_name.setText("用户角色: " + Constants.Companion.getUser_role_name().substring(0, (Constants.Companion.getUser_role_name()).indexOf("腕表")));
+            } else {
+                tv_device_user_role_name.setText("用户角色: " + Constants.Companion.getUser_role_name());
+            }
         }
 
         //设置呼叫转接时间
@@ -130,12 +135,14 @@ public class WatchUserSettingActivity extends Activity {
         update_app_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (!TcpHandleService.instance.isUpdating()) {
-                    Intent intent = new Intent();
-                    intent.setClass(_this, AppUpdateActivity.class);
-                    TcpHandleService.instance.setUpdating(true);
-                    startActivity(intent);
-                }
+            if ((System.currentTimeMillis() / 1000) - TcpHandleService.instance.getUpdateLastTime() > 10) {
+                TcpHandleService.instance.setUpdateLastTime(System.currentTimeMillis() / 1000);
+                Intent intent = new Intent();
+                intent.setClass(_this, AppUpdateActivity.class);
+                startActivity(intent);
+            } else {
+                Toast.makeText(_this, "请10秒后再尝试", Toast.LENGTH_SHORT).show();
+            }
             }
         });
 

home/src/main/code/com/wdkl/ncs/android/component/home/service/TcpHandleService.kt

@@ -15,6 +15,7 @@ import com.wdkl.ncs.android.component.home.util.SpeechUtil
 import com.wdkl.ncs.android.component.home.util.Util
 import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.lib.utils.AppTool
+import com.wdkl.ncs.android.lib.utils.TimeEngine
 import com.wdkl.ncs.android.lib.utils.push
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel
@@ -28,7 +29,7 @@ import org.greenrobot.eventbus.ThreadMode
 
 class TcpHandleService : Service(){
     companion object instance {
-        var isUpdating : Boolean = false
+        var updateLastTime : Long = System.currentTimeMillis() / 1000
     }
 
     override fun onBind(intent: Intent?): IBinder? {
@@ -132,10 +133,10 @@ class TcpHandleService : Service(){
             Util.wakeUpAndUnlock(this)
             var tcpModel = messageEvent.getMessage() as TcpModel
             if (tcpModel.action == TcpAction.DeviceAction.APP_UPDATE) {
-                if (!isUpdating) {
+                if ((System.currentTimeMillis() / 1000) - updateLastTime > 10){   //大于30秒可继续升级
+                    updateLastTime = System.currentTimeMillis() / 1000
                     var intent = Intent()
                     intent.setClass(this, AppUpdateActivity::class.java)
-                    isUpdating = true
                     startActivity(intent)
                 }
             }

readme.md

@@ -25,17 +25,22 @@
 在发布新版本时，可以直接将Unreleased区块中的内容移动至新发 布版本的描述区块就可以了
 
 ---
+## [1.0.6] version 6 - 2020-07-03
+### Changed 
+- 检测升级按钮点击后10秒以上可用
+- 服务器发送的升级命令10秒以上可用
+---
 ## [1.0.5] version 5 - 2020-07-03
-### Changed
+### Changed 
 - 已经是最新版本时，修改升级界面呈现，1秒后结束当前界面
 ---
 ## [1.0.4] version 4 - 2020-07-03
-### Changed
+### Changed 
 - 修改设置中升级事件
 - 修改 TcpHandleService 中的 isUpdating 为静态变量
 ---
 ## [1.0.2] version 3 - 2020-07-03
-### Changed
+### Changed 
 - 优化升级，已经在升级时，不再处理升级事件
 ---
 ## [1.0.1] version 2 - 2020-07-03
@@ -44,7 +49,7 @@
 - 事件语音界面常亮
 - 升级界面常亮
 - SOS界面常亮
-### Changed
+### Changed 
 - 优化AppService，监测TCP断线亮屏
 ---
 ## [1.0.0] version 1 - 2020-07-03
@@ -65,5 +70,5 @@
         - 处理APP升级。有通话时等待，通话结束后亮屏并跳转升级界面
     - 其它TCP命令由具体界面中的 EventBus 具体处理
 - 全局通话使用 DeviceChannel 类中的 calling 字段，需优化，如加锁
-### Removed
+### Removed 
 - 去除了WatchHomeActivity.kt