添加客户端修改分机数据更新分机功能

.idea/codeStyles/Project.xml

@@ -1,113 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="XML">
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

app/src/main/java/com/wdkl/callingbed/common/Constants.java

@@ -128,7 +128,8 @@ public class Constants {
     /**
      * 端口号
      */
-    public static final String URL_END = ":81";
+//    public static final String URL_END = ":81";
+    public static final String URL_END = ":8005";
     /**
      * 初始化数据
      */
@@ -157,6 +158,9 @@ public class Constants {
     public static final String CALLINGMAINNURSE_BROADCAST_VOL = "/WDHS-I/callingMainNurse_BroadcastVol.aspx";
     //广播数据
     public static final String CALLINGMAINNURSE_BROADCAST = "/WDHS-I/callingMainNurse_BroadcastInfo.aspx";
+   //上传错误日志
+    public static final String UPLOADING_ERROR_LOG = "/mgr/ncError";
+
 
     public static final String BROADCAST_AUDIO_PATH = Environment.getExternalStorageDirectory() + "/BroadcastAudio";
 

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

@@ -1719,6 +1719,11 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
                             flickerStatus = setWSHLightFlicker(serialPortUtil, false);
                         }
                         break;
+                    case "sickbed_inuse":
+                    case "sickbed_unuse":
+                        getMainData(0);
+                        break;
+
                 }
                 break;
             case Constants.EVENT_NOTICE:

app/src/main/java/com/wdkl/callingbed/util/AnalysisUdpUtil.java

@@ -231,6 +231,21 @@ public class AnalysisUdpUtil {
                     case "back_1":
                         //呼叫回复");
                         break;
+                    case "sickbed_inuse"://床头分机数据更新
+                        UdpEntity updating_hospital_bed = new UdpEntity();
+                        updating_hospital_bed.setIndexes(data[0]);
+                        updating_hospital_bed.setDeviceMAC("");
+                        updating_hospital_bed.setType("");
+                        updating_hospital_bed.setRoomNumber("");
+                        break;
+                    case "sickbed_unuse"://床头分机无病床数据更新
+                        UdpEntity null_hospital_bed = new UdpEntity();
+                        null_hospital_bed.setIndexes(data[0]);
+                        null_hospital_bed.setDeviceMAC("");
+                        null_hospital_bed.setType("");
+                        null_hospital_bed.setRoomNumber("");
+                        break;
+
                 }
             } else if ("#".equals(udpMsg.substring(0, 1))) {
                 LogUtil.d("isBelongToHostMachine", "udpMsg==" + udpMsg);

app/src/main/java/com/wdkl/callingbed/util/ClientUploadUtils.java

@@ -0,0 +1,54 @@
+package com.wdkl.callingbed.util;
+
+import android.util.Log;
+
+import java.io.IOException;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.FormBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+
+public class ClientUploadUtils {
+    private  String TAG = ClientUploadUtils.class.getSimpleName();
+
+    private OkHttpClient okHttpClient;
+    public void uploadingErrorLog(String URL,String class_name,String method_name,
+                          String exception_name,String err_msg,String stack_trace){
+       if(okHttpClient == null){
+           okHttpClient = new OkHttpClient();
+       }
+        FormBody.Builder formBody = new FormBody.Builder();
+        formBody.add("class_name",class_name);
+        formBody.add("method_name",method_name);
+        formBody.add("exception_name",exception_name);
+        formBody.add("err_msg",err_msg);
+        formBody.add("stack_trace",stack_trace);
+
+        Request request  = new Request.Builder()
+                .url(URL)
+                .post(formBody.build())
+                .build();
+
+        okHttpClient.newCall(request).enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                Log.e(TAG,"错误日志上传失败"+e.getMessage());
+            }
+
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                Log.d(TAG,"错误日志上传成功");
+                String data = response.body().string();
+                Log.d(TAG,"错误日志数据 data "+data);
+            }
+        });
+
+
+    }
+
+
+}

app/src/main/java/com/wdkl/callingbed/util/anrfcutil/AnrFcExceptionUtil.java

@@ -13,6 +13,7 @@ import com.github.anrwatchdog.ANRError;
 import com.github.anrwatchdog.ANRWatchDog;
 import com.wdkl.callingbed.MyApplication;
 import com.wdkl.callingbed.common.Constants;
+import com.wdkl.callingbed.util.ClientUploadUtils;
 import com.wdkl.callingbed.util.LogUtil;
 
 import java.io.File;
@@ -48,6 +49,9 @@ public class AnrFcExceptionUtil implements Thread.UncaughtExceptionHandler {
      */
     private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
 
+    private ClientUploadUtils clientUploadUtils;
+
+
     public static AnrFcExceptionUtil getInstance(MyApplication application) {
         if (mAnrFcExceptionUtil == null) {
             mAnrFcExceptionUtil = new AnrFcExceptionUtil(application);
@@ -134,6 +138,11 @@ public class AnrFcExceptionUtil implements Thread.UncaughtExceptionHandler {
         printWriter.close();
         String result = writer.toString();
         sb.append(result);
+        if(clientUploadUtils == null){
+            clientUploadUtils = new ClientUploadUtils();
+        }
+        clientUploadUtils.uploadingErrorLog(Constants.URL+Constants.URL_END+Constants.UPLOADING_ERROR_LOG,
+                "","","",sb.toString(),"");
         try {
             long timestamp = System.currentTimeMillis();
             String time = format.format(new Date());