Преглед изворни кода

<风尚版总机只能播报语音提示,不支持通话功能>

weizhengliang пре 4 година
родитељ
комит
5b46e1a4d2

+ 4 - 4
app/src/main/java/com/wdkl/callingsystemmanager/service/SerialPortService.java

@@ -140,11 +140,11 @@ public class SerialPortService implements OnOpenSerialPortListener {
                             for(byte bt:buf){
                                 buffer.add(bt);
                             }
-                            try {
+                            /*try {
                                 handleReceived(buffer);
                             } catch (Exception e) {
                                 e.printStackTrace();
-                            }
+                            }*/
                         }
 
                         @Override
@@ -378,13 +378,13 @@ public class SerialPortService implements OnOpenSerialPortListener {
 
     private long lastRegisterTimemills = 0;
     public void registerAllMCU() {
-        Log.d("wzl", "registerAllMCU start------------");
+        /*Log.d("wzl", "registerAllMCU start------------");
         if (System.currentTimeMillis() - lastRegisterTimemills > 6 * 1000) {
             if (registerDeviceThread != null) {
                 registerDeviceThread.run();
             }
             lastRegisterTimemills = System.currentTimeMillis();
-        }
+        }*/
 
     }
 

+ 5 - 5
app/src/main/java/com/wdkl/callingsystemmanager/ui/activity/MainActivity.java

@@ -494,6 +494,7 @@ public class MainActivity extends BaseActivity implements IDebugInfoListner {
 
             @Override
             public void onResponse(Call call, Response response) throws IOException {
+                isLoading = false;
                 if (response.isSuccessful() && response.body() != null) {
                     String responseStr = response.body().string();
                     //Log.d("wzlll", "response: " + responseStr);
@@ -534,7 +535,6 @@ public class MainActivity extends BaseActivity implements IDebugInfoListner {
                 } else {
                     ToastUtil.showShortToast(R.string.data_error);
                 }
-                isLoading = false;
             }
         });
     }
@@ -593,7 +593,7 @@ public class MainActivity extends BaseActivity implements IDebugInfoListner {
 
     private int lastCalls = 0;
     public void setCallStatus(CallStatusEnum callStatus){
-        switch (callStatus){
+        /*switch (callStatus){
             case WAIT_CALL: //正常
             case END_CALL:
                 llCall.setVisibility(View.INVISIBLE);
@@ -624,7 +624,7 @@ public class MainActivity extends BaseActivity implements IDebugInfoListner {
                 //dataBeans = CallService.getInstance().getList();
                 //callAdapter.setNewData(dataBeans);
                 break;
-        }
+        }*/
 
         //刷新呼叫列表
         dataBeans = CallService.getInstance().getList();
@@ -756,7 +756,7 @@ public class MainActivity extends BaseActivity implements IDebugInfoListner {
                 back();
 
                 break;
-            case R.id.ll_call:
+            /*case R.id.ll_call:
                 if (CallService.getInstance().getCallingStatus()==CallStatusEnum.WAIT_CALL){
                     return;
                 }
@@ -774,7 +774,7 @@ public class MainActivity extends BaseActivity implements IDebugInfoListner {
                     }
                     SerialPortService.getInstance().endCall(bedVO);
                 }
-                break;
+                break;*/
             case R.id.btn_settings:
                 if (!MyFragmentManager.getInstance().getFragmentTag().equals("系统设置")) {
                     systemFragment = SystemFragment.newInstance("系统设置");

+ 2 - 2
app/src/main/java/com/wdkl/callingsystemmanager/ui/fragment/BedFragment2.java

@@ -76,7 +76,7 @@ public class BedFragment2 extends BaseFragment {
             @Override
             public void itemCallOnClick(View view, int position) {
                 Log.d("wzlll", "bed item click: " + position);
-                BedItem bedItem = dataBeans.get(position);
+                /*BedItem bedItem = dataBeans.get(position);
                 if (bedItem != null) {
                     CallingItem item = new CallingItem();
                     item.setBedNo(bedItem.getBedName());
@@ -85,7 +85,7 @@ public class BedFragment2 extends BaseFragment {
                     item.setModel(DeviceModel.WDMN);
                     item.setType(DeviceEnum.WDBED.value());
                     SerialPortService.getInstance().sendCall(item);
-                }
+                }*/
             }
         });
     }

+ 3 - 1
app/src/main/res/layout/item_bed2.xml

@@ -12,6 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:gravity="center_horizontal"
+        android:layout_marginTop="20dp"
         android:textColor="@color/white"
         android:textSize="28sp"
         android:singleLine="true"
@@ -35,5 +36,6 @@
         android:layout_marginTop="8dp"
         android:layout_gravity="center"
         android:scaleType="centerInside"
-        android:src="@mipmap/ic_calling" />
+        android:src="@mipmap/ic_calling"
+        android:visibility="gone"/>
 </LinearLayout>