长按右侧中间二维码按键检查版本升级

callingbed/src/androidTest/java/com/wdkl/app/ncs/callingbed2/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2
+package com.wdkl.app.ncs.callingbed
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.wdkl.app.ncs.callingbed2", appContext.packageName)
+        assertEquals("com.wdkl.app.ncs.callingbed", appContext.packageName)
     }
 }

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -27,9 +27,9 @@ import com.wdkl.app.ncs.callingbed.fragment.*
 import com.wdkl.app.ncs.callingbed.helper.*
 import com.wdkl.app.ncs.callingbed.launch.CallingbedLaunch
 import com.wdkl.app.ncs.callingbed.settings.SettingConfig
-import com.wdkl.app.ncs.callingbed2.agreement.CallingbedAgreement
-import com.wdkl.app.ncs.callingbed2.fragment.SkyCallFragment
-import com.wdkl.app.ncs.callingbed2.helper.ScreenManagerUtil
+import com.wdkl.app.ncs.callingbed.agreement.CallingbedAgreement
+import com.wdkl.app.ncs.callingbed.fragment.SkyCallFragment
+import com.wdkl.app.ncs.callingbed.helper.ScreenManagerUtil
 import com.wdkl.core.consts.Urls
 import com.wdkl.core.socket.IUserState
 import com.wdkl.core.socket.SocketManager
@@ -101,6 +101,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
     //网络异常计数
     private var netErrCount : Int = 0
     private var clickSosTime : Long = 0
+    private var pressTime : Long = 0
 
     //主信息
     private val mainFragment = "main_fragment"
@@ -605,10 +606,17 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
         //更多
         else if (buffer[2].toInt() == 1 || buffer[2].toInt() == 2) {
             if (skyCallFragment == null) {
-                runOnUiThread {
-                    clickVQrcode()
+                if (System.currentTimeMillis() - pressTime > 3000) {
+                    checkAppVersion()
+                } else {
+                    runOnUiThread {
+                        clickVQrcode()
+                    }
                 }
             }
+        } else if (buffer[2].toInt() == 0) {
+            //长按二维码按键检查版本升级
+            pressTime = System.currentTimeMillis()
         }
 
         //增援

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/agreement/CallingbedAgreement.kt

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.agreement
+package com.wdkl.app.ncs.callingbed.agreement
 
 import com.wdkl.ncs.android.middleware.model.dto.NurseConfigDto
 

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/BaseCallFragment.kt

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.fragment
+package com.wdkl.app.ncs.callingbed.fragment
 
 import android.os.Bundle
 import android.os.CountDownTimer

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/SkyCallFragment.kt

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.fragment
+package com.wdkl.app.ncs.callingbed.fragment
 
 import android.os.Handler
 import android.os.Looper

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/helper/SOSHelper.java

@@ -30,6 +30,7 @@ public class SOSHelper {
         }
 
         //60s之后紧急按钮灯自动复位
+        handler.removeCallbacksAndMessages(null);
         handler.sendEmptyMessageDelayed(110, 120000);
     }
 

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/helper/ScreenManagerUtil.kt

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2.helper
+package com.wdkl.app.ncs.callingbed.helper
 
 import android.content.Context
 import android.content.Intent

callingbed/src/test/java/com/wdkl/app/ncs/callingbed/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.wdkl.app.ncs.callingbed2
+package com.wdkl.app.ncs.callingbed
 
 import org.junit.Test