Prechádzať zdrojové kódy

<修复bug: 总机呼叫分机,返回后再次进入状态不对>

weizhengliang 5 rokov pred
rodič
commit
20b5892114

+ 1 - 1
app/build.gradle

@@ -23,7 +23,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "1.1"
+        versionName "1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

+ 11 - 0
app/src/main/java/com/wdkl/callingmainnursemanager/ui/fragment/CallingBedFragment.java

@@ -1004,6 +1004,9 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
     }
 
     private void resetData() {
+        vRightPatientInfo.setVisibility(View.VISIBLE);
+        vRightCallInfo.setVisibility(View.GONE);
+        vRightCallListInfo.setVisibility(View.GONE);
         wardInformationList.clear();
         sickbedInformationList.clear();
         roomAdapter.updateList(wardInformationList);
@@ -1237,11 +1240,19 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
 
     @OnClick(R.id.right_in_call_list_layout_iv_back)
     public void back() {
+        if (!Constants.CALL_STATE.equals(Constants.STANDBY)) {
+            ToastUtil.showToast("当前正在通话中,无法返回");
+            return;
+        }
         EventBus.getDefault().post(new MessageEvent(0, Constants.EVENT_FRAGMENT));
     }
 
     @OnClick(R.id.right_patient_info_layout_tv_back)
     public void backHost() {
+        if (!Constants.CALL_STATE.equals(Constants.STANDBY)) {
+            ToastUtil.showToast("当前正在通话中,无法返回");
+            return;
+        }
         EventBus.getDefault().post(new MessageEvent(0, Constants.EVENT_FRAGMENT));
     }