异常消息实体类 键盘按钮样式修改

app/src/main/java/com/emato/ich/contant/ExceptionType.java

@@ -0,0 +1,9 @@
+package com.emato.ich.contant;
+
+public class ExceptionType {
+
+    public static final String BIZ_ERROR = "biz_error";
+
+    public static final String CRASH_ERROR = "app_crash";
+
+}

app/src/main/java/com/emato/ich/contant/ICSPConstant.java

@@ -5,10 +5,10 @@ package com.emato.ich.contant;
  */
 public class ICSPConstant {
 
-    public static final String ICSP_SERVICE = "http://icsp-api.ds-bay.com";
+//    public static final String ICSP_SERVICE = "http://icsp-api.ds-bay.com";
 //    public static final String ICSP_SERVICE = "http://68rfyvi.nat.ipyingshe.com";
-//    public static final String ICSP_SERVICE = "http://icsp-testend.ds-bay.com";         // 测试+开发
+    public static final String ICSP_SERVICE = "http://icsp-testend.ds-bay.com";         // 测试+开发
 
-    public static final String MQTT_SERVER_ADDRESS = "tcp://8.135.102.238:1883";
-//    public static final String MQTT_SERVER_ADDRESS = "tcp://183.3.221.143:1883";
+//    public static final String MQTT_SERVER_ADDRESS = "tcp://8.135.102.238:1883";
+    public static final String MQTT_SERVER_ADDRESS = "tcp://183.3.221.143:1883";
 }

app/src/main/java/com/emato/ich/crash/UncaughtExceptionHandlerImpl.java

@@ -82,7 +82,7 @@ public class UncaughtExceptionHandlerImpl implements Thread.UncaughtExceptionHan
 
     @SuppressLint("WrongConstant")
     public void uncaughtException(Thread thread, Throwable ex) {
-        LoggingUtils.sendErrorLog("系统异常: 崩溃异常! ", ex);
+        LoggingUtils.sendAppErrorLog("系统异常: 崩溃异常! ", ex);
 
         if (!this.handleException(ex) && this.mDefaultHandler != null) {
             this.mDefaultHandler.uncaughtException(thread, ex);
@@ -91,7 +91,7 @@ public class UncaughtExceptionHandlerImpl implements Thread.UncaughtExceptionHan
                 Thread.sleep(1000L);
             } catch (InterruptedException var6) {
                 Log.e(TAG, "error 出现未知异常: ", var6);
-                LoggingUtils.sendErrorLog("系统异常: 线程中断异常! ", var6);
+                LoggingUtils.sendAppErrorLog("系统异常: 线程中断异常! ", var6);
             }
 
             if (this.mIsRestartApp) {

app/src/main/java/com/emato/ich/entity/vo/ExceptionVo.java

@@ -0,0 +1,58 @@
+package com.emato.ich.entity.vo;
+
+
+/**
+ * 异常信息
+ */
+public class ExceptionVo {
+
+    private String reportType;
+
+    private String reportData;
+
+    private String clientId;
+
+    private String reportTime;
+
+    public String getReportType() {
+        return reportType;
+    }
+
+    public void setReportType(String reportType) {
+        this.reportType = reportType;
+    }
+
+    public String getReportData() {
+        return reportData;
+    }
+
+    public void setReportData(String reportData) {
+        this.reportData = reportData;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public String getReportTime() {
+        return reportTime;
+    }
+
+    public void setReportTime(String reportTime) {
+        this.reportTime = reportTime;
+    }
+
+    @Override
+    public String toString() {
+        return "ExceptionVo{" +
+                "reportType='" + reportType + '\'' +
+                ", reportData='" + reportData + '\'' +
+                ", clientId='" + clientId + '\'' +
+                ", reportTime='" + reportTime + '\'' +
+                '}';
+    }
+}

app/src/main/java/com/emato/ich/fragment/InputInfoFragment.java

@@ -118,7 +118,7 @@ public class InputInfoFragment extends Fragment {
                         public void onFailure(@NotNull Call call, @NotNull IOException e) {
                             // 请求失败
                             Log.e(TAG, "onFailure: 请求oms获取手机号失败! 网络异常! ", e);
-                            LoggingUtils.sendErrorLog("请求oms获取手机号失败! 网络异常! ", e);
+                            LoggingUtils.sendErrorLog("业务异常: 请求oms获取手机号失败! 网络异常! ", e);
                             ToastUtils.make(getContext(), "服务器异常! 请手动输入!");
                             mailNoLock.set(1);
                         }

app/src/main/java/com/emato/ich/utils/LoggingUtils.java

@@ -1,11 +1,16 @@
 package com.emato.ich.utils;
 
+import com.emato.ich.contant.ExceptionType;
+import com.emato.ich.entity.vo.ExceptionVo;
 import com.emato.ich.message.ICHPublishClient;
 import com.emato.ich.message.ICHTopic;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 
 import java.io.ByteArrayOutputStream;
+import java.util.Date;
 
 /**
  * 异常日志处理工具类
@@ -15,13 +20,36 @@ public class LoggingUtils {
 
     public static void sendErrorLog(String cause, Throwable throwable){
 
+        MqttMessage mqttMessage = wrapMessage((cause + ": " + (getStackTrace(throwable).toString())), ExceptionType.BIZ_ERROR);
+        ICHPublishClient.getInstance().publish(String.format(ICHTopic.ERROR_LOG_REPORT, BaseUtils.getClientId()), mqttMessage);
+    }
+
+    public static void sendAppErrorLog(String cause, Throwable throwable){
+
+        MqttMessage mqttMessage = wrapMessage((cause + ": " + (getStackTrace(throwable).toString())), ExceptionType.CRASH_ERROR);
+        ICHPublishClient.getInstance().publish(String.format(ICHTopic.ERROR_LOG_REPORT, BaseUtils.getClientId()), mqttMessage);
+    }
+
+    private static MqttMessage wrapMessage(String cause, String type) {
+        ExceptionVo exceptionVo = new ExceptionVo();
+        exceptionVo.setClientId(BaseUtils.getClientId());
+        exceptionVo.setReportData(cause);
+        exceptionVo.setReportType(type);
+        exceptionVo.setReportTime(DateUtils.formatDate(new Date()));
         // TODO 发送异常信息
         MqttMessage mqttMessage = new MqttMessage();
         mqttMessage.setQos(1);
-        mqttMessage.setPayload((cause + ": " + (getStackTrace(throwable).toString())).getBytes());
-        ICHPublishClient.getInstance().publish(String.format(ICHTopic.ERROR_LOG_REPORT, BaseUtils.getClientId()), mqttMessage);
+        byte[] bytes = null;
+        try {
+            bytes = JacksonUtils.objectmapper.writeValueAsBytes(exceptionVo);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        mqttMessage.setPayload(bytes);
+        return mqttMessage;
     }
 
+
     private static ByteArrayOutputStream getStackTrace(Throwable t) {
         ByteArrayOutputStream buf = new java.io.ByteArrayOutputStream();
         t.printStackTrace(new java.io.PrintWriter(buf, true));

app/src/main/res/layout/fragment_input_info.xml

@@ -32,6 +32,7 @@
         android:layout_x="228dp"
         android:layout_y="399dp"
         android:text="@string/number_8"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -41,6 +42,7 @@
         android:layout_x="177dp"
         android:layout_y="339dp"
         android:text="@string/number_1"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -50,7 +52,8 @@
         android:layout_x="228dp"
         android:layout_y="339dp"
         android:text="@string/number_2"
-        android:textSize="10dp" />
+        android:textSize="10dp"
+        android:textColor="@color/black"/>
 
     <Button
         android:id="@+id/input_button3"
@@ -59,6 +62,7 @@
         android:layout_x="279dp"
         android:layout_y="339dp"
         android:text="@string/number_3"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -68,6 +72,7 @@
         android:layout_x="228dp"
         android:layout_y="369dp"
         android:text="@string/number_5"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -77,6 +82,7 @@
         android:layout_x="177dp"
         android:layout_y="369dp"
         android:text="@string/number_4"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -87,6 +93,7 @@
         android:layout_y="429dp"
         android:text="@string/cancel_btn"
         android:textSize="12sp"
+        android:textColor="@color/black"
         android:textStyle="bold" />
 
     <Button
@@ -96,6 +103,7 @@
         android:layout_x="177dp"
         android:layout_y="429dp"
         android:text="@string/number_0"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -106,6 +114,7 @@
         android:layout_y="459dp"
         android:text="@string/confirm_btn"
         android:textSize="12dp"
+        android:textColor="@color/black"
         android:theme="@style/Theme.ButtonStyle.CONFIRM" />
 
     <Button
@@ -115,6 +124,7 @@
         android:layout_x="279dp"
         android:layout_y="369dp"
         android:text="@string/number_6"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -124,6 +134,7 @@
         android:layout_x="279dp"
         android:layout_y="399dp"
         android:text="@string/number_9"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <EditText
@@ -145,6 +156,7 @@
         android:layout_x="177dp"
         android:layout_y="399dp"
         android:text="@string/number_7"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <TextView

app/src/main/res/layout/fragment_send.xml

@@ -37,6 +37,7 @@
         android:layout_x="175dp"
         android:layout_y="411dp"
         android:text="@string/number_7"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -46,6 +47,7 @@
         android:layout_x="175dp"
         android:layout_y="351dp"
         android:text="@string/number_1"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -55,7 +57,8 @@
         android:layout_x="226dp"
         android:layout_y="351dp"
         android:text="@string/number_2"
-        android:textSize="10dp" />
+        android:textSize="10dp"
+        android:textColor="@color/black" />
 
     <Button
         android:id="@+id/input_button3"
@@ -64,6 +67,7 @@
         android:layout_x="277dp"
         android:layout_y="351dp"
         android:text="@string/number_3"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -73,6 +77,7 @@
         android:layout_x="226dp"
         android:layout_y="381dp"
         android:text="@string/number_5"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -81,6 +86,7 @@
         android:layout_height="40dp"
         android:layout_x="175dp"
         android:layout_y="381dp"
+        android:textColor="@color/black"
         android:text="@string/number_4"
         android:textSize="10dp" />
 
@@ -92,6 +98,7 @@
         android:layout_y="441dp"
         android:text="@string/cancel_btn"
         android:textSize="12sp"
+        android:textColor="@color/black"
         android:textStyle="bold" />
 
     <Button
@@ -100,6 +107,7 @@
         android:layout_height="40dp"
         android:layout_x="175dp"
         android:layout_y="441dp"
+        android:textColor="@color/black"
         android:text="@string/number_0"
         android:textSize="10dp" />
 
@@ -111,6 +119,7 @@
         android:layout_y="471dp"
         android:text="@string/confirm_btn"
         android:textSize="10dp"
+        android:textColor="@color/black"
         android:theme="@style/Theme.ButtonStyle.CONFIRM" />
 
     <Button
@@ -118,6 +127,7 @@
         android:layout_width="48dp"
         android:layout_height="40dp"
         android:layout_x="277dp"
+        android:textColor="@color/black"
         android:layout_y="381dp"
         android:text="@string/number_6"
         android:textSize="10dp" />
@@ -129,6 +139,7 @@
         android:layout_x="277dp"
         android:layout_y="411dp"
         android:text="@string/number_9"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <EditText
@@ -150,6 +161,7 @@
         android:layout_x="226dp"
         android:layout_y="411dp"
         android:text="@string/number_8"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <TextView

app/src/main/res/layout/fragment_take_code.xml

@@ -41,6 +41,7 @@
         android:layout_x="232dp"
         android:layout_y="467dp"
         android:text="@string/cancel_btn"
+        android:textColor="@color/black"
         android:textSize="12sp"
         android:textStyle="bold" />
 
@@ -51,6 +52,7 @@
         android:layout_x="182dp"
         android:layout_y="407dp"
         android:text="@string/number_4"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <EditText
@@ -67,11 +69,12 @@
 
     <Button
         android:id="@+id/take_input_button2"
-        android:layout_width="48dp"
+        android:layout_width="50dp"
         android:layout_height="40dp"
-        android:layout_x="232dp"
+        android:layout_x="230dp"
         android:layout_y="377dp"
         android:text="@string/number_2"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -81,6 +84,7 @@
         android:layout_x="182dp"
         android:layout_y="437dp"
         android:text="@string/number_7"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -90,6 +94,7 @@
         android:layout_x="282dp"
         android:layout_y="437dp"
         android:text="@string/number_9"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -99,6 +104,7 @@
         android:layout_x="282dp"
         android:layout_y="407dp"
         android:text="@string/number_6"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -108,6 +114,7 @@
         android:layout_x="282dp"
         android:layout_y="377dp"
         android:text="@string/number_3"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -116,6 +123,7 @@
         android:layout_height="40dp"
         android:layout_x="232dp"
         android:layout_y="437dp"
+        android:textColor="@color/black"
         android:text="@string/number_8"
         android:textSize="10dp" />
 
@@ -126,6 +134,7 @@
         android:layout_x="232dp"
         android:layout_y="407dp"
         android:text="@string/number_5"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <ImageButton
@@ -143,6 +152,7 @@
         android:layout_x="182dp"
         android:layout_y="467dp"
         android:text="@string/number_0"
+        android:textColor="@color/black"
         android:textSize="10dp" />
 
     <Button
@@ -153,6 +163,7 @@
         android:layout_y="497dp"
         android:text="@string/confirm_btn"
         android:textSize="10dp"
+        android:textColor="@color/black"
         android:theme="@style/Theme.ButtonStyle.CONFIRM" />
 
     <Button
@@ -161,6 +172,7 @@
         android:layout_height="40dp"
         android:layout_x="182dp"
         android:layout_y="377dp"
+        android:textColor="@color/black"
         android:text="@string/number_1"
         android:textSize="10dp" />
 

app/src/main/res/values/colors.xml

@@ -6,18 +6,20 @@
     <color name="purple_700">#c9dd22</color>
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>
+
+    <!--  自定义键盘字体颜色  -->
     <color name="black">#000000</color>
     <color name="white">#FFFFFFFF</color>
     <!--  键盘按钮  -->
     <!--    <color name="send_btn">#75FF90</color>-->
-    <color name="send_btn">#446878</color>
+    <color name="send_btn">#f9f3e6</color>
     <color name="take_btn">#EBBA3A</color>
     <color name="main_label_bg">#4E4C4D</color>
     <!--  选择柜子类型背景颜色  -->
     <color name="choose_cabinet_view">#9DDA99</color>
     <!--  确认键  -->
 <!--    <color name="input_confirm">#20E45E</color>-->
-    <color name="input_confirm">#13445a</color>
+    <color name="input_confirm">#e2dcd5</color>
     <!--  主页按钮以及大按钮  -->
     <color name="confirm_btn">#25a55f</color>
     <!--  返回按钮  -->