From: TrillGates Date: Wed, 22 Dec 2021 12:58:50 +0000 (+0800) Subject: replace old iclogger X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=04df16942c301c43d0c7344ef8d819c2160eae55;p=icsupport.git replace old iclogger --- diff --git a/app/build.gradle b/app/build.gradle index b84b7c47..b980cb7b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 index 00000000..1edb03f1 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 index 7d4146f0..00000000 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 index fca26eca..00000000 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 index 068867eb..00000000 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 index 6289cf64..00000000 Binary files a/app/libs/okio-2.4.3.jar and /dev/null differ diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8fc65348..d0a2dd11 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -162,4 +162,41 @@ -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 ; + public static ; + public ; +} + +-keepclassmembers class com.ic.iclooger.SystemUtils { + public static ; + public static ; + public ; +} + +-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 diff --git a/app/release/ICSer_V939_2112211709_release.apk b/app/release/ICSer_V940_2112221947_release.apk similarity index 77% rename from app/release/ICSer_V939_2112211709_release.apk rename to app/release/ICSer_V940_2112221947_release.apk index e9ce8c86..e15bf031 100644 Binary files a/app/release/ICSer_V939_2112211709_release.apk and b/app/release/ICSer_V940_2112221947_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 4bc17287..2a7289b9 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -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 diff --git a/app/src/main/java/com/enqualcomm/support/BootCompleteReceiver.java b/app/src/main/java/com/enqualcomm/support/BootCompleteReceiver.java index a1356460..a2730932 100644 --- a/app/src/main/java/com/enqualcomm/support/BootCompleteReceiver.java +++ b/app/src/main/java/com/enqualcomm/support/BootCompleteReceiver.java @@ -4,7 +4,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.enqualcomm.support.utils.ICLogger; +import com.ic.iclooger.ICLogger; public class BootCompleteReceiver extends BroadcastReceiver { public void onReceive(Context paramContext, Intent paramIntent) { diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java index ee457988..eb928d70 100644 --- a/app/src/main/java/com/enqualcomm/support/Config.java +++ b/app/src/main/java/com/enqualcomm/support/Config.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index e4a77053..2f8da328 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -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 index 277841a5..00000000 --- a/app/src/main/java/com/enqualcomm/support/CrashHandler.java +++ /dev/null @@ -1,213 +0,0 @@ -package com.enqualcomm.support; - -import android.content.Context; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.os.Build; -import android.os.Looper; -import android.util.Log; -import android.widget.Toast; - -import com.enqualcomm.support.utils.StorageUtils; -import com.enqualcomm.support.utils.Util; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.io.Writer; -import java.lang.reflect.Field; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; - -/** - * Created by Administrator on 2017/5/18. - */ - -public class CrashHandler implements Thread.UncaughtExceptionHandler { - public static final String TAG = CrashHandler.class.getName(); - - // 系统默认的UncaughtException处理类 - private Thread.UncaughtExceptionHandler mDefaultHandler; - // CrashHandler实例 - private static CrashHandler INSTANCE = null; - // 程序的Context对象 - private Context mContext; - // 用来存储设备信息和异常信息 - private Map infos = new HashMap(); - // 用于格式化日期,作为日志文件名的一部分 - private DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS", Locale.getDefault()); - private DateFormat dateFormatDate = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()); - - /** - * 保证只有一个CrashHandler实例 - */ - private CrashHandler() { - } - - /** - * 获取CrashHandler实例 ,单例模式 - */ - public synchronized static CrashHandler getInstance() { - if (INSTANCE == null) - INSTANCE = new CrashHandler(); - return INSTANCE; - } - - /** - * 初始化 - * - * @param context - */ - public void init(Context context) { - mContext = context; - // 获取系统默认的UncaughtException处理器 - mDefaultHandler = Thread.getDefaultUncaughtExceptionHandler(); - // 设置该CrashHandler为程序的默认处理器 - Thread.setDefaultUncaughtExceptionHandler(this); - } - - /** - * 当UncaughtException发生时会转入该函数来处理 - */ - @Override - public void uncaughtException(Thread thread, Throwable ex) { - if (!handleException(ex) && mDefaultHandler != null) { - // 如果用户没有处理则让系统默认的异常处理器来处理 - mDefaultHandler.uncaughtException(thread, ex); - } else { - Util.mSleep(1000); - } - - // 退出程序 - ex.printStackTrace(); - android.os.Process.killProcess(android.os.Process.myPid()); - System.exit(1); - } - - /** - * 自定义错误处理,收集错误信息 发送错误报告等操作均在此完成. - * - * @param ex - * @return true:如果处理了该异常信息;否则返回false. - */ - private boolean handleException(Throwable ex) { - if (ex == null) { - return false; - } - // 使用Toast来显示异常信息 - new Thread() { - @Override - public void run() { - Looper.prepare(); - if (mContext != null) { - Toast.makeText(mContext, R.string.program_abnormal, Toast.LENGTH_LONG) - .show(); - Looper.loop(); - } - } - }.start(); - // 收集设备参数信息 - collectDeviceInfo(mContext); - // 保存日志文件 - saveCrashInfo2File(ex); - //设置断网状态 - Util.setSystemProperties("persist.sys.server_connected", "false"); - return true; - } - - /** - * 收集设备参数信息 - * - * @param ctx - */ - public void collectDeviceInfo(Context ctx) { - infos.clear(); - infos.put("===", " PackageInfo ==="); - try { - PackageManager pm = ctx.getPackageManager(); - PackageInfo pi = pm.getPackageInfo(ctx.getPackageName(), PackageManager.GET_ACTIVITIES); - - if (pi != null) { - String versionName = pi.versionName; - String versionCode = pi.versionCode + ""; - infos.put("versionName", versionName); - infos.put("versionCode", versionCode); - } - } catch (PackageManager.NameNotFoundException e) { - Log.e(TAG, "an error occured when collect package info " + e); - } - - infos.put("===", " Build ==="); - Field[] fields = Build.class.getDeclaredFields(); - for (Field field : fields) { - try { - field.setAccessible(true); - infos.put(field.getName(), field.get(null).toString()); - Log.d(TAG, field.getName() + ":" + field.get(null)); - } catch (Exception e) { - Log.e(TAG, "an error occured when collect crash info," + e); - } - } - } - - /** - * 保存错误信息到文件中 - * - * @param ex - * @return 返回文件名称, 便于将文件传送到服务器 - */ - private String saveCrashInfo2File(Throwable ex) { - - String time = formatter.format(new Date()); - StringBuilder sb = new StringBuilder(); - sb.append("=== ").append(time).append(" ===\n"); - - Writer writer = new StringWriter(); - PrintWriter printWriter = new PrintWriter(writer); - ex.printStackTrace(printWriter); -// ex.printStackTrace(); - Throwable cause = ex.getCause(); - while (cause != null) { - cause.printStackTrace(printWriter); - cause = cause.getCause(); -// cause.printStackTrace(); - } - printWriter.close(); - String result = writer.toString(); - sb.append(result); - sb.append("\n"); - - sb.append("--- DEVICE INFO ---\n"); - for (Map.Entry entry : infos.entrySet()) { - String key = entry.getKey(); - String value = entry.getValue(); - sb.append(key).append("=").append(value).append("\n"); - } - sb.append("\n\n"); - - try { - String fileName = "crashlog.txt"; -// if (Environment.getExternalStorageState().equals( -// Environment.MEDIA_MOUNTED)) { -// File dir = new File(mContext.getExternalCacheDir(), "crash"); - File dir = new File(StorageUtils.getExternalStorageLogDir()); - String path = dir.getPath(); - if (!dir.exists()) { - dir.mkdirs(); - } - FileOutputStream fos = new FileOutputStream(new File(path, fileName), true); - fos.write(sb.toString().getBytes()); - fos.close(); -// } - return fileName; - } catch (Exception e) { - Log.e(TAG, "an error occured while writing file...," + e); - } - return null; - } -} diff --git a/app/src/main/java/com/enqualcomm/support/GSensorListener.java b/app/src/main/java/com/enqualcomm/support/GSensorListener.java index 489cf05b..82ef19cb 100644 --- a/app/src/main/java/com/enqualcomm/support/GSensorListener.java +++ b/app/src/main/java/com/enqualcomm/support/GSensorListener.java @@ -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用的硬件计步,只需要保证打开计步器即可 */ diff --git a/app/src/main/java/com/enqualcomm/support/ICApplication.java b/app/src/main/java/com/enqualcomm/support/ICApplication.java index 06a3da07..1fc2cb29 100644 --- a/app/src/main/java/com/enqualcomm/support/ICApplication.java +++ b/app/src/main/java/com/enqualcomm/support/ICApplication.java @@ -8,9 +8,10 @@ import android.support.multidex.MultiDex; import android.util.SparseArray; import com.enqualcomm.support.service.HeartRateManager; -import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.TemperatureUtil; import com.enqualcomm.support.utils.VibrateUtil; +import com.ic.iclooger.CrashHandler; +import com.ic.iclooger.ICLogger; import java.util.HashMap; @@ -29,12 +30,11 @@ public class ICApplication extends Application { @Override public void onCreate() { super.onCreate(); - ICLogger.setContext(this.getApplicationContext()); + ICLogger.init(this, "protocol"); String info = String.format("VERSION_CODE:%s, VERSION_NAME:%s", BuildConfig.VERSION_CODE, BuildConfig.VERSION_NAME); ICLogger.i(TAG + "[onCreate]" + info); - CrashHandler crashHandler = CrashHandler.getInstance(); - crashHandler.init(getApplicationContext()); + CrashHandler.getInstance().init(this, "protocol crash see log."); instance = this; sContext = getApplicationContext(); //初始化一下,先设置广播 diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java index ea3e8aa1..fded6162 100644 --- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java +++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java index 5f68a43c..9e081232 100644 --- a/app/src/main/java/com/enqualcomm/support/LocationClient.java +++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/MainActivity.java b/app/src/main/java/com/enqualcomm/support/MainActivity.java index 332328de..3af808f7 100644 --- a/app/src/main/java/com/enqualcomm/support/MainActivity.java +++ b/app/src/main/java/com/enqualcomm/support/MainActivity.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java b/app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java index 3f4d72f9..103d2993 100644 --- a/app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java +++ b/app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java @@ -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 { diff --git a/app/src/main/java/com/enqualcomm/support/NMEAListener.java b/app/src/main/java/com/enqualcomm/support/NMEAListener.java index 8ee12500..425ea72a 100644 --- a/app/src/main/java/com/enqualcomm/support/NMEAListener.java +++ b/app/src/main/java/com/enqualcomm/support/NMEAListener.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/adapter/BTHelper.java b/app/src/main/java/com/enqualcomm/support/adapter/BTHelper.java index c063b8db..0907aa3c 100644 --- a/app/src/main/java/com/enqualcomm/support/adapter/BTHelper.java +++ b/app/src/main/java/com/enqualcomm/support/adapter/BTHelper.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/adapter/LBSHelper.java b/app/src/main/java/com/enqualcomm/support/adapter/LBSHelper.java index 4abb3048..02c6e786 100644 --- a/app/src/main/java/com/enqualcomm/support/adapter/LBSHelper.java +++ b/app/src/main/java/com/enqualcomm/support/adapter/LBSHelper.java @@ -13,8 +13,8 @@ import com.enqualcomm.support.Config; import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.utils.CellInfoUtil; import com.enqualcomm.support.utils.DeviceInfoUtil; -import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.Util; +import com.ic.iclooger.ICLogger; import java.util.Collections; import java.util.Comparator; diff --git a/app/src/main/java/com/enqualcomm/support/bean/DeviceStatus.java b/app/src/main/java/com/enqualcomm/support/bean/DeviceStatus.java index b9a29f90..29bc2999 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/DeviceStatus.java +++ b/app/src/main/java/com/enqualcomm/support/bean/DeviceStatus.java @@ -1,13 +1,5 @@ package com.enqualcomm.support.bean; -import com.enqualcomm.support.utils.ICLogger; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.Locale; - public class DeviceStatus { diff --git a/app/src/main/java/com/enqualcomm/support/bean/ICLocation.java b/app/src/main/java/com/enqualcomm/support/bean/ICLocation.java index e5611341..aa0fdc82 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/ICLocation.java +++ b/app/src/main/java/com/enqualcomm/support/bean/ICLocation.java @@ -1,6 +1,6 @@ package com.enqualcomm.support.bean; -import com.enqualcomm.support.utils.ICLogger; +import com.ic.iclooger.ICLogger; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java index 67114e4d..3d47e724 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java +++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/bean/SleepInfo.java b/app/src/main/java/com/enqualcomm/support/bean/SleepInfo.java index e2aa01b2..67d2c89d 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/SleepInfo.java +++ b/app/src/main/java/com/enqualcomm/support/bean/SleepInfo.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/provider/FZDDatabaseHelper.java b/app/src/main/java/com/enqualcomm/support/provider/FZDDatabaseHelper.java index 1cb395b6..0ff779dd 100644 --- a/app/src/main/java/com/enqualcomm/support/provider/FZDDatabaseHelper.java +++ b/app/src/main/java/com/enqualcomm/support/provider/FZDDatabaseHelper.java @@ -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 { diff --git a/app/src/main/java/com/enqualcomm/support/provider/FZDMembersProvider.java b/app/src/main/java/com/enqualcomm/support/provider/FZDMembersProvider.java index 4559205e..50acace5 100644 --- a/app/src/main/java/com/enqualcomm/support/provider/FZDMembersProvider.java +++ b/app/src/main/java/com/enqualcomm/support/provider/FZDMembersProvider.java @@ -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 { diff --git a/app/src/main/java/com/enqualcomm/support/provider/FZDMessageProvider.java b/app/src/main/java/com/enqualcomm/support/provider/FZDMessageProvider.java index 1172344c..39cc1d15 100644 --- a/app/src/main/java/com/enqualcomm/support/provider/FZDMessageProvider.java +++ b/app/src/main/java/com/enqualcomm/support/provider/FZDMessageProvider.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/provider/FZDSettingsProvider.java b/app/src/main/java/com/enqualcomm/support/provider/FZDSettingsProvider.java index cc286db9..fcfa815e 100644 --- a/app/src/main/java/com/enqualcomm/support/provider/FZDSettingsProvider.java +++ b/app/src/main/java/com/enqualcomm/support/provider/FZDSettingsProvider.java @@ -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; /** * 防走丢设置的内容提供者 diff --git a/app/src/main/java/com/enqualcomm/support/provider/ICAlarmProvider.java b/app/src/main/java/com/enqualcomm/support/provider/ICAlarmProvider.java index 593cd583..3c14734c 100644 --- a/app/src/main/java/com/enqualcomm/support/provider/ICAlarmProvider.java +++ b/app/src/main/java/com/enqualcomm/support/provider/ICAlarmProvider.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java b/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java index dbac12a7..17a6b6c1 100644 --- a/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java +++ b/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java @@ -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 { diff --git a/app/src/main/java/com/enqualcomm/support/provider/MySqlitOpenHelper.java b/app/src/main/java/com/enqualcomm/support/provider/MySqlitOpenHelper.java index 714d5b16..1eb57911 100644 --- a/app/src/main/java/com/enqualcomm/support/provider/MySqlitOpenHelper.java +++ b/app/src/main/java/com/enqualcomm/support/provider/MySqlitOpenHelper.java @@ -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 { diff --git a/app/src/main/java/com/enqualcomm/support/provider/WeTalkMessageProvider.java b/app/src/main/java/com/enqualcomm/support/provider/WeTalkMessageProvider.java index 4b0864f3..fd1f80c9 100644 --- a/app/src/main/java/com/enqualcomm/support/provider/WeTalkMessageProvider.java +++ b/app/src/main/java/com/enqualcomm/support/provider/WeTalkMessageProvider.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/service/AlarmManagerUtil.java b/app/src/main/java/com/enqualcomm/support/service/AlarmManagerUtil.java index 226b83db..6eb185a3 100644 --- a/app/src/main/java/com/enqualcomm/support/service/AlarmManagerUtil.java +++ b/app/src/main/java/com/enqualcomm/support/service/AlarmManagerUtil.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java index 49673d48..b7694caf 100644 --- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java +++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/service/AudioService.java b/app/src/main/java/com/enqualcomm/support/service/AudioService.java index ee11e51d..f1617331 100644 --- a/app/src/main/java/com/enqualcomm/support/service/AudioService.java +++ b/app/src/main/java/com/enqualcomm/support/service/AudioService.java @@ -5,7 +5,7 @@ import android.content.res.AssetManager; import android.media.MediaPlayer; import android.media.MediaRecorder; -import com.enqualcomm.support.utils.ICLogger; +import com.ic.iclooger.ICLogger; import java.io.IOException; diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java index d1efd691..9fdb1606 100644 --- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java +++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java index b4722f47..605b7e07 100644 --- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java +++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/service/Initialize.java b/app/src/main/java/com/enqualcomm/support/service/Initialize.java index da8a55b6..18d9b27b 100644 --- a/app/src/main/java/com/enqualcomm/support/service/Initialize.java +++ b/app/src/main/java/com/enqualcomm/support/service/Initialize.java @@ -4,12 +4,12 @@ import android.database.Cursor; import com.enqualcomm.support.Config; import com.enqualcomm.support.provider.ICContentProvider; +import com.ic.iclooger.ICLogger; import com.ic.protocols.protocolAPIHelper; import com.enqualcomm.support.bean.StringMessage; import com.enqualcomm.support.service.base.AbstractConnectionService; import com.enqualcomm.support.utils.Connection; import com.enqualcomm.support.bean.Runtime; -import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.SimSignalUtil; public class Initialize extends AbstractConnectionService { diff --git a/app/src/main/java/com/enqualcomm/support/service/InputEventReader.java b/app/src/main/java/com/enqualcomm/support/service/InputEventReader.java index 5cb33f32..2bd490af 100644 --- a/app/src/main/java/com/enqualcomm/support/service/InputEventReader.java +++ b/app/src/main/java/com/enqualcomm/support/service/InputEventReader.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java index 4d6dda9c..a525118b 100644 --- a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java +++ b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java b/app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java index 8c2c5297..265282d7 100644 --- a/app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java +++ b/app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java @@ -11,10 +11,10 @@ import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.bean.VoiceContent; import com.enqualcomm.support.service.base.AbstractInvokeHandlerService; import com.enqualcomm.support.utils.Connection; -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 static com.enqualcomm.support.bean.Content.CONTACT_CATEGORY_GROUP; diff --git a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java index 8bf20ccb..f1d42696 100644 --- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java +++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/service/SmsDatabaseChaneObserver.java b/app/src/main/java/com/enqualcomm/support/service/SmsDatabaseChaneObserver.java index 1ddf59d8..caddb4fe 100644 --- a/app/src/main/java/com/enqualcomm/support/service/SmsDatabaseChaneObserver.java +++ b/app/src/main/java/com/enqualcomm/support/service/SmsDatabaseChaneObserver.java @@ -9,7 +9,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; -import com.enqualcomm.support.utils.ICLogger; +import com.ic.iclooger.ICLogger; /** * 数据库观察者 diff --git a/app/src/main/java/com/enqualcomm/support/service/SynchronousTime.java b/app/src/main/java/com/enqualcomm/support/service/SynchronousTime.java index acc188da..2a0ebdf9 100644 --- a/app/src/main/java/com/enqualcomm/support/service/SynchronousTime.java +++ b/app/src/main/java/com/enqualcomm/support/service/SynchronousTime.java @@ -2,13 +2,12 @@ package com.enqualcomm.support.service; import android.os.SystemClock; -import com.ic.protocols.protocolAPIHelper; import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.bean.StringMessage; import com.enqualcomm.support.service.base.AbstractConnectionService; import com.enqualcomm.support.utils.Connection; -import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.TimeUtil; +import com.ic.iclooger.ICLogger; public class SynchronousTime extends AbstractConnectionService { private boolean synchronousTimeOK = false; diff --git a/app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java b/app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java index 901b6b6b..f6fffc41 100644 --- a/app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java +++ b/app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java @@ -8,8 +8,8 @@ import com.enqualcomm.support.bean.ICLocation; import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.service.base.AbstractInvokeHandlerService; import com.enqualcomm.support.utils.Connection; -import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.SharePreferenceUtil; +import com.ic.iclooger.ICLogger; import java.util.List; diff --git a/app/src/main/java/com/enqualcomm/support/service/WeTalkMsgObserver.java b/app/src/main/java/com/enqualcomm/support/service/WeTalkMsgObserver.java index 79caf1f0..b12bc9bb 100644 --- a/app/src/main/java/com/enqualcomm/support/service/WeTalkMsgObserver.java +++ b/app/src/main/java/com/enqualcomm/support/service/WeTalkMsgObserver.java @@ -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 { diff --git a/app/src/main/java/com/enqualcomm/support/utils/AESCipher.java b/app/src/main/java/com/enqualcomm/support/utils/AESCipher.java index 76b2efba..3e519861 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/AESCipher.java +++ b/app/src/main/java/com/enqualcomm/support/utils/AESCipher.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/APNUtil.java b/app/src/main/java/com/enqualcomm/support/utils/APNUtil.java index df76bf76..e20c1203 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/APNUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/APNUtil.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java index a6bb83b0..511f1e22 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java +++ b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java @@ -8,6 +8,7 @@ import android.os.Build; import android.os.SystemClock; import com.enqualcomm.support.CoreService; +import com.ic.iclooger.ICLogger; import java.lang.reflect.Method; import java.util.Calendar; diff --git a/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java b/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java index da199c49..7a3551b9 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java +++ b/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java @@ -11,6 +11,7 @@ import com.enqualcomm.support.Constants; import com.enqualcomm.support.bean.Contact; import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.CoreService; +import com.ic.iclooger.ICLogger; import static com.enqualcomm.support.Constants.SERVICE_CLS_NAME; import static com.enqualcomm.support.Constants.SERVICE_PKG_NAME; diff --git a/app/src/main/java/com/enqualcomm/support/utils/ApnEditor.java b/app/src/main/java/com/enqualcomm/support/utils/ApnEditor.java index 0120aeb6..226de274 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ApnEditor.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ApnEditor.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java index f0897011..b070fc2d 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java b/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java index f2ff1fa4..33fbfd29 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java @@ -15,6 +15,7 @@ import android.view.WindowManager; import com.enqualcomm.support.Config; import com.enqualcomm.support.CoreService; +import com.ic.iclooger.ICLogger; import java.io.BufferedOutputStream; import java.io.File; diff --git a/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java b/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java index 2529d9a9..80660bde 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java index 190fe0ee..3a82c782 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java index 418025eb..f754c1ae 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java +++ b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java index 5915d116..9fbf2198 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/DnsUtil.java b/app/src/main/java/com/enqualcomm/support/utils/DnsUtil.java index 2716386c..bbd4f60e 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/DnsUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/DnsUtil.java @@ -7,6 +7,7 @@ import android.os.Message; import com.enqualcomm.support.Config; import com.enqualcomm.support.bean.DNSTaskModel; +import com.ic.iclooger.ICLogger; import com.sina.util.dnscache.DNSCache; import com.sina.util.dnscache.DomainInfo; import com.sina.util.dnscache.Tools; @@ -45,13 +46,10 @@ public class DnsUtil { try { Thread.currentThread().setName("Task Pool"); - ICLogger.log("TAG", "任务开始"); - model.taskStartTime = System.currentTimeMillis(); model.taskID = ++ID_NUMBER; - model.domainUrl = model.url ; model.domainIp = java.net.InetAddress.getByName(Tools.getHostName(model.domainUrl)).getHostAddress(); INetworkRequests domainNetRequests = new ApacheHttpClientNetworkRequests() ; diff --git a/app/src/main/java/com/enqualcomm/support/utils/FileOutputUtil.java b/app/src/main/java/com/enqualcomm/support/utils/FileOutputUtil.java index b61d848c..bd966765 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/FileOutputUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/FileOutputUtil.java @@ -2,6 +2,8 @@ package com.enqualcomm.support.utils; import android.content.Context; +import com.ic.iclooger.ICLogger; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/app/src/main/java/com/enqualcomm/support/utils/HttpDnsRecordUtil.java b/app/src/main/java/com/enqualcomm/support/utils/HttpDnsRecordUtil.java index 514102ee..c60fddac 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/HttpDnsRecordUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/HttpDnsRecordUtil.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java b/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java index b3ceade6..892e2eb8 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/ICHttpUtil.java b/app/src/main/java/com/enqualcomm/support/utils/ICHttpUtil.java index 222c6d4d..cc92f249 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ICHttpUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ICHttpUtil.java @@ -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 index 501c3470..00000000 --- a/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java +++ /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); - - } - } - -} - diff --git a/app/src/main/java/com/enqualcomm/support/utils/LanguageUtils.java b/app/src/main/java/com/enqualcomm/support/utils/LanguageUtils.java index 69f419f6..23991fec 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/LanguageUtils.java +++ b/app/src/main/java/com/enqualcomm/support/utils/LanguageUtils.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/LedUtil.java b/app/src/main/java/com/enqualcomm/support/utils/LedUtil.java index 505f03de..586996ad 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/LedUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/LedUtil.java @@ -1,6 +1,6 @@ package com.enqualcomm.support.utils; -import com.enqualcomm.support.bean.voicePacket; +import com.ic.iclooger.ICLogger; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/com/enqualcomm/support/utils/MissedCallContentObserver.java b/app/src/main/java/com/enqualcomm/support/utils/MissedCallContentObserver.java index cc952423..1bc8e4d6 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/MissedCallContentObserver.java +++ b/app/src/main/java/com/enqualcomm/support/utils/MissedCallContentObserver.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java index 98a4d751..e41ac171 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java +++ b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/NetworkObservable.java b/app/src/main/java/com/enqualcomm/support/utils/NetworkObservable.java index bb3bc950..c5d9c3a0 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/NetworkObservable.java +++ b/app/src/main/java/com/enqualcomm/support/utils/NetworkObservable.java @@ -8,6 +8,7 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import com.enqualcomm.support.service.KeepAlive; +import com.ic.iclooger.ICLogger; import rx.Observable; import rx.subjects.BehaviorSubject; diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java index ba30e7ca..2d0e1676 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProfileManager.java b/app/src/main/java/com/enqualcomm/support/utils/ProfileManager.java index a8efe17e..2569bfc0 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ProfileManager.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ProfileManager.java @@ -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 { //只声音,无振动(可用) diff --git a/app/src/main/java/com/enqualcomm/support/utils/RxSocket.java b/app/src/main/java/com/enqualcomm/support/utils/RxSocket.java index 6401f140..32b53b3d 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/RxSocket.java +++ b/app/src/main/java/com/enqualcomm/support/utils/RxSocket.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/SendEmail.java b/app/src/main/java/com/enqualcomm/support/utils/SendEmail.java index 3b9594b1..1384e49e 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/SendEmail.java +++ b/app/src/main/java/com/enqualcomm/support/utils/SendEmail.java @@ -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"; diff --git a/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java b/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java index 22fa5e5b..b4a71734 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/TempAlgUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TempAlgUtil.java index e72eed01..21d19242 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/TempAlgUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/TempAlgUtil.java @@ -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 { diff --git a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java index 916c685e..3531cffa 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java index 2f71cebe..39eee1f8 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/Util.java b/app/src/main/java/com/enqualcomm/support/utils/Util.java index 3a714565..6ce2bfac 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/Util.java +++ b/app/src/main/java/com/enqualcomm/support/utils/Util.java @@ -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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java b/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java index c8419ee2..a3fdd318 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java @@ -5,7 +5,8 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Vibrator; -import android.support.v4.app.INotificationSideChannel; + +import com.ic.iclooger.ICLogger; import static android.content.Context.VIBRATOR_SERVICE; diff --git a/app/src/main/java/com/enqualcomm/support/utils/ftpUtils.java b/app/src/main/java/com/enqualcomm/support/utils/ftpUtils.java index 68909c07..b1f98356 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ftpUtils.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ftpUtils.java @@ -1,5 +1,6 @@ package com.enqualcomm.support.utils; +import com.ic.iclooger.ICLogger; import com.sina.util.dnscache.log.FileUtil; import java.io.File; diff --git a/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java b/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java index d0b86c97..47a497e8 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java +++ b/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java @@ -2,6 +2,7 @@ package com.enqualcomm.support.utils; import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.bean.StringMessage; +import com.ic.iclooger.ICLogger; import com.ic.protocols.protocolAPIHelper; import com.ic.protocols.protocol_mqtt_client; diff --git a/app/src/main/java/com/enqualcomm/support/utils/sysProperties.java b/app/src/main/java/com/enqualcomm/support/utils/sysProperties.java index df722a5a..6d078b49 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/sysProperties.java +++ b/app/src/main/java/com/enqualcomm/support/utils/sysProperties.java @@ -1,6 +1,8 @@ package com.enqualcomm.support.utils; +import com.ic.iclooger.ICLogger; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java index b17ad87e..b32dd9f8 100644 --- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java +++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java @@ -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; diff --git a/app/src/main/java/com/ic/protocols/protocol_anan.java b/app/src/main/java/com/ic/protocols/protocol_anan.java index 0ff2199e..bbefaea8 100644 --- a/app/src/main/java/com/ic/protocols/protocol_anan.java +++ b/app/src/main/java/com/ic/protocols/protocol_anan.java @@ -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; diff --git a/app/src/main/java/com/ic/protocols/protocol_beehome.java b/app/src/main/java/com/ic/protocols/protocol_beehome.java index ea17f869..7be9394d 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -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); } diff --git a/app/src/main/java/com/ic/protocols/protocol_fzd.java b/app/src/main/java/com/ic/protocols/protocol_fzd.java index f9dd55ac..fcbba25e 100644 --- a/app/src/main/java/com/ic/protocols/protocol_fzd.java +++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java @@ -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; diff --git a/app/src/main/java/com/ic/protocols/protocol_gator.java b/app/src/main/java/com/ic/protocols/protocol_gator.java index ddba2f58..ffea2cfe 100644 --- a/app/src/main/java/com/ic/protocols/protocol_gator.java +++ b/app/src/main/java/com/ic/protocols/protocol_gator.java @@ -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协议 diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java index 15ffe0ce..c4443bd0 100644 --- a/app/src/main/java/com/ic/protocols/protocol_ic.java +++ b/app/src/main/java/com/ic/protocols/protocol_ic.java @@ -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; diff --git a/app/src/main/java/com/ic/protocols/protocol_jiai.java b/app/src/main/java/com/ic/protocols/protocol_jiai.java index a950ccac..a6287054 100644 --- a/app/src/main/java/com/ic/protocols/protocol_jiai.java +++ b/app/src/main/java/com/ic/protocols/protocol_jiai.java @@ -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; diff --git a/app/src/main/java/com/ic/protocols/protocol_mqtt.java b/app/src/main/java/com/ic/protocols/protocol_mqtt.java index 6f7cb7ef..ebbfb2fb 100644 --- a/app/src/main/java/com/ic/protocols/protocol_mqtt.java +++ b/app/src/main/java/com/ic/protocols/protocol_mqtt.java @@ -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; diff --git a/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java b/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java index 1988ffdd..8cc62fbd 100644 --- a/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java +++ b/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java @@ -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; diff --git a/app/src/main/java/com/ic/protocols/protocol_s123.java b/app/src/main/java/com/ic/protocols/protocol_s123.java index 65a240b2..fa18c35d 100644 --- a/app/src/main/java/com/ic/protocols/protocol_s123.java +++ b/app/src/main/java/com/ic/protocols/protocol_s123.java @@ -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; diff --git a/app/src/main/java/com/ic/view/msg/MessageAdapter.java b/app/src/main/java/com/ic/view/msg/MessageAdapter.java index 09bc4a0f..e8425ecb 100644 --- a/app/src/main/java/com/ic/view/msg/MessageAdapter.java +++ b/app/src/main/java/com/ic/view/msg/MessageAdapter.java @@ -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; diff --git a/app/src/main/java/com/ic/view/msg/MsgMustReadDialog.java b/app/src/main/java/com/ic/view/msg/MsgMustReadDialog.java index 44065ee3..65bde5c0 100644 --- a/app/src/main/java/com/ic/view/msg/MsgMustReadDialog.java +++ b/app/src/main/java/com/ic/view/msg/MsgMustReadDialog.java @@ -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; diff --git a/app/src/main/java/se/wetcat/qatja/android/QatjaService.java b/app/src/main/java/se/wetcat/qatja/android/QatjaService.java index 5b37af5f..aee484e0 100644 --- a/app/src/main/java/se/wetcat/qatja/android/QatjaService.java +++ b/app/src/main/java/se/wetcat/qatja/android/QatjaService.java @@ -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; diff --git a/app/version_code.properties b/app/version_code.properties index fa2bd21a..8c992f6b 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Tue Dec 21 17:09:29 CST 2021 -VERSION_CODE=939 +#Wed Dec 22 19:47:03 CST 2021 +VERSION_CODE=940