Merge branch 'master' of http://git.wdklian.com/weizhengliang/CallingBed2

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

@@ -155,6 +155,8 @@ public class Constants {
     public static final String CALLINGBED_NOTICE = "/WDFJ-I/callingBed_notice.aspx";
     //广播音量大小
     public static final String CALLINGMAINNURSE_BROADCAST_VOL = "/WDHS-I/callingMainNurse_BroadcastVol.aspx";
+    //上传错误日志
+    public static final String UPLOADING_ERROR_LOG = "mgr/ncError";
     //广播数据
     public static final String CALLINGMAINNURSE_BROADCAST = "/WDHS-I/callingMainNurse_BroadcastInfo.aspx";
 

app/src/main/java/com/wdkl/callingbed2/util/UploadLogInformationUtils.java

@@ -0,0 +1,54 @@
+package com.wdkl.callingbed2.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 UploadLogInformationUtils {
+    private  String TAG = UploadLogInformationUtils.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/callingbed2/util/anrfcutil/AnrFcExceptionUtil.java

@@ -13,6 +13,7 @@ import com.github.anrwatchdog.ANRError;
 import com.github.anrwatchdog.ANRWatchDog;
 import com.wdkl.callingbed2.MyApplication;
 import com.wdkl.callingbed2.common.Constants;
+import com.wdkl.callingbed2.util.UploadLogInformationUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -46,6 +47,7 @@ public class AnrFcExceptionUtil implements Thread.UncaughtExceptionHandler {
      * 格式化时间
      */
     private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
+    private UploadLogInformationUtils uploadLogInformationUtils;
 
     public static AnrFcExceptionUtil getInstance(MyApplication application) {
         if (mAnrFcExceptionUtil == null) {
@@ -133,6 +135,11 @@ public class AnrFcExceptionUtil implements Thread.UncaughtExceptionHandler {
         printWriter.close();
         String result = writer.toString();
         sb.append(result);
+        if(uploadLogInformationUtils == null){
+            uploadLogInformationUtils = new UploadLogInformationUtils();
+        }
+        uploadLogInformationUtils.uploadingErrorLog(Constants.URL+Constants.URL_END+Constants.UPLOADING_ERROR_LOG,
+                "","","",sb.toString(),"");
         try {
             long timestamp = System.currentTimeMillis();
             String time = format.format(new Date());