Browse Source

<修复bug:主机未接听时挂断界面和指示灯未更新状态>

weizhengliang 5 years ago
parent
commit
e5723cf606

+ 1 - 1
app/build.gradle

@@ -25,7 +25,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "1.0"
+        versionName "1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         buildConfigField "String", "BUILD_TIME", getDate()

+ 3 - 3
app/src/main/AndroidManifest.xml

@@ -96,9 +96,9 @@
         <service
             android:name="com.wdkl.callingbed2.service.APPService"> </service>
 
-        <!-- 适配480 800 -->
-        <meta-data android:name="design_width" android:value="480"/>
-        <meta-data android:name="design_height" android:value="800"/>
+        <!-- 适配600 1024 -->
+        <meta-data android:name="design_width" android:value="600"/>
+        <meta-data android:name="design_height" android:value="1024"/>
 
     </application>
 

+ 3 - 3
app/src/main/java/com/wdkl/callingbed2/ui/CallingBedActivity.java

@@ -1626,10 +1626,10 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
                             }
 
                             if (!udpEntity.getType().equals(Constants.WSHROOM_CALL)) {//排除卫生间;卫生间是不能呼叫的
-                                //护士主机消除请求增援
-                                if (CALL_STATUS.equals(Constants.SUPPORT_IN_CALL)) {
+                                if (!CALL_STATUS.equals(STANDBY)) {
                                     CALL_STATUS = STANDBY;
                                     showThisView(vMain);
+                                    setCallStatus(serialPortUtil, "0");
                                 }
                             } else {
                                 flickerStatus = setWSHLightFlicker(serialPortUtil, false);
@@ -2311,7 +2311,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
         versionEntityList.add(entity2);
         VersionEntity entity3 = new VersionEntity();
         entity3.setTitle("APP版本");
-        entity3.setValue(BuildConfig.VERSION_NAME);
+        entity3.setValue("V" + BuildConfig.VERSION_NAME);
         versionEntityList.add(entity3);
         VersionEntity entity4 = new VersionEntity();
         entity4.setTitle("MCU版本");