Browse Source

add method setLogEnable

Melon 1 year ago
parent
commit
e45d9239e3

+ 11 - 7
app/src/main/java/vinno/sportinspect/sdk/BaseSdk.java

@@ -97,7 +97,7 @@ class BaseSdk {
                     }
                 }
                 return;
-            }   else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {
+            } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {
                 onBTSearchResultListener.onSearchResult(new SearchResultUtils(StatusConstant.BLE_SEARCH_COMPLETE).toJSONObject());
             }
         }
@@ -148,6 +148,10 @@ class BaseSdk {
         }
     }
 
+    public void setLogEnable(Application context, boolean enable) {
+        LogUtil.setEnable(context, enable);
+    }
+
     //权限检查
     public JSONObject checkPermission() {
         //
@@ -286,14 +290,14 @@ class BaseSdk {
         }
 
         Collection<Device> devices = null;
-        if( !StringUtils.isEmpty(type) ){
+        if (!StringUtils.isEmpty(type)) {
             HashMap<String, Device> list = deviceMapsByTypes.get(type);
-            if(list == null || list.size() == 0 ) {
+            if (list == null || list.size() == 0) {
                 onBleSearchResultListener.onSearchResult(new SearchResultUtils(StatusConstant.BLE_NOTFOUND).toJSONObject());
                 return;
             }
             devices = list.values();
-        }else{
+        } else {
             devices = deviceMapsByModels.values();
         }
 
@@ -309,7 +313,7 @@ class BaseSdk {
         context.registerReceiver(mReceiver, filter);
 
         if (onBleSearchResultListener != null) {
-            onBTSearchResultListener =onBleSearchResultListener;
+            onBTSearchResultListener = onBleSearchResultListener;
         }
     }
 
@@ -404,10 +408,10 @@ class BaseSdk {
     }
 
     /// 新增自动测试
-    public  void autoTest(String model) {
+    public void autoTest(String model) {
         BaseDevices instanceDevice = instanceDevices.get(model);
         if (instanceDevice != null) {
-             instanceDevice.autoTest();
+            instanceDevice.autoTest();
         }
     }
 

+ 24 - 5
app/src/main/java/vinno/sportinspect/utils/log/LogUtil.java

@@ -20,13 +20,26 @@ import java.io.File;
 import java.text.SimpleDateFormat;
 
 public class LogUtil {
+    static boolean _hasInit = false;
+    static boolean _enable = false;
 
-    public static void init(Context context, boolean isDebug) {
-        if (isDebug) {
-            Logger.addLogAdapter(new ConsoleAdapter());
+    public static void setEnable(Context context, boolean val) {
+        _enable = val;
+        if (_enable) {
+            init(context, true);
+        }
+    }
 
-            File logFolder = new File(context.getExternalFilesDir(null), "VitalDeviceSDK");
-            Logger.addLogAdapter(new FileLogAdapter(logFolder));
+    public static void init(Context context, boolean isDebug) {
+        _enable = isDebug;
+        if (_enable) {
+            if (!_hasInit) {
+                Logger.addLogAdapter(new ConsoleAdapter());
+
+                File logFolder = new File(context.getExternalFilesDir(null), "VitalDeviceSDK");
+                Logger.addLogAdapter(new FileLogAdapter(logFolder));
+                _hasInit = true;
+            }
         }
     }
 
@@ -35,6 +48,7 @@ public class LogUtil {
     }
 
     public static void d(String message) {
+        if (!_enable) return;
         if (message != null) {
             Logger.d("vinno===>" + message);
         } else {
@@ -43,22 +57,27 @@ public class LogUtil {
     }
 
     public static void w(String message) {
+        if (!_enable) return;
         Logger.w(message);
     }
 
     public static void e(String message, String e) {
+        if (!_enable) return;
         Logger.e(e, message);
     }
 
     public static void json(String json) {
+        if (!_enable) return;
         Logger.json(json);
     }
 
     public static void wtf(String message) {
+        if (!_enable) return;
         Logger.wtf(message);
     }
 
     public static void i(String message) {
+        if (!_enable) return;
         if (message != null) {
             Logger.i(message);
         } else {