From 5790863f80445044f1f2a11eef6ba1049f46d79c Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Sat, 2 Apr 2022 15:46:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8FcompileSdkVersion=20=E7=89=88=E6=9C=AC=20=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_ipc_monitoring/build.gradle               |  2 +-
 .../com/zhidao/adas/client/log/LogModel.java  | 51 -------------------
 .../com/zhidao/adas/client/log/LogSave.java   |  4 +-
 3 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 app_ipc_monitoring/src/main/java/com/zhidao/adas/client/log/LogModel.java

diff --git a/app_ipc_monitoring/build.gradle b/app_ipc_monitoring/build.gradle
index e024c8573b..c11bb124aa 100644
--- a/app_ipc_monitoring/build.gradle
+++ b/app_ipc_monitoring/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion rootProject.ext.android.compileSdkVersion
     defaultConfig {
         applicationId "com.zhidao.adas.client"
         minSdkVersion 21
diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/log/LogModel.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/log/LogModel.java
deleted file mode 100644
index 94d15836a7..0000000000
--- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/log/LogModel.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.zhidao.adas.client.log;
-
-import android.graphics.Color;
-import android.text.TextUtils;
-
-//保存的log
-public class LogModel {
-
-    public interface ACTION {
-        String SEND = "发送";
-        String RECEIVE = "接收";
-        String PARSE = "解析";
-    }
-
-    public long id;
-    public int op_code;//发送：Mask  接收：数据帧类型
-    public String action;//log标签
-    public String data;//log数据
-    public String time;
-
-    public LogModel() {
-    }
-
-    public LogModel(String action, int op_code, String data) {
-        this.action = action;
-        this.op_code = op_code;
-        this.data = data;
-    }
-
-
-    public int getColor() {
-        if (TextUtils.isEmpty(action)) {
-            return Color.parseColor("#871f78");
-        }
-        switch (action) {
-            case ACTION.SEND:
-//                return 0xFA8072;
-                return Color.parseColor("#FA8072");
-            case ACTION.RECEIVE:
-//                return 0xDCDCDC;
-                return Color.parseColor("#FF00FF");
-            case ACTION.PARSE:
-//                return 0xDCDCDC;
-                return Color.parseColor("#228B22");
-            default:
-//                return 0xFFFFFF;
-                return Color.parseColor("#871f78");
-        }
-
-    }
-}
diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/log/LogSave.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/log/LogSave.java
index ac32dd9b69..fcd41203e6 100644
--- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/log/LogSave.java
+++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/log/LogSave.java
@@ -34,7 +34,7 @@ public class LogSave {
     private static final String ROOT_PATH = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "IPCMonitoring" + File.separator;//程序外部存储跟目录
     private static final String LOG_FILE_NAME = "data%s.log";//文件名称
     private volatile static LogSave INSTANCE;
-    private static final long MAX_CAPACITY = 2 * 1024 * 1024L;//单文件最大存储容量 kb
+    private static final long MAX_CAPACITY = 5 * 1024 * 1024L;//单文件最大存储容量 kb
     private final LinkedBlockingQueue<String> queue;
     private BufferedWriter buff = null;
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault());
@@ -99,8 +99,6 @@ public class LogSave {
         if (isLogSwitch) {
             long nowTime = System.currentTimeMillis();
             String time = sdf.format(new Date(nowTime));
-//            L.i(TAG, "time=" + time);
-            data = data.replace("\n", "");
             String builder = time + " [action]:" + action + " [data]:" + data;
             queue.add(builder);
         }