فهرست منبع

<紧急按钮当分机使用,移除通话功能,修改相应语音提示>

weizhengliang 4 سال پیش
والد
کامیت
06c950cc1b

+ 1 - 1
app/build.gradle

@@ -24,7 +24,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 26
         versionCode 1
-        versionName "1.72"
+        versionName "1.73"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

+ 1 - 1
app/src/main/java/com/wdkl/callingmainnurse/adapter/CallListAdapter.java

@@ -106,7 +106,7 @@ public class CallListAdapter extends RecyclerView.Adapter<CallListAdapter.MyView
                 holder.llBed.setVisibility(View.GONE);
                 holder.llRoom.setVisibility(View.VISIBLE);
 
-                holder.ivLogo.setImageResource(R.mipmap.ic_wc);
+                holder.ivLogo.setImageResource(R.mipmap.ic_door);
                 holder.tvRoomNum.setText(list.get(position).getRoomNumber() + "房");
                 holder.tvName.setText(" 紧急呼叫 ");
                 break;

+ 10 - 5
app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/CallingBedFragment.java

@@ -1077,6 +1077,11 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
      */
     @OnClick(R.id.right_in_calling_layout_iv_call)
     public void Call(View view) {
+        if (true) {
+            ToastUtil.showToast("不支持通话!");
+            return;
+        }
+
         currentTime = System.currentTimeMillis();
         if (currentTime - lastClickTime > CLICK_DELAY_TIME) {
             lastClickTime = currentTime;
@@ -1320,7 +1325,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
         } else {
             if (!Constants.CALL_STATE.equals(Constants.STANDBY)) return;
             if (MyApplication.callEntityList.get(position).getType().equals(Constants.WSHROOM_CALL)) {
-                showToast("不支持卫生间通话");
+                showToast("当前不支持通话");
                 vRightCallListInfo.setVisibility(View.GONE);
                 vRightPatientInfo.setVisibility(View.VISIBLE);
                 vRightCallInfo.setVisibility(View.GONE);
@@ -1898,7 +1903,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
         }
         if (!TextUtils.isEmpty(speechText)) {
             loopingUdpentity = entity;
-            showUrgentWindow(entity);
+            //showUrgentWindow(entity);
             //紧急呼叫和请求增援及特级护理呼叫优先
             if (entity.getType().equals(Constants.WSHROOM_CALL)
                     || entity.getType().equals(Constants.ROOMHELP_CALL)
@@ -1948,7 +1953,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                 }
                 break;
             case Constants.WSHROOM_CALL://卫生间
-                text = rnb + "房卫生间紧急呼叫";
+                text = rnb + "房紧急呼叫";
                 break;
             case Constants.MANAGER_CALL://总控机
                 text = "总控制室呼叫";
@@ -2364,7 +2369,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                             resIdlist.add(PalyPhonetics.getResIdInt(s));
                         }
                         resIdlist.add(R.raw.fang);
-                        resIdlist.add(R.raw.weishejian);
+                        //resIdlist.add(R.raw.weishejian);
                         resIdlist.add(R.raw.jinjihujiao);
                     }
                     break;
@@ -2403,7 +2408,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
         } else {
             PalyPhonetics.speakEntityList.add(udpEntity);
         }
-        showUrgentWindow(udpEntity);
+        //showUrgentWindow(udpEntity);
     }
 
     public void startPalyPhonetics() {

+ 1 - 1
app/src/main/res/layout/item_call_list_layout.xml

@@ -115,5 +115,5 @@
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_gravity="center_horizontal"
-        android:src="@mipmap/ic_wc" />
+        android:src="@mipmap/ic_call_bed" />
 </RelativeLayout>