replace old iclogger
authorTrillGates <williamtrillgates@gmail.com>
Wed, 22 Dec 2021 12:58:50 +0000 (20:58 +0800)
committerTrillGates <williamtrillgates@gmail.com>
Wed, 22 Dec 2021 12:58:50 +0000 (20:58 +0800)
97 files changed:
app/build.gradle
app/libs/ICLoger-release.aar [new file with mode: 0644]
app/libs/android-logging-log4j-1.0.3.jar [deleted file]
app/libs/ftp4j-1.7.2.jar [deleted file]
app/libs/log4j-1.2.17.jar [deleted file]
app/libs/okio-2.4.3.jar [deleted file]
app/proguard-rules.pro
app/release/ICSer_V940_2112221947_release.apk [moved from app/release/ICSer_V939_2112211709_release.apk with 77% similarity]
app/release/output.json
app/src/main/java/com/enqualcomm/support/BootCompleteReceiver.java
app/src/main/java/com/enqualcomm/support/Config.java
app/src/main/java/com/enqualcomm/support/CoreService.java
app/src/main/java/com/enqualcomm/support/CrashHandler.java [deleted file]
app/src/main/java/com/enqualcomm/support/GSensorListener.java
app/src/main/java/com/enqualcomm/support/ICApplication.java
app/src/main/java/com/enqualcomm/support/ICSmsManager.java
app/src/main/java/com/enqualcomm/support/LocationClient.java
app/src/main/java/com/enqualcomm/support/MainActivity.java
app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java
app/src/main/java/com/enqualcomm/support/NMEAListener.java
app/src/main/java/com/enqualcomm/support/adapter/BTHelper.java
app/src/main/java/com/enqualcomm/support/adapter/LBSHelper.java
app/src/main/java/com/enqualcomm/support/bean/DeviceStatus.java
app/src/main/java/com/enqualcomm/support/bean/ICLocation.java
app/src/main/java/com/enqualcomm/support/bean/Runtime.java
app/src/main/java/com/enqualcomm/support/bean/SleepInfo.java
app/src/main/java/com/enqualcomm/support/provider/FZDDatabaseHelper.java
app/src/main/java/com/enqualcomm/support/provider/FZDMembersProvider.java
app/src/main/java/com/enqualcomm/support/provider/FZDMessageProvider.java
app/src/main/java/com/enqualcomm/support/provider/FZDSettingsProvider.java
app/src/main/java/com/enqualcomm/support/provider/ICAlarmProvider.java
app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java
app/src/main/java/com/enqualcomm/support/provider/MySqlitOpenHelper.java
app/src/main/java/com/enqualcomm/support/provider/WeTalkMessageProvider.java
app/src/main/java/com/enqualcomm/support/service/AlarmManagerUtil.java
app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
app/src/main/java/com/enqualcomm/support/service/AudioService.java
app/src/main/java/com/enqualcomm/support/service/Deliver.java
app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
app/src/main/java/com/enqualcomm/support/service/Initialize.java
app/src/main/java/com/enqualcomm/support/service/InputEventReader.java
app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java
app/src/main/java/com/enqualcomm/support/service/SilentManager.java
app/src/main/java/com/enqualcomm/support/service/SmsDatabaseChaneObserver.java
app/src/main/java/com/enqualcomm/support/service/SynchronousTime.java
app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java
app/src/main/java/com/enqualcomm/support/service/WeTalkMsgObserver.java
app/src/main/java/com/enqualcomm/support/utils/AESCipher.java
app/src/main/java/com/enqualcomm/support/utils/APNUtil.java
app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java
app/src/main/java/com/enqualcomm/support/utils/ApnEditor.java
app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java
app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java
app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java
app/src/main/java/com/enqualcomm/support/utils/DnsUtil.java
app/src/main/java/com/enqualcomm/support/utils/FileOutputUtil.java
app/src/main/java/com/enqualcomm/support/utils/HttpDnsRecordUtil.java
app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java
app/src/main/java/com/enqualcomm/support/utils/ICHttpUtil.java
app/src/main/java/com/enqualcomm/support/utils/ICLogger.java [deleted file]
app/src/main/java/com/enqualcomm/support/utils/LanguageUtils.java
app/src/main/java/com/enqualcomm/support/utils/LedUtil.java
app/src/main/java/com/enqualcomm/support/utils/MissedCallContentObserver.java
app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
app/src/main/java/com/enqualcomm/support/utils/NetworkObservable.java
app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
app/src/main/java/com/enqualcomm/support/utils/ProfileManager.java
app/src/main/java/com/enqualcomm/support/utils/RxSocket.java
app/src/main/java/com/enqualcomm/support/utils/SendEmail.java
app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java
app/src/main/java/com/enqualcomm/support/utils/TempAlgUtil.java
app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java
app/src/main/java/com/enqualcomm/support/utils/Util.java
app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java
app/src/main/java/com/enqualcomm/support/utils/ftpUtils.java
app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java
app/src/main/java/com/enqualcomm/support/utils/sysProperties.java
app/src/main/java/com/ic/protocols/protocolAPIHelper.java
app/src/main/java/com/ic/protocols/protocol_anan.java
app/src/main/java/com/ic/protocols/protocol_beehome.java
app/src/main/java/com/ic/protocols/protocol_fzd.java
app/src/main/java/com/ic/protocols/protocol_gator.java
app/src/main/java/com/ic/protocols/protocol_ic.java
app/src/main/java/com/ic/protocols/protocol_jiai.java
app/src/main/java/com/ic/protocols/protocol_mqtt.java
app/src/main/java/com/ic/protocols/protocol_mqtt_client.java
app/src/main/java/com/ic/protocols/protocol_s123.java
app/src/main/java/com/ic/view/msg/MessageAdapter.java
app/src/main/java/com/ic/view/msg/MsgMustReadDialog.java
app/src/main/java/se/wetcat/qatja/android/QatjaService.java
app/version_code.properties

index b84b7c4..b980cb7 100644 (file)
@@ -86,7 +86,6 @@ dependencies {
     compileOnly files('libs/telephony-common-full-debug.jar')
     compileOnly files('libs/frameworks-full-debug.jar')
     compileOnly files('libs/frameworks-2-full-debug.jar')
-
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     //compile fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
@@ -96,12 +95,11 @@ dependencies {
     implementation 'com.github.ChestnutPlus:TestModules:v1.0.16'
     testImplementation 'junit:junit:4.12'
     implementation 'com.android.support:recyclerview-v7:25.1.0'
-    implementation files('libs/android-logging-log4j-1.0.3.jar', 'libs/ftp4j-1.7.2.jar', 'libs/log4j-1.2.17.jar', 'libs/okio-2.4.3.jar')
     implementation files('libs/mail.jar')
     implementation files('libs/activation.jar', 'libs/additionnal.jar')
     implementation project(path: ':dNSCache')
     implementation project(path: ':core')
-
+    implementation files('libs/ICLoger-release.aar')
 //    implementation 'se.wetcat.qatja:core:1.0.4'
 //    implementation "androidx.recyclerview:recyclerview:1.1.0
 }
diff --git a/app/libs/ICLoger-release.aar b/app/libs/ICLoger-release.aar
new file mode 100644 (file)
index 0000000..1edb03f
Binary files /dev/null and b/app/libs/ICLoger-release.aar differ
diff --git a/app/libs/android-logging-log4j-1.0.3.jar b/app/libs/android-logging-log4j-1.0.3.jar
deleted file mode 100644 (file)
index 7d4146f..0000000
Binary files a/app/libs/android-logging-log4j-1.0.3.jar and /dev/null differ
diff --git a/app/libs/ftp4j-1.7.2.jar b/app/libs/ftp4j-1.7.2.jar
deleted file mode 100644 (file)
index fca26ec..0000000
Binary files a/app/libs/ftp4j-1.7.2.jar and /dev/null differ
diff --git a/app/libs/log4j-1.2.17.jar b/app/libs/log4j-1.2.17.jar
deleted file mode 100644 (file)
index 068867e..0000000
Binary files a/app/libs/log4j-1.2.17.jar and /dev/null differ
diff --git a/app/libs/okio-2.4.3.jar b/app/libs/okio-2.4.3.jar
deleted file mode 100644 (file)
index 6289cf6..0000000
Binary files a/app/libs/okio-2.4.3.jar and /dev/null differ
index 8fc6534..d0a2dd1 100644 (file)
 -keep class com.sina.util.dnscache.** { *; }
 -keep class rx.internal.**  { *; }
 -keep class java.util.concurrent.**  { *; }
--keep class se.wetcat.qatia.**  { *; }
\ No newline at end of file
+-keep class se.wetcat.qatia.**  { *; }
+
+-keep class com.ic.iclooger.CrashHandler
+-keep class com.ic.iclooger.ICLogger
+
+-keepclassmembers class com.ic.iclooger.StorageUtils {
+    public static <fields>;
+    public static <methods>;
+    public <methods>;
+}
+
+-keepclassmembers class com.ic.iclooger.SystemUtils {
+    public static <fields>;
+    public static <methods>;
+    public <methods>;
+}
+
+-keep class com.facebook.** { *; }
+-keep class com.mediatek.** { *; }
+-keep class org.apache.** { *; }
+-keep class okio.Okio.** { *; }
+-keep class java.nio.** { *; }
+-keep class com.android.** { *; }
+-keep class android.** { *; }git
+-keep class android.ddm.** { *; }
+-keep class com.alibaba.fastjson.** { *; }
+-keep class com.eqc.watch.launcher.WatchApplication { *; }
+#-keep class com.enqualcomm.support.EqcAlgorithmNative { *; }
+
+-dontwarn com.facebook.**
+-dontwarn com.mediatek.**
+-dontwarn java.nio.**
+-dontwarn com.alibaba.fastjson.**
+-dontwarn android.**
+-dontwarn com.android.**
+-dontwarn rx.internal.**
+
+-keep class com.ic.** { *; }
\ No newline at end of file
similarity index 77%
rename from app/release/ICSer_V939_2112211709_release.apk
rename to app/release/ICSer_V940_2112221947_release.apk
index e9ce8c8..e15bf03 100644 (file)
Binary files a/app/release/ICSer_V939_2112211709_release.apk and b/app/release/ICSer_V940_2112221947_release.apk differ
index 4bc1728..2a7289b 100644 (file)
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":939,"versionName":"2112211709","enabled":true,"outputFile":"ICSer_V939_2112211709_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V939_2112211709_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":940,"versionName":"2112221947","enabled":true,"outputFile":"ICSer_V940_2112221947_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V940_2112221947_release.apk","properties":{}}]
\ No newline at end of file
index a135646..a273093 100644 (file)
@@ -4,7 +4,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;\r
 import android.content.Intent;\r
 \r
-import com.enqualcomm.support.utils.ICLogger;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 public class BootCompleteReceiver extends BroadcastReceiver {\r
     public void onReceive(Context paramContext, Intent paramIntent) {\r
index ee45798..eb928d7 100644 (file)
@@ -10,11 +10,11 @@ import com.enqualcomm.support.bean.ICLocation;
 import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.utils.HeartRateOxygenTestType;
 import com.enqualcomm.support.utils.ICAudioManager;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.SharePreferenceUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.VibrateUtil;
+import com.ic.iclooger.ICLogger;
 import com.ic.jni.ICJniUtils;
 import com.ic.protocols.protocolAPIHelper;
 
index e4a7705..2f8da32 100644 (file)
@@ -55,7 +55,6 @@ import com.enqualcomm.support.utils.ContextProxy;
 import com.enqualcomm.support.utils.DBHelper;
 import com.enqualcomm.support.utils.DeviceInfoUtil;
 import com.enqualcomm.support.utils.FileOutputUtil;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.LedUtil;
 import com.enqualcomm.support.utils.NettyConnection;
 import com.enqualcomm.support.utils.SharePreferenceUtil;
@@ -68,6 +67,7 @@ import com.enqualcomm.support.utils.WakeLockUtil;
 import com.enqualcomm.support.utils.mqttConnection;
 import com.ic.fzd.weather.IFZDWeatherCallback;
 import com.ic.fzd.weather.IFZDWeatherService;
+import com.ic.iclooger.ICLogger;
 import com.ic.jni.ICJniUtils;
 import com.ic.protocols.protocolAPIHelper;
 import com.ic.s123.IS123WeatherCallback;
diff --git a/app/src/main/java/com/enqualcomm/support/CrashHandler.java b/app/src/main/java/com/enqualcomm/support/CrashHandler.java
deleted file mode 100644 (file)
index 277841a..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.enqualcomm.support;\r
-\r
-import android.content.Context;\r
-import android.content.pm.PackageInfo;\r
-import android.content.pm.PackageManager;\r
-import android.os.Build;\r
-import android.os.Looper;\r
-import android.util.Log;\r
-import android.widget.Toast;\r
-\r
-import com.enqualcomm.support.utils.StorageUtils;\r
-import com.enqualcomm.support.utils.Util;\r
-\r
-import java.io.File;\r
-import java.io.FileOutputStream;\r
-import java.io.PrintWriter;\r
-import java.io.StringWriter;\r
-import java.io.Writer;\r
-import java.lang.reflect.Field;\r
-import java.text.DateFormat;\r
-import java.text.SimpleDateFormat;\r
-import java.util.Date;\r
-import java.util.HashMap;\r
-import java.util.Locale;\r
-import java.util.Map;\r
-\r
-/**\r
- * Created by Administrator on 2017/5/18.\r
- */\r
-\r
-public class CrashHandler implements Thread.UncaughtExceptionHandler {\r
-    public static final String TAG = CrashHandler.class.getName();\r
-\r
-    // 系统默认的UncaughtException处理类\r
-    private Thread.UncaughtExceptionHandler mDefaultHandler;\r
-    // CrashHandler实例\r
-    private static CrashHandler INSTANCE = null;\r
-    // 程序的Context对象\r
-    private Context mContext;\r
-    // 用来存储设备信息和异常信息\r
-    private Map<String, String> infos = new HashMap<String, String>();\r
-    // 用于格式化日期,作为日志文件名的一部分\r
-    private DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS", Locale.getDefault());\r
-    private DateFormat dateFormatDate = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());\r
-\r
-    /**\r
-     * 保证只有一个CrashHandler实例\r
-     */\r
-    private CrashHandler() {\r
-    }\r
-\r
-    /**\r
-     * 获取CrashHandler实例 ,单例模式\r
-     */\r
-    public synchronized static CrashHandler getInstance() {\r
-        if (INSTANCE == null)\r
-            INSTANCE = new CrashHandler();\r
-        return INSTANCE;\r
-    }\r
-\r
-    /**\r
-     * 初始化\r
-     *\r
-     * @param context\r
-     */\r
-    public void init(Context context) {\r
-        mContext = context;\r
-        // 获取系统默认的UncaughtException处理器\r
-        mDefaultHandler = Thread.getDefaultUncaughtExceptionHandler();\r
-        // 设置该CrashHandler为程序的默认处理器\r
-        Thread.setDefaultUncaughtExceptionHandler(this);\r
-    }\r
-\r
-    /**\r
-     * 当UncaughtException发生时会转入该函数来处理\r
-     */\r
-    @Override\r
-    public void uncaughtException(Thread thread, Throwable ex) {\r
-        if (!handleException(ex) && mDefaultHandler != null) {\r
-            // 如果用户没有处理则让系统默认的异常处理器来处理\r
-            mDefaultHandler.uncaughtException(thread, ex);\r
-        } else {\r
-            Util.mSleep(1000);\r
-        }\r
-\r
-        // 退出程序\r
-        ex.printStackTrace();\r
-        android.os.Process.killProcess(android.os.Process.myPid());\r
-        System.exit(1);\r
-    }\r
-\r
-    /**\r
-     * 自定义错误处理,收集错误信息 发送错误报告等操作均在此完成.\r
-     *\r
-     * @param ex\r
-     * @return true:如果处理了该异常信息;否则返回false.\r
-     */\r
-    private boolean handleException(Throwable ex) {\r
-        if (ex == null) {\r
-            return false;\r
-        }\r
-        // 使用Toast来显示异常信息\r
-        new Thread() {\r
-            @Override\r
-            public void run() {\r
-                Looper.prepare();\r
-                if (mContext != null) {\r
-                    Toast.makeText(mContext, R.string.program_abnormal, Toast.LENGTH_LONG)\r
-                            .show();\r
-                    Looper.loop();\r
-                }\r
-            }\r
-        }.start();\r
-        // 收集设备参数信息\r
-        collectDeviceInfo(mContext);\r
-        // 保存日志文件\r
-        saveCrashInfo2File(ex);\r
-        //设置断网状态\r
-        Util.setSystemProperties("persist.sys.server_connected", "false");\r
-        return true;\r
-    }\r
-\r
-    /**\r
-     * 收集设备参数信息\r
-     *\r
-     * @param ctx\r
-     */\r
-    public void collectDeviceInfo(Context ctx) {\r
-        infos.clear();\r
-        infos.put("===", " PackageInfo ===");\r
-        try {\r
-            PackageManager pm = ctx.getPackageManager();\r
-            PackageInfo pi = pm.getPackageInfo(ctx.getPackageName(), PackageManager.GET_ACTIVITIES);\r
-\r
-            if (pi != null) {\r
-                String versionName = pi.versionName;\r
-                String versionCode = pi.versionCode + "";\r
-                infos.put("versionName", versionName);\r
-                infos.put("versionCode", versionCode);\r
-            }\r
-        } catch (PackageManager.NameNotFoundException e) {\r
-            Log.e(TAG, "an error occured when collect package info " + e);\r
-        }\r
-\r
-        infos.put("===", " Build ===");\r
-        Field[] fields = Build.class.getDeclaredFields();\r
-        for (Field field : fields) {\r
-            try {\r
-                field.setAccessible(true);\r
-                infos.put(field.getName(), field.get(null).toString());\r
-                Log.d(TAG, field.getName() + ":" + field.get(null));\r
-            } catch (Exception e) {\r
-                Log.e(TAG, "an error occured when collect crash info," + e);\r
-            }\r
-        }\r
-    }\r
-\r
-    /**\r
-     * 保存错误信息到文件中\r
-     *\r
-     * @param ex\r
-     * @return 返回文件名称, 便于将文件传送到服务器\r
-     */\r
-    private String saveCrashInfo2File(Throwable ex) {\r
-\r
-        String time = formatter.format(new Date());\r
-        StringBuilder sb = new StringBuilder();\r
-        sb.append("=== ").append(time).append(" ===\n");\r
-\r
-        Writer writer = new StringWriter();\r
-        PrintWriter printWriter = new PrintWriter(writer);\r
-        ex.printStackTrace(printWriter);\r
-//        ex.printStackTrace();\r
-        Throwable cause = ex.getCause();\r
-        while (cause != null) {\r
-            cause.printStackTrace(printWriter);\r
-            cause = cause.getCause();\r
-//            cause.printStackTrace();\r
-        }\r
-        printWriter.close();\r
-        String result = writer.toString();\r
-        sb.append(result);\r
-        sb.append("\n");\r
-\r
-        sb.append("--- DEVICE INFO ---\n");\r
-        for (Map.Entry<String, String> entry : infos.entrySet()) {\r
-            String key = entry.getKey();\r
-            String value = entry.getValue();\r
-            sb.append(key).append("=").append(value).append("\n");\r
-        }\r
-        sb.append("\n\n");\r
-\r
-        try {\r
-            String fileName = "crashlog.txt";\r
-//            if (Environment.getExternalStorageState().equals(\r
-//                    Environment.MEDIA_MOUNTED)) {\r
-//                File dir = new File(mContext.getExternalCacheDir(), "crash");\r
-            File dir = new File(StorageUtils.getExternalStorageLogDir());\r
-            String path = dir.getPath();\r
-            if (!dir.exists()) {\r
-                dir.mkdirs();\r
-            }\r
-            FileOutputStream fos = new FileOutputStream(new File(path, fileName), true);\r
-            fos.write(sb.toString().getBytes());\r
-            fos.close();\r
-//            }\r
-            return fileName;\r
-        } catch (Exception e) {\r
-            Log.e(TAG, "an error occured while writing file...," + e);\r
-        }\r
-        return null;\r
-    }\r
-}\r
index 489cf05..82ef19c 100644 (file)
@@ -1,18 +1,12 @@
 package com.enqualcomm.support;
 
 
-import android.os.Handler;
-import android.os.Message;
-
 import com.enqualcomm.support.utils.ProcessReceiver;
 import com.enqualcomm.support.utils.Util;
-import com.enqualcomm.support.utils.VibrateUtil;
+import com.ic.iclooger.ICLogger;
 import com.ic.jni.ICJniUtils;
 import com.enqualcomm.support.bean.Runtime;
 
-import com.enqualcomm.support.utils.FileOutputUtil;
-import com.enqualcomm.support.utils.ICLogger;
-
 /**
  * 由于Gsensor用的硬件计步,只需要保证打开计步器即可
  */
index 06a3da0..1fc2cb2 100644 (file)
@@ -8,9 +8,10 @@ import android.support.multidex.MultiDex;
 import android.util.SparseArray;\r
 \r
 import com.enqualcomm.support.service.HeartRateManager;\r
-import com.enqualcomm.support.utils.ICLogger;\r
 import com.enqualcomm.support.utils.TemperatureUtil;\r
 import com.enqualcomm.support.utils.VibrateUtil;\r
+import com.ic.iclooger.CrashHandler;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 import java.util.HashMap;\r
 \r
@@ -29,12 +30,11 @@ public class ICApplication extends Application {
     @Override\r
     public void onCreate() {\r
         super.onCreate();\r
-        ICLogger.setContext(this.getApplicationContext());\r
+        ICLogger.init(this, "protocol");\r
         String info = String.format("VERSION_CODE:%s, VERSION_NAME:%s",\r
                 BuildConfig.VERSION_CODE, BuildConfig.VERSION_NAME);\r
         ICLogger.i(TAG + "[onCreate]" + info);\r
-        CrashHandler crashHandler = CrashHandler.getInstance();\r
-        crashHandler.init(getApplicationContext());\r
+        CrashHandler.getInstance().init(this, "protocol crash see log.");\r
         instance = this;\r
         sContext = getApplicationContext();\r
         //初始化一下,先设置广播\r
index ea3e8aa..fded616 100644 (file)
@@ -30,7 +30,6 @@ import com.enqualcomm.support.utils.ContextProxy;
 import com.enqualcomm.support.utils.DeviceInfoUtil;
 import com.enqualcomm.support.utils.ICAudioManager;
 import com.enqualcomm.support.utils.ICHttpUtil;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.LanguageUtils;
 import com.enqualcomm.support.utils.SendEmail;
 import com.enqualcomm.support.utils.SimSignalUtil;
@@ -39,6 +38,7 @@ import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.VibrateUtil;
 import com.enqualcomm.support.utils.WakeLockUtil;
+import com.ic.iclooger.ICLogger;
 import com.ic.protocols.protocolAPIHelper;
 import com.ic.view.msg.MsgMustReadDialog;
 
index 5f68a43..9e08123 100644 (file)
@@ -22,10 +22,10 @@ import com.enqualcomm.support.utils.CellInfoUtil;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.DeviceInfoUtil;
 import com.enqualcomm.support.utils.IBeaconUtil;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.SimSignalUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
+import com.ic.iclooger.ICLogger;
 import com.ic.protocols.protocolAPIHelper;
 
 import java.util.ArrayList;
index 332328d..3af808f 100644 (file)
@@ -18,10 +18,10 @@ import com.enqualcomm.support.adapter.BTHelper;
 import com.enqualcomm.support.utils.AESCipher;
 import com.enqualcomm.support.utils.DeviceInfoUtil;
 import com.enqualcomm.support.utils.IBeaconUtil;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.ImageUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
+import com.ic.iclooger.ICLogger;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
index 3f4d72f..103d299 100644 (file)
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;\r
 import android.database.sqlite.SQLiteOpenHelper;\r
 \r
-import com.enqualcomm.support.utils.ICLogger;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 \r
 public class MySqlitOpenHelper extends SQLiteOpenHelper {\r
index 8ee1250..425ea72 100644 (file)
@@ -10,12 +10,11 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.provider.Settings;
 
-import com.enqualcomm.support.bean.EventLooperHandlerThread;
 import com.enqualcomm.support.bean.ICLocation;
 import com.enqualcomm.support.bean.ICLocation.GPS_locationStatus;
 import com.enqualcomm.support.bean.Runtime;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.TimeUtil;
+import com.ic.iclooger.ICLogger;
 
 import java.text.DecimalFormat;
 
index c063b8d..0907aa3 100644 (file)
@@ -3,21 +3,15 @@ package com.enqualcomm.support.adapter;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothAdapter.LeScanCallback;
 import android.bluetooth.BluetoothDevice;
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.wifi.ScanResult;
 import android.os.Handler;
 import android.os.HandlerThread;
 
-import com.enqualcomm.support.NMEAListener;
-import com.enqualcomm.support.bean.EventLooperHandlerThread;
 import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.Config;
 import com.enqualcomm.support.utils.IBeaconUtil;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.Util;
+import com.ic.iclooger.ICLogger;
 
 import java.util.ArrayList;
 import java.util.Collections;
index 4abb304..02c6e78 100644 (file)
@@ -13,8 +13,8 @@ import com.enqualcomm.support.Config;
 import com.enqualcomm.support.bean.Runtime;\r
 import com.enqualcomm.support.utils.CellInfoUtil;\r
 import com.enqualcomm.support.utils.DeviceInfoUtil;\r
-import com.enqualcomm.support.utils.ICLogger;\r
 import com.enqualcomm.support.utils.Util;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 import java.util.Collections;\r
 import java.util.Comparator;\r
index b9a29f9..29bc299 100644 (file)
@@ -1,13 +1,5 @@
 package com.enqualcomm.support.bean;\r
 \r
-import com.enqualcomm.support.utils.ICLogger;\r
-\r
-import java.text.ParseException;\r
-import java.text.SimpleDateFormat;\r
-import java.util.Calendar;\r
-import java.util.Date;\r
-import java.util.Locale;\r
-\r
 public class DeviceStatus {\r
 \r
        \r
index e561134..aa0fdc8 100644 (file)
@@ -1,6 +1,6 @@
 package com.enqualcomm.support.bean;\r
 \r
-import com.enqualcomm.support.utils.ICLogger;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 import java.util.ArrayList;\r
 import java.util.HashMap;\r
index 67114e4..3d47e72 100644 (file)
@@ -14,10 +14,10 @@ import com.enqualcomm.support.provider.FZDSettingsProvider;
 import com.enqualcomm.support.utils.ContextProxy;
 import com.enqualcomm.support.utils.DBHelper;
 import com.enqualcomm.support.utils.DnsUtil;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.LanguageUtils;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.ic.fzd.weather.IFZDWeatherCallback;
+import com.ic.iclooger.ICLogger;
 import com.ic.s123.GenericWeatherInfo;
 import com.ic.s123.IS123WeatherCallback;
 
index e2aa01b..67d2c89 100644 (file)
@@ -1,12 +1,10 @@
 package com.enqualcomm.support.bean;
 
-import com.enqualcomm.support.Config;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.TimeUtil;
+import com.ic.iclooger.ICLogger;
 
 import java.sql.Time;
 import java.util.ArrayList;
-import java.util.Date;
 
 public class SleepInfo {
     private String currentDate;
index 1cb395b..0ff779d 100644 (file)
@@ -5,7 +5,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.support.annotation.Nullable;
 
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 
 
 public class FZDDatabaseHelper extends SQLiteOpenHelper {
index 4559205..50acace 100644 (file)
@@ -9,7 +9,7 @@ import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 
 public class FZDMembersProvider extends ContentProvider {
 
index 1172344..39cc1d1 100644 (file)
@@ -9,7 +9,7 @@ import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 
 import java.util.Objects;
 
index cc286db..fcfa815 100644 (file)
@@ -10,7 +10,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 
 /**
  * 防走丢设置的内容提供者
index 593cd58..3c14734 100644 (file)
@@ -11,7 +11,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 
 import static com.enqualcomm.support.Constants.ACTION_ALARM_ALARM_CHANGE;
 
index dbac12a..17a6b6c 100644 (file)
@@ -5,7 +5,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.support.annotation.Nullable;
 
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 
 
 public class ICDatabaseHelper extends SQLiteOpenHelper {
index 714d5b1..1eb5791 100644 (file)
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 
 
 public class MySqlitOpenHelper extends SQLiteOpenHelper {
index 4b0864f..fd1f80c 100644 (file)
@@ -9,7 +9,7 @@ import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 
 import java.util.Objects;
 
index 226b83d..6eb185a 100644 (file)
@@ -6,7 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 
 import java.util.Calendar;
 import java.util.Date;
index 49673d4..b7694ca 100644 (file)
@@ -19,9 +19,9 @@ import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.service.base.AbstractInvokeHandlerService;
 import com.enqualcomm.support.utils.AlarmHelper;
 import com.enqualcomm.support.utils.Connection;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.VibrateUtil;
+import com.ic.iclooger.ICLogger;
 
 import java.lang.ref.WeakReference;
 
index ee11e51..f161733 100644 (file)
@@ -5,7 +5,7 @@ import android.content.res.AssetManager;
 import android.media.MediaPlayer;\r
 import android.media.MediaRecorder;\r
 \r
-import com.enqualcomm.support.utils.ICLogger;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 import java.io.IOException;\r
 \r
index d1efd69..9fdb160 100644 (file)
@@ -25,7 +25,6 @@ import com.enqualcomm.support.provider.FZDMessageProvider;
 import com.enqualcomm.support.service.base.AbstractConnectionService;
 import com.enqualcomm.support.utils.AESCipher;
 import com.enqualcomm.support.utils.Connection;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.NettyConnection;
 import com.enqualcomm.support.utils.SharePreferenceUtil;
 import com.enqualcomm.support.utils.SimSignalUtil;
@@ -33,6 +32,7 @@ import com.enqualcomm.support.utils.TemperatureUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.VibrateUtil;
+import com.ic.iclooger.ICLogger;
 import com.ic.protocols.protocolAPIHelper;
 
 import java.util.concurrent.LinkedBlockingDeque;
index b4722f4..605b7e0 100644 (file)
@@ -20,9 +20,9 @@ import com.enqualcomm.support.bean.heartRateStatus;
 import com.enqualcomm.support.service.base.AbstractInvokeHandlerService;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.HeartRateOxygenTestType;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
+import com.ic.iclooger.ICLogger;
 import com.ic.protocols.protocolAPIHelper;
 import com.ic.work.IHeartRateSensorCallback;
 import com.ic.work.IHeartRateSensorService;
index da8a55b..18d9b27 100644 (file)
@@ -4,12 +4,12 @@ import android.database.Cursor;
 \r
 import com.enqualcomm.support.Config;\r
 import com.enqualcomm.support.provider.ICContentProvider;\r
+import com.ic.iclooger.ICLogger;\r
 import com.ic.protocols.protocolAPIHelper;\r
 import com.enqualcomm.support.bean.StringMessage;\r
 import com.enqualcomm.support.service.base.AbstractConnectionService;\r
 import com.enqualcomm.support.utils.Connection;\r
 import com.enqualcomm.support.bean.Runtime;\r
-import com.enqualcomm.support.utils.ICLogger;\r
 import com.enqualcomm.support.utils.SimSignalUtil;\r
 \r
 public class Initialize extends AbstractConnectionService {\r
index 5cb33f3..2bd490a 100644 (file)
@@ -1,8 +1,8 @@
 package com.enqualcomm.support.service;
 
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.ThreadPool;
 import com.enqualcomm.support.utils.Util;
+import com.ic.iclooger.ICLogger;
 
 import java.io.FileInputStream;
 
index 4d6dda9..a525118 100644 (file)
@@ -17,10 +17,10 @@ import com.enqualcomm.support.service.base.AbstractConnectionService;
 import com.enqualcomm.support.utils.AlarmWakeUp;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.DeviceInfoUtil;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.NetworkObservable;
 import com.enqualcomm.support.utils.SimSignalUtil;
 import com.enqualcomm.support.utils.Util;
+import com.ic.iclooger.ICLogger;
 import com.ic.protocols.protocolAPIHelper;
 
 import java.util.concurrent.ScheduledThreadPoolExecutor;
index 8c2c529..265282d 100644 (file)
@@ -11,10 +11,10 @@ import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.bean.VoiceContent;\r
 import com.enqualcomm.support.service.base.AbstractInvokeHandlerService;\r
 import com.enqualcomm.support.utils.Connection;\r
-import com.enqualcomm.support.utils.ICLogger;\r
 import com.enqualcomm.support.utils.SimSignalUtil;\r
 import com.enqualcomm.support.utils.TimeUtil;\r
 import com.enqualcomm.support.utils.Util;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 import static com.enqualcomm.support.bean.Content.CONTACT_CATEGORY_GROUP;\r
 \r
index 8bf20cc..f1d4269 100644 (file)
@@ -3,7 +3,6 @@ package com.enqualcomm.support.service;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
-import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -30,13 +29,12 @@ import com.enqualcomm.support.service.base.AbstractInvokeHandlerService;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.DBHelper;
 import com.enqualcomm.support.utils.ICAudioManager;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.VibrateUtil;
+import com.ic.iclooger.ICLogger;
 
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
index 1ddf59d..caddb4f 100644 (file)
@@ -9,7 +9,7 @@ import android.os.Handler;
 import android.os.Message;\r
 import android.text.TextUtils;\r
 \r
-import com.enqualcomm.support.utils.ICLogger;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 /**\r
  * 数据库观察者\r
index acc188d..2a0ebdf 100644 (file)
@@ -2,13 +2,12 @@ package com.enqualcomm.support.service;
 \r
 import android.os.SystemClock;\r
 \r
-import com.ic.protocols.protocolAPIHelper;\r
 import com.enqualcomm.support.bean.Runtime;\r
 import com.enqualcomm.support.bean.StringMessage;\r
 import com.enqualcomm.support.service.base.AbstractConnectionService;\r
 import com.enqualcomm.support.utils.Connection;\r
-import com.enqualcomm.support.utils.ICLogger;\r
 import com.enqualcomm.support.utils.TimeUtil;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 public class SynchronousTime extends AbstractConnectionService {\r
   private boolean synchronousTimeOK = false;\r
index 901b6b6..f6fffc4 100644 (file)
@@ -8,8 +8,8 @@ import com.enqualcomm.support.bean.ICLocation;
 import com.enqualcomm.support.bean.Runtime;\r
 import com.enqualcomm.support.service.base.AbstractInvokeHandlerService;\r
 import com.enqualcomm.support.utils.Connection;\r
-import com.enqualcomm.support.utils.ICLogger;\r
 import com.enqualcomm.support.utils.SharePreferenceUtil;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 import java.util.List;\r
 \r
index 79caf1f..b12bc9b 100644 (file)
@@ -8,7 +8,7 @@ import android.os.Handler;
 
 import com.enqualcomm.support.provider.ICDatabaseHelper;
 import com.enqualcomm.support.provider.WeTalkMessageProvider;
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 import com.ic.protocols.protocolAPIHelper;
 
 public class WeTalkMsgObserver extends ContentObserver {
index 76b2efb..3e51986 100644 (file)
@@ -7,6 +7,7 @@ import android.util.Base64;
 
 import com.ic.Base64.Base64Decoder;
 import com.ic.Base64.Base64Encoder;
+import com.ic.iclooger.ICLogger;
 
 import java.io.UnsupportedEncodingException;
 import java.security.InvalidAlgorithmParameterException;
index df76bf7..e20c120 100644 (file)
@@ -15,6 +15,8 @@ import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
 import com.enqualcomm.support.CoreService;
 import com.enqualcomm.support.bean.ApnSetting;
+import com.ic.iclooger.ICLogger;
+
 import android.sim.SimManager;
 
 import java.lang.reflect.Method;
index a6bb83b..511f1e2 100644 (file)
@@ -8,6 +8,7 @@ import android.os.Build;
 import android.os.SystemClock;\r
 \r
 import com.enqualcomm.support.CoreService;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 import java.lang.reflect.Method;\r
 import java.util.Calendar;\r
index da199c4..7a3551b 100644 (file)
@@ -11,6 +11,7 @@ import com.enqualcomm.support.Constants;
 import com.enqualcomm.support.bean.Contact;\r
 import com.enqualcomm.support.bean.Runtime;\r
 import com.enqualcomm.support.CoreService;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 import static com.enqualcomm.support.Constants.SERVICE_CLS_NAME;\r
 import static com.enqualcomm.support.Constants.SERVICE_PKG_NAME;\r
index 0120aeb..226de27 100644 (file)
@@ -53,6 +53,7 @@ import android.widget.TextView;
 import com.android.internal.telephony.TelephonyProperties;
 import com.enqualcomm.support.R;
 import com.enqualcomm.support.bean.ApnSetting;
+import com.ic.iclooger.ICLogger;
 
 import static android.content.Context.TELEPHONY_SERVICE;
 
index f089701..b070fc2 100644 (file)
@@ -17,6 +17,7 @@ import com.enqualcomm.support.bean.EventLooperHandlerThread;
 import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.service.AntiMonitorService;
 import com.enqualcomm.support.service.AudioService;
+import com.ic.iclooger.ICLogger;
 import com.ic.protocols.protocolAPIHelper;
 
 import static android.os.BatteryManager.BATTERY_STATUS_CHARGING;
index f2ff1fa..33fbfd2 100644 (file)
@@ -15,6 +15,7 @@ import android.view.WindowManager;
 \r
 import com.enqualcomm.support.Config;\r
 import com.enqualcomm.support.CoreService;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 import java.io.BufferedOutputStream;\r
 import java.io.File;\r
index 2529d9a..80660bd 100644 (file)
@@ -21,6 +21,7 @@ import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
 import com.enqualcomm.support.Config;
 import com.enqualcomm.support.bean.Runtime;
+import com.ic.iclooger.ICLogger;
 import com.sprd.internal.telephony.SprdCallManager;
 
 import java.util.Collections;
index 190fe0e..3a82c78 100644 (file)
@@ -21,6 +21,7 @@ import com.enqualcomm.support.bean.Alarm;
 import com.enqualcomm.support.bean.NoticeContent;
 import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.service.AudioService;
+import com.ic.iclooger.ICLogger;
 
 import java.util.ArrayList;
 import java.util.Calendar;
index 418025e..f754c1a 100644 (file)
@@ -33,6 +33,7 @@ import com.enqualcomm.support.bean.StringMessage;
 import com.enqualcomm.support.bean.Weather;
 import com.enqualcomm.support.provider.FZDAlarmProvider;
 import com.enqualcomm.support.provider.ICContentProvider;
+import com.ic.iclooger.ICLogger;
 import com.ic.protocols.protocolAPIHelper;
 
 import java.util.ArrayList;
index 5915d11..9fbf219 100644 (file)
@@ -2,27 +2,21 @@ package com.enqualcomm.support.utils;
 
 import android.app.ActivityManager;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
-import android.os.Environment;
-import android.os.PowerManager;
 import android.provider.Settings;
-import android.telephony.PhoneNumberUtils;
 import android.telephony.TelephonyManager;
 
 import com.enqualcomm.support.Config;
-import com.enqualcomm.support.CoreService;
-import com.enqualcomm.support.bean.StepCount;
 import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.bean.StepCount;
 import com.enqualcomm.support.service.KeepAlive;
-import com.ic.jni.ICJniUtils;
+import com.ic.iclooger.ICLogger;
 
 import java.io.FileInputStream;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 
 import chestnut.utils.PhoneUtils;
index 2716386..bbd4f60 100644 (file)
@@ -7,6 +7,7 @@ import android.os.Message;
 \r
 import com.enqualcomm.support.Config;\r
 import com.enqualcomm.support.bean.DNSTaskModel;\r
+import com.ic.iclooger.ICLogger;\r
 import com.sina.util.dnscache.DNSCache;\r
 import com.sina.util.dnscache.DomainInfo;\r
 import com.sina.util.dnscache.Tools;\r
@@ -45,13 +46,10 @@ public class DnsUtil  {
                 try {\r
 \r
                     Thread.currentThread().setName("Task Pool");\r
-\r
                     ICLogger.log("TAG", "任务开始");\r
-\r
                     model.taskStartTime = System.currentTimeMillis();\r
                     model.taskID = ++ID_NUMBER;\r
 \r
-\r
                     model.domainUrl = model.url ;\r
                     model.domainIp = java.net.InetAddress.getByName(Tools.getHostName(model.domainUrl)).getHostAddress();\r
                     INetworkRequests domainNetRequests = new ApacheHttpClientNetworkRequests() ;\r
index b61d848..bd96676 100644 (file)
@@ -2,6 +2,8 @@ package com.enqualcomm.support.utils;
 \r
 import android.content.Context;\r
 \r
+import com.ic.iclooger.ICLogger;\r
+\r
 import java.io.File;\r
 import java.io.FileInputStream;\r
 import java.io.FileNotFoundException;\r
index 514102e..c60fdda 100644 (file)
@@ -1,9 +1,9 @@
 package com.enqualcomm.support.utils;
 
 
-
 import com.enqualcomm.support.ICApplication;
 import com.enqualcomm.support.bean.DNSTaskModel;
+import com.ic.iclooger.ICLogger;
 
 import org.json.JSONException;
 import org.json.JSONStringer;
index b3ceade..892e2eb 100644 (file)
@@ -4,6 +4,8 @@ import android.content.Context;
 import android.media.AudioManager;
 import android.os.Build;
 
+import com.ic.iclooger.ICLogger;
+
 public class ICAudioManager {
 
     private static int saved_volume = 0;
index 222c6d4..cc92f24 100644 (file)
@@ -6,6 +6,7 @@ import android.os.Handler;
 import android.util.Log;
 
 import com.enqualcomm.support.Config;
+import com.ic.iclooger.ICLogger;
 import com.sina.util.dnscache.net.ApacheHttpClientNetworkRequests;
 import com.enqualcomm.support.bean.Runtime;
 
diff --git a/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java b/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java
deleted file mode 100644 (file)
index 501c347..0000000
+++ /dev/null
@@ -1,319 +0,0 @@
-package com.enqualcomm.support.utils;
-
-import android.content.Context;
-
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.RollingFileAppender;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
-
-import de.mindpipe.android.logging.log4j.LogConfigurator;
-
-
-public class ICLogger {
-
-    private static boolean isInitConfig = false;
-    private static Context mContext = null;
-
-    private static Logger Log = null;
-    private static Logger GPS = null;
-    private static Logger Nmea = null;
-    private static Logger APILog = null;
-    private static Logger alarmCycle = null;
-    private static Logger Battery = null;
-    private static Logger LBS = null;
-    //  private static java.util.logging.Logger originLog= java.util.logging.Logger.getLogger(ICLogger.class.getSimpleName());
-    private static final boolean DEBUG = true;    //BuildConfig.DEBUG;
-
-    public static void setContext(Context context) {
-        mContext = context;
-    }
-
-    private static String getFunctionName() {
-        StackTraceElement[] currentStack = Thread.currentThread().getStackTrace();
-        if (currentStack == null) {
-            return null;
-        } else {
-            int stackLen = currentStack.length;
-
-            for (int i = 0; i < stackLen; ++i) {
-                StackTraceElement stackElement = currentStack[i];
-                if (!stackElement.isNativeMethod() && !stackElement.getClassName().equals(Thread.class.getName()) && !stackElement.getClassName().equals(ICLogger.class.getName())) {
-                    StringBuilder sb = new StringBuilder();
-                    sb.append("[ ");
-                    sb.append(Thread.currentThread().getName());
-                    sb.append(": ");
-                    sb.append(stackElement.getFileName());
-                    sb.append(":");
-                    sb.append(stackElement.getLineNumber());
-                    sb.append(" ");
-                    sb.append(stackElement.getMethodName());
-                    sb.append(" ]");
-                    return sb.toString();
-                }
-            }
-
-            return null;
-        }
-    }
-
-    /**
-     * 初始化与配置Logger   Log4j
-     * 日志信息格式中符号所代表的含义
-     * (1)-X号: X信息输出时左对齐。
-     * (2)%p: 输出日志信息优先级,即DEBUG,INFO,WARN,ERROR,FATAL。
-     * (3)%d: 输出日志时间点的日期或时间,默认格式为ISO8601,也可以在其后指定格式,比如:%d{yyy MMM dd HH:mm:ss,SSS},输出类似:2002年10月18日 22:10:28,921。
-     * (4)%r: 输出自应用启动到输出该log信息耗费的毫秒数。
-     * (5)%c: 输出日志信息所属的类目,通常就是所在类的全名。
-     * (6)%t: 输出产生该日志事件的线程名。
-     * (7)%l: 输出日志事件的发生位置,相当于%C.%M(%F:%L)的组合,包括类目名、发生的线程,以及在代码中的行数。举例:Testlog4.main(TestLog4.java:10)。
-     * (8)%x: 输出和当前线程相关联的NDC(嵌套诊断环境),尤其用到像java servlets这样的多客户多线程的应用中。
-     * (9)%%: 输出一个"%"字符。
-     * (10)%F: 输出日志消息产生时所在的文件名称。
-     * (11)%L: 输出代码中的行号。
-     * (12)%m: 输出代码中指定的消息,产生的日志具体信息。
-     * (13)%n: 输出一个回车换行符,Windows平台为"\r\n",Unix平台为"\n"输出日志信息换行。
-     * 可以在%与模式字符之间加上修饰符来控制其最小宽度、最大宽度、和文本的对齐方式。如:
-     * (1)%20c:指定输出category的名称,最小的宽度是20,如果category的名称小于20的话,默认的情况下右对齐。
-     * (2)%-20c:指定输出category的名称,最小的宽度是20,如果category的名称小于20的话,"-"号指定左对齐。
-     * (3)%.30c:指定输出category的名称,最大的宽度是30,如果category的名称大于30的话,就会将左边多出的字符截掉,但小于30的话也不会有空格。
-     * (4)%20.30c:如果category的名称小于20就补空格,并且右对齐,如果其名称长于30字符,就从左边交远销出的字符截掉。
-     */
-    private static void initConfig() {
-        if (!isInitConfig) {
-
-            LogConfigurator logConfigurator = new LogConfigurator();
-
-            String filename = StorageUtils.getExternalStorageLogDir() + File.separator + "log.txt";
-            logConfigurator.setFileName(filename);                // 日志存储路径,如果该路径没有会自动创建文件
-            logConfigurator.setRootLevel(Level.ALL);
-
-            logConfigurator.setLevel("log", Level.ALL);
-//        logConfigurator.setFilePattern("%d %-5p [%c{2}]-[%L] %m%n");// 设置文件输出模式
-            logConfigurator.setFilePattern("%d %m%n ");// 设置文件输出模式
-//        02-29 16:28:38.195 4629-4658/com.enqualcomm.support E/com.enqualcomm.support.utils.ICLogger:
-            logConfigurator.setMaxBackupSize(2); // 设置最大备份数量
-            logConfigurator.setMaxFileSize(1024 * 1024 * 20);// 设置最大文件大小  20MB
-            logConfigurator.setImmediateFlush(true);// 设置是否立即刷新
-            logConfigurator.setUseFileAppender(true); // 设置用户文件输出器
-            logConfigurator.setInternalDebugging(false); //控制console是否输出
-            logConfigurator.setUseLogCatAppender(true);
-            logConfigurator.setLogCatPattern("%m%n");
-            logConfigurator.configure();// 设置提交
-
-
-//        String logfilelist[]={"Log","GPS","Nmea","APILog","alarmCycle","Battery","LBS"};
-
-            //Log 和log目前是同一个配置
-            Log = Logger.getLogger("log");
-            Log.info("init Logger " + Log.getName());
-//        Log.addAppender( getRollingFileAppender("log","%d %m%n "));
-//        Log.info("init Logger "+Log.getName()+" "+((RollingFileAppender)Log.getAppender("log")).getFile());
-
-            GPS = Logger.getLogger("GPS");
-            GPS.addAppender(getRollingFileAppender("GPS", "%d %m%n "));
-            GPS.info("init Logger " + GPS.getName() + " " + ((RollingFileAppender) GPS.getAppender("GPS")).getFile());
-
-            Nmea = Logger.getLogger("Nmea");
-            Nmea.addAppender(getRollingFileAppender("Nmea", "%m%n"));
-            Nmea.info("init Logger " + Nmea.getName() + " " + ((RollingFileAppender) Nmea.getAppender("Nmea")).getFile());
-
-            APILog = Logger.getLogger("APILog");
-            APILog.addAppender(getRollingFileAppender("APILog", "%d %m%n "));
-            APILog.info("init Logger " + APILog.getName() + " " + ((RollingFileAppender) APILog.getAppender("APILog")).getFile());
-
-            alarmCycle = Logger.getLogger("alarmCycle");
-            alarmCycle.addAppender(getRollingFileAppender("alarmCycle", "%d %m%n "));
-            alarmCycle.info("init Logger " + alarmCycle.getName() + " " + ((RollingFileAppender) alarmCycle.getAppender("alarmCycle")).getFile());
-
-            Battery = Logger.getLogger("Battery");
-            Battery.addAppender(getRollingFileAppender("Battery", "%d %m%n "));
-            Battery.info("init Logger " + Battery.getName() + " " + ((RollingFileAppender) Battery.getAppender("Battery")).getFile());
-
-
-            LBS = Logger.getLogger("LBS");
-            LBS.addAppender(getRollingFileAppender("LBS", "%d %m%n "));
-            LBS.info("init Logger " + LBS.getName() + " " + ((RollingFileAppender) LBS.getAppender("LBS")).getFile());
-            isInitConfig = true;
-        }
-    }
-
-    public static void logRAWtoFile(String filename, String msg) {
-        if (filename.equals("Nmea")) {
-            Nmea.info(msg);
-        } else if (filename.equals("LBS")) {
-            LBS.info(msg);
-        } else if (filename.equals("GPS")) {
-            GPS.info(msg);
-        } else if (filename.equals("APILog")) {
-            APILog.info(msg);
-        } else if (filename.equals("alarmCycle")) {
-            alarmCycle.info(msg);
-        } else if (filename.equals("Battery")) {
-            Battery.info(msg);
-        } else {
-            Log.info(msg);
-        }
-    }
-
-    public static void logToFile(String filename, String msg) {
-        if (filename.equals("Nmea")) {
-            Nmea.info(msg);
-        } else if (filename.equals("LBS")) {
-            LBS.info(msg);
-        } else if (filename.equals("GPS")) {
-            GPS.info(msg);
-        } else if (filename.equals("APILog")) {
-            APILog.info(msg);
-        } else if (filename.equals("alarmCycle")) {
-            alarmCycle.info(msg);
-        } else if (filename.equals("Battery")) {
-            Battery.info(msg);
-        } else {
-            Log.info(msg);
-        }
-    }
-
-    private static RollingFileAppender getRollingFileAppender(String name, String layoutpattern) {
-        PatternLayout fileLayout = new PatternLayout(layoutpattern);
-        String filename = StorageUtils.getExternalStorageLogDir() + File.separator + name + ".txt";
-        RollingFileAppender rollingFileAppender = null;
-        try {
-            rollingFileAppender = new RollingFileAppender(fileLayout, filename);
-        } catch (IOException e) {
-            e.printStackTrace();
-            ICLogger.e(e.getMessage(), e);
-            return null;
-        }
-        rollingFileAppender.setName(name);
-        rollingFileAppender.setMaxBackupIndex(2);  //最多3个备份文件
-        rollingFileAppender.setMaximumFileSize(10 * 1024 * 1024); //10M 大小
-        rollingFileAppender.setImmediateFlush(true);
-
-        return rollingFileAppender;
-    }
-
-    public static void v(String msg) {
-        initConfig();
-        if (Log != null)
-            Log.debug(buildMessage(msg));
-    }
-
-    public static void v(String msg, Throwable thr) {
-        initConfig();
-        if (Log != null)
-            Log.debug(buildMessage(msg), thr);
-    }
-
-    public static void d(String msg) {
-        initConfig();
-        if (Log != null)
-            Log.debug(buildMessage(msg));
-    }
-
-    public static void d(String msg, Throwable thr) {
-        initConfig();
-        if (Log != null)
-            Log.debug(buildMessage(msg), thr);
-    }
-
-    public static void i(String msg) {
-        initConfig();
-        if (Log != null)
-            Log.info(buildMessage(msg));
-    }
-
-    public static void i(String msg, Throwable thr) {
-        initConfig();
-        if (Log != null)
-            Log.info(buildMessage(msg), thr);
-    }
-
-    public static void w(String msg) {
-        initConfig();
-        if (Log != null)
-            Log.warn(buildMessage(msg));
-    }
-
-    public static void w(String msg, Throwable thr) {
-        initConfig();
-        if (Log != null)
-            Log.warn(buildMessage(msg), thr);
-    }
-
-    public static void w(Throwable thr) {
-        initConfig();
-        if (Log != null)
-            Log.warn(buildMessage(""), thr);
-    }
-
-    public static void e(String msg) {
-        initConfig();
-        if (Log != null)
-            Log.error(buildMessage(msg));
-    }
-
-    public static void e(String msg, Throwable thr) {
-        initConfig();
-        if (Log != null)
-            Log.error(buildMessage(msg), thr);
-    }
-
-    public static void PrintExceptionStackTrace(Exception e) {
-
-        StringBuffer sb = new StringBuffer();
-        sb.append(e.getMessage()).append("\n");
-        e.printStackTrace(new PrintStream(new OutputStream() {
-            @Override
-            public void write(int b) throws IOException {
-                sb.append((char) b);
-            }
-        }));
-        i(sb.toString());
-    }
-
-    /**
-     * 生成消息
-     *
-     * @param msg
-     * @return
-     */
-    protected static String buildMessage(String msg) {
-        initConfig();
-        if (DEBUG && msg != null) {
-            String var1 = getFunctionName();
-            if (var1 != null) {
-                StringBuilder sb = new StringBuilder();
-                sb.append(var1);
-                sb.append(" - ");
-                sb.append(msg);
-                return sb.toString();
-            } else {
-                return "functionName is null";
-            }
-        } else {
-            return "msg is null";
-        }
-    }
-
-    public static void log(String TAG, String msg) {
-        if (DEBUG) {
-            if (Log != null) Log.debug(TAG + " " + msg);
-        }
-    }
-
-    public static void log(String TAG, String funcName, String msg) {
-        if (DEBUG) {
-            if (Log != null)
-                Log.debug(TAG + " [" + funcName + "]" + msg);
-
-        }
-    }
-
-}
-
index 69f419f..23991fe 100644 (file)
@@ -7,6 +7,7 @@ import android.support.annotation.RequiresApi;
 import android.util.Log;
 
 import com.enqualcomm.support.R;
+import com.ic.iclooger.ICLogger;
 
 import java.util.Locale;
 
index 505f03d..586996a 100644 (file)
@@ -1,6 +1,6 @@
 package com.enqualcomm.support.utils;\r
 \r
-import com.enqualcomm.support.bean.voicePacket;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 import java.io.File;\r
 import java.io.FileInputStream;\r
index cc95242..1bc8e4d 100644 (file)
@@ -12,6 +12,7 @@ import com.enqualcomm.support.Constants;
 import com.enqualcomm.support.bean.Contact;
 import com.enqualcomm.support.bean.EventLooperHandlerThread;
 import com.enqualcomm.support.bean.Runtime;
+import com.ic.iclooger.ICLogger;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
index 98a4d75..e41ac17 100644 (file)
@@ -10,6 +10,7 @@ import android.util.Log;
 import com.enqualcomm.support.Config;
 import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.bean.StringMessage;
+import com.ic.iclooger.ICLogger;
 import com.ic.protocols.protocolAPIHelper;
 
 import java.nio.ByteBuffer;
index bb3bc95..c5d9c3a 100644 (file)
@@ -8,6 +8,7 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;\r
 \r
 import com.enqualcomm.support.service.KeepAlive;\r
+import com.ic.iclooger.ICLogger;\r
 \r
 import rx.Observable;\r
 import rx.subjects.BehaviorSubject;\r
index ba30e7c..2d0e167 100644 (file)
@@ -22,6 +22,7 @@ import com.enqualcomm.support.bean.VoiceContent;
 import com.enqualcomm.support.service.AudioService;
 import com.enqualcomm.support.service.Deliver;
 import com.enqualcomm.support.service.HeartRateManager;
+import com.ic.iclooger.ICLogger;
 import com.ic.protocols.protocolAPIHelper;
 
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
index a8efe17..2569bfc 100644 (file)
@@ -3,6 +3,8 @@ package com.enqualcomm.support.utils;
 import android.content.Context;
 import android.media.AudioManager;
 
+import com.ic.iclooger.ICLogger;
+
 public class ProfileManager {
 
     //只声音,无振动(可用)
index 6401f14..32b53b3 100644 (file)
@@ -1,5 +1,7 @@
 package com.enqualcomm.support.utils;
 
+import com.ic.iclooger.ICLogger;
+
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.SelectionKey;
index 3b9594b..1384e49 100644 (file)
@@ -1,9 +1,11 @@
 package com.enqualcomm.support.utils;
 
+import android.os.Environment;
+
+import com.ic.iclooger.ICLogger;
+
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.List;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.zip.CRC32;
@@ -12,21 +14,6 @@ import java.util.zip.ZipOutputStream;
 
 import SendEmail.MailSenderInfo;
 import SendEmail.SimpleMailSender;
-import chestnut.utils.PhoneUtils;
-
-import android.bluetooth.BluetoothClass;
-import android.content.Context;
-import android.content.IClipboard;
-import android.os.Environment;
-import android.util.Log;
-
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
-import javax.mail.BodyPart;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMultipart;
-import javax.mail.internet.MimeUtility;
 
 public class SendEmail {
        public String TAG="SendEmail";
index 22fa5e5..b4a7173 100644 (file)
@@ -9,6 +9,7 @@ import android.provider.Settings;
 import android.telephony.TelephonyManager;
 
 import com.enqualcomm.support.bean.Runtime;
+import com.ic.iclooger.ICLogger;
 
 import static android.telephony.TelephonyManager.NETWORK_TYPE_CDMA;
 import static android.telephony.TelephonyManager.NETWORK_TYPE_EDGE;
index e72eed0..21d1924 100644 (file)
@@ -1,9 +1,9 @@
 package com.enqualcomm.support.utils;
 
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.enqualcomm.support.bean.TemperatureItem;
+import com.ic.iclooger.ICLogger;
 import com.ic.jni.ICJniUtils;
 
 public class TempAlgUtil {
index 916c685..3531cff 100644 (file)
@@ -13,6 +13,7 @@ import com.enqualcomm.support.LocationClient;
 import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.bean.StringMessage;
 import com.enqualcomm.support.service.Deliver;
+import com.ic.iclooger.ICLogger;
 import com.ic.protocols.protocolAPIHelper;
 import com.ic.work.ITempSensorCallback;
 import com.ic.work.ITempSensorService;
index 2f71ceb..39eee1f 100644 (file)
@@ -5,12 +5,13 @@ import android.content.Context;
 import android.provider.Settings;
 import android.text.format.DateFormat;
 
+import com.ic.iclooger.ICLogger;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
-import java.util.SimpleTimeZone;
 import java.util.TimeZone;
 
 import static android.content.Context.ALARM_SERVICE;
index 3a71456..6ce2bfa 100644 (file)
@@ -24,6 +24,7 @@ import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.bean.VoiceContent;
 import com.enqualcomm.support.bean.voicePacket;
 import com.enqualcomm.support.service.Deliver;
+import com.ic.iclooger.ICLogger;
 import com.ic.protocols.protocolAPIHelper;
 
 import java.io.BufferedInputStream;
index c8419ee..a3fdd31 100644 (file)
@@ -5,7 +5,8 @@ import android.content.Context;
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.os.Vibrator;\r
-import android.support.v4.app.INotificationSideChannel;\r
+\r
+import com.ic.iclooger.ICLogger;\r
 \r
 import static android.content.Context.VIBRATOR_SERVICE;\r
 \r
index 68909c0..b1f9835 100644 (file)
@@ -1,5 +1,6 @@
 package com.enqualcomm.support.utils;\r
 \r
+import com.ic.iclooger.ICLogger;\r
 import com.sina.util.dnscache.log.FileUtil;\r
 \r
 import java.io.File;\r
index d0b86c9..47a497e 100644 (file)
@@ -2,6 +2,7 @@ package com.enqualcomm.support.utils;
 \r
 import com.enqualcomm.support.bean.Runtime;\r
 import com.enqualcomm.support.bean.StringMessage;\r
+import com.ic.iclooger.ICLogger;\r
 import com.ic.protocols.protocolAPIHelper;\r
 import com.ic.protocols.protocol_mqtt_client;\r
 \r
index df722a5..6d078b4 100644 (file)
@@ -1,6 +1,8 @@
 package com.enqualcomm.support.utils;\r
 \r
 \r
+import com.ic.iclooger.ICLogger;\r
+\r
 import java.lang.reflect.InvocationTargetException;\r
 import java.lang.reflect.Method;\r
 \r
index b17ad87..b32dd9f 100644 (file)
@@ -7,7 +7,7 @@ import com.enqualcomm.support.bean.SleepInfo;
 import com.enqualcomm.support.bean.StringMessage;
 import com.enqualcomm.support.utils.AESCipher;
 import com.enqualcomm.support.utils.Connection;
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 
 import static com.enqualcomm.support.Config.PROTOCOL_ANAN;
 
index 0ff2199..bbefaea 100644 (file)
@@ -13,8 +13,6 @@ import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Environment;
 import android.support.v4.app.ActivityCompat;
-import android.telephony.CellInfoLte;
-import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
@@ -38,13 +36,13 @@ import com.enqualcomm.support.provider.FZDSettingsProvider;
 import com.enqualcomm.support.service.HeartRateManager;
 import com.enqualcomm.support.utils.CellInfoUtil;
 import com.enqualcomm.support.utils.Connection;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.ProfileManager;
 import com.enqualcomm.support.utils.SharePreferenceUtil;
 import com.enqualcomm.support.utils.TemperatureUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.VibrateUtil;
+import com.ic.iclooger.ICLogger;
 import com.ic.s123.GenericWeatherInfo;
 
 import java.io.File;
index ea17f86..7be9394 100644 (file)
@@ -8,18 +8,14 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Environment;
-import android.provider.CalendarContract;
 import android.support.v4.app.ActivityCompat;
 import android.text.TextUtils;
-import android.text.method.AllCapsTransformationMethod;
 
 import com.enqualcomm.support.Config;
 import com.enqualcomm.support.CoreService;
-import com.enqualcomm.support.ICSmsManager;
 import com.enqualcomm.support.LocationClient;
 import com.enqualcomm.support.bean.Alarm;
 import com.enqualcomm.support.bean.Contact;
-import com.enqualcomm.support.bean.Content;
 import com.enqualcomm.support.bean.ICLocation;
 import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.bean.StringMessage;
@@ -34,13 +30,11 @@ import com.enqualcomm.support.service.SilentManager;
 import com.enqualcomm.support.utils.CellInfoUtil;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.DeviceInfoUtil;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.TemperatureUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
 import com.ic.fzd.weather.FZDWeatherInfo;
-
-import org.apache.harmony.misc.SystemUtils;
+import com.ic.iclooger.ICLogger;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -51,12 +45,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
-import chestnut.utils.StringUtils;
-
 import static com.enqualcomm.support.Constants.ACTION_ALARM_ALARM_CHANGE;
 import static com.enqualcomm.support.Constants.FROM_SERVER;
 import static com.enqualcomm.support.LocationClient.LOCATION_MODE;
-import static com.enqualcomm.support.bean.Contact.GROUP_ALL;
 import static com.ic.protocols.protocol_beehome.CMD_TYPE.AP32;
 import static java.lang.Math.abs;
 
@@ -993,18 +984,18 @@ public class protocol_beehome {
     public static StringMessage AP14(String index, String[] phnumbs) {
         return genStringMessage(cmdStrMap.get(CMD_TYPE.AP14),
                 new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP14))
-                .append(CMDSPLIT).append(index)
-                .append(CMDSPLIT).append(phnumbs[0])
-                .append(CMDSPLIT).append(phnumbs[1])
-                .append(CMDSPLIT).append(phnumbs[2])
-                .append(CMDSPLIT).append(phnumbs[3])
-                .append(CMDSPLIT).append(phnumbs[4])
-                .append(CMDSPLIT).append(phnumbs[5])
-                .append(CMDSPLIT).append(phnumbs[6])
-                .append(CMDSPLIT).append(phnumbs[7])
-                .append(CMDSPLIT).append(phnumbs[8])
-                .append(CMDSPLIT).append(phnumbs[9])
-                .append(CMDEND).toString());
+                        .append(CMDSPLIT).append(index)
+                        .append(CMDSPLIT).append(phnumbs[0])
+                        .append(CMDSPLIT).append(phnumbs[1])
+                        .append(CMDSPLIT).append(phnumbs[2])
+                        .append(CMDSPLIT).append(phnumbs[3])
+                        .append(CMDSPLIT).append(phnumbs[4])
+                        .append(CMDSPLIT).append(phnumbs[5])
+                        .append(CMDSPLIT).append(phnumbs[6])
+                        .append(CMDSPLIT).append(phnumbs[7])
+                        .append(CMDSPLIT).append(phnumbs[8])
+                        .append(CMDSPLIT).append(phnumbs[9])
+                        .append(CMDEND).toString());
     }
 
     //设置通讯录,白名单(10个)
@@ -1248,8 +1239,35 @@ public class protocol_beehome {
 
     }
 
-
+    //IWBP07,20211222103621,6,1,1#
     public void handleBP07(String cmd) {
+        //TODO:判断是否要进行下一个包发送
+        String[] split = cmd.split(CMDSPLIT);
+        if (split.length == 5) {
+            try {
+                String totalPackageCount = split[2];
+                ICLogger.d("totalPackageCount ==> " + totalPackageCount);
+                String currentPackage = split[3];
+                ICLogger.d("currentPackage ==> " + currentPackage);
+                String isSuccessStr = split[4];
+                ICLogger.d("是否接收成功:" + isSuccessStr);
+                if ("1".equals(isSuccessStr) && !currentPackage.equals(totalPackageCount)) {
+                    int packetIndex = Integer.parseInt(currentPackage);
+                    //发送下一包
+                    voicePacket.getInstanceSent().setCurrentIndexToSent(packetIndex);
+                }
+
+                //如果不成功则重发
+                if (!currentPackage.equals(totalPackageCount)) {
+                    ICLogger.d("发送下一包数据..." + currentPackage);
+                    mConnection.DeliverCMDMessageToSystem("SentVoicePacket", "SentVoicePacket");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else {
+            ICLogger.d("parse BP07 error.");
+        }
         //平台收到语音数据
         ICLogger.d("平台收到语音数据" + cmd);
     }
index f9dd55a..fcbba25 100644 (file)
@@ -44,7 +44,6 @@ import com.enqualcomm.support.utils.AlarmHelper;
 import com.enqualcomm.support.utils.CameraUtil;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.HeartRateOxygenTestType;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.MD5;
 import com.enqualcomm.support.utils.ProfileManager;
 import com.enqualcomm.support.utils.TimeUtil;
@@ -52,6 +51,7 @@ import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.WifiSupport;
 import com.enqualcomm.support.utils.regexUtil;
 import com.ic.fzd.weather.FZDWeatherInfo;
+import com.ic.iclooger.ICLogger;
 import com.sina.util.dnscache.AppConfigUtil;
 
 import java.io.ByteArrayOutputStream;
index ddba2f5..ffea2cf 100644 (file)
@@ -24,11 +24,11 @@ import com.enqualcomm.support.utils.AESCipher;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.DeviceInfoUtil;
 import com.enqualcomm.support.utils.ICAudioManager;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.LanguageUtils;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.regexUtil;
+import com.ic.iclooger.ICLogger;
 
 import java.io.File;
 import java.io.IOException;
@@ -39,7 +39,6 @@ import java.util.HashMap;
 
 import static com.enqualcomm.support.bean.Contact.GROUP_ALL;
 import static com.enqualcomm.support.bean.Content.CONTACT_CATEGORY_GROUP;
-import static java.lang.Math.abs;
 
 /**
  * IC协议
index 15ffe0c..c4443bd 100644 (file)
@@ -25,11 +25,11 @@ import com.enqualcomm.support.service.HeartRateManager;
 import com.enqualcomm.support.utils.CameraUtil;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.ICAudioManager;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.VibrateUtil;
 import com.enqualcomm.support.utils.WakeLockUtil;
+import com.ic.iclooger.ICLogger;
 import com.ic.view.msg.MsgMustReadDialog;
 
 import java.io.File;
index a950cca..a628705 100644 (file)
@@ -17,10 +17,10 @@ import com.enqualcomm.support.bean.VoiceContent;
 import com.enqualcomm.support.bean.voicePacket;
 import com.enqualcomm.support.service.HeartRateManager;
 import com.enqualcomm.support.utils.Connection;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.LanguageUtils;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
+import com.ic.iclooger.ICLogger;
 
 import java.io.File;
 import java.util.ArrayList;
index 6f7cb7e..ebbfb2f 100644 (file)
@@ -11,10 +11,10 @@ import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.bean.StringMessage;
 import com.enqualcomm.support.service.HeartRateManager;
 import com.enqualcomm.support.utils.Connection;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.TemperatureUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.regexUtil;
+import com.ic.iclooger.ICLogger;
 
 import java.util.ArrayList;
 import java.util.Date;
index 1988ffd..8cc62fb 100644 (file)
@@ -11,7 +11,7 @@ import android.os.Message;
 import android.util.Log;
 
 import com.enqualcomm.support.Config;
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 
 import se.wetcat.qatja.MQTTConstants;
 import se.wetcat.qatja.android.MQTTConnectionConstants;
index 65a240b..fa18c35 100644 (file)
@@ -30,12 +30,12 @@ import com.enqualcomm.support.service.HeartRateManager;
 import com.enqualcomm.support.utils.CameraUtil;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.ICAudioManager;
-import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.TemperatureUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.VibrateUtil;
 import com.enqualcomm.support.utils.WakeLockUtil;
+import com.ic.iclooger.ICLogger;
 import com.ic.s123.GenericWeatherInfo;
 import com.ic.view.msg.MsgMustReadDialog;
 
index 09bc4a0..e8425ec 100644 (file)
@@ -6,7 +6,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 
 import com.enqualcomm.support.R;
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 
 import java.util.ArrayList;
 import java.util.List;
index 44065ee..65bde5c 100644 (file)
@@ -8,7 +8,7 @@ import android.view.WindowManager;
 
 import com.enqualcomm.support.ICApplication;
 import com.enqualcomm.support.R;
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 
 import java.util.List;
 
index 5b37af5..aee484e 100644 (file)
@@ -25,7 +25,7 @@ import android.os.HandlerThread;
 import android.os.IBinder;
 import android.text.TextUtils;
 
-import com.enqualcomm.support.utils.ICLogger;
+import com.ic.iclooger.ICLogger;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -83,7 +83,6 @@ import static se.wetcat.qatja.MQTTConstants.SUBSCRIBE_SUCCESS_AT_MOST_ONCE;
 import static se.wetcat.qatja.MQTTConstants.SUBSCRIBE_SUCCESS_EXACTLY_ONCE;
 import static se.wetcat.qatja.MQTTConstants.UNSUBACK;
 import static se.wetcat.qatja.MQTTConstants.UNSUBSCRIBE;
-
 import static se.wetcat.qatja.android.MQTTConnectionConstants.CONSTANTS_BASE;
 import static se.wetcat.qatja.android.MQTTConnectionConstants.STATE_CHANGE;
 import static se.wetcat.qatja.android.MQTTConnectionConstants.STATE_CONNECTED;
index fa2bd21..8c992f6 100644 (file)
@@ -1,2 +1,2 @@
-#Tue Dec 21 17:09:29 CST 2021\r
-VERSION_CODE=939\r
+#Wed Dec 22 19:47:03 CST 2021\r
+VERSION_CODE=940\r