<修改在通话中时按分机手柄可以挂断>

app/build.gradle

@@ -4,15 +4,15 @@ android {
     // wuyq add for sign begin
     signingConfigs {
         release {
-            storeFile file("keystore/wdkl_bed.jks")
+            storeFile file("keystore_wuyuqing_3128/rk3128.jks")
             storePassword "111111"
-            keyAlias "wdkl_bed"
+            keyAlias "rk3128"
             keyPassword "111111"
         }
         debug {
-            storeFile file("keystore/wdkl_bed.jks")
+            storeFile file("keystore_wuyuqing_3128/rk3128.jks")
             storePassword "111111"
-            keyAlias "wdkl_bed"
+            keyAlias "rk3128"
             keyPassword "111111"
         }
     }
@@ -25,7 +25,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "1.22"
+        versionName "1.23"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         buildConfigField "String", "BUILD_TIME", getDate()

app/src/main/java/com/wdkl/callingbed/ui/CallingBedActivity.java

@@ -1484,7 +1484,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
                     CallingBedActivity.this.runOnUiThread(new Runnable() {
                         public void run() {
                             LogUtil.d("WWW", "呼叫护士键==-2");
-                            if (CALL_STATUS.equals(Constants.STANDBY) || CALL_STATUS.equals(NURSE_CALL_TIMEOUT)) {  //待机状态或呼叫超时
+                            if (CALL_STATUS.equals(Constants.STANDBY) || CALL_STATUS.equals(Constants.IN_CALLING) || CALL_STATUS.equals(NURSE_CALL_TIMEOUT)) {  //待机状态或呼叫超时或通话中可以挂断
                                 handsMICStatus = setHandsMIC(serialPortUtil, true);
 
                                 clickVNurse();