fix: ci

app/src/main/java/qianmu/container/activity/H5/UpdateFileActivity.java

@@ -272,14 +272,15 @@ public class UpdateFileActivity extends BaseActivity {
         LoggerUtil.e("UpdateFileActivity","setData()");
         //清除文件
         try {
-            if (DeviceUtil.getSDAvailableSize() < DeviceUtil.getSDTotalSize() * 0.3) {
+            LoggerUtil.e("剩余存储不足2G: ", String.valueOf(DeviceUtil.getSDAvailableSize() < 2000000000L));
+            if (DeviceUtil.getSDAvailableSize() < 2000000000L ) {
                 File file = new File(StringUtil.strSplice(Constant.CACHE_PATH, "Files/"));
                 File file2 = new File(StringUtil.strSplice(Constant.CACHE_PATH, "iotFile/"));
                 DeviceUtil.recursionDeleteFile(file);
                 DeviceUtil.recursionDeleteFile(file2);
             }
         }catch (Exception e){
-
+            LoggerUtil.e("recursionDeleteFile", e.getMessage());
         }
         //删除没用日志
         LoggerUtil.deleteLogFiles();

app/src/main/java/qianmu/container/data/PowerData.java

@@ -6,6 +6,7 @@ import android.util.Log;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.sdkapi.api.SdkApi;
+import com.ys.rkapi.MyManager;
 import com.zcapi;
 
 import org.greenrobot.eventbus.EventBus;
@@ -136,9 +137,15 @@ public class PowerData extends BaseData {
             }
 
             String dataJson = getDataJson(NAME, POWER_INFO, "{}");
-            //   Log.e("tag","设置的定时开关机"+dataJson);
             if(newTimeInfo.equals(dataJson)){
-                Log.e("PowerData","定时开关机相同");
+                if(Constant.androidBoardType.equals("ys")){
+                    MyManager manager = MyManager.getInstance(MyApplication.getInstance());
+                    boolean isset = manager.isSetPowerOnTime();
+                    if(!isset){
+                        LoggerUtil.e("开机时间设置：",String.valueOf(isset));
+                        newTimeInfo = "";
+                    }
+                }
                 return;
             }
             LoggerUtil.e("PowerData","定时开关机不同");
@@ -219,23 +226,15 @@ public class PowerData extends BaseData {
                     boolean b1 = SdkApi.getInstance().TimerSwitch().setTimerOffTime(parameter);
                     LoggerUtil.e("PowerData()", "关机时间："+ parameter+ String.valueOf(b)+"，开机时间："+ bootTime+ String.valueOf(b1));
                 }else  if(Constant.androidBoardType.equals("ys")){
-
-                    //按周：关机时间要在开机时间之后  按天：关机时间在开机时间之前
-//                    int[] timeoffArray = { Integer.parseInt(off[0]), Integer.parseInt(off[1])};
-//                    int[] timeonArray = {Integer.parseInt(on[0]),Integer.parseInt(on[1])};
-//                    SignWayUtil.setPowerOnOffTimeWithWeekFort982(timeonArray,timeoffArray);
                     if(parameterLong > bootLong) {
                         //关机时间大于开机时间，第二天开机
                         int[] timeoffArray = {Integer.parseInt(date[0]), Integer.parseInt(date[1]), Integer.parseInt(date[2]), Integer.parseInt(off[0]), Integer.parseInt(off[1])};
                         int[] timeonArray = {Integer.parseInt(date2[0]), Integer.parseInt(date2[1]), Integer.parseInt(date2[2]), Integer.parseInt(on2[0]),Integer.parseInt(on2[1])};
                         SignWayUtil.setPowerOnOffTimeFortYs(timeoffArray,timeonArray);
-
                     }else {
                         //关机时间小于开机时间，当天关机，当天开机。
-
                         if(currentLong >= bootLong){
                             //当前时间大于开机时间，设置第二天关机，第二天开机
-
                             int[] timeoffArray = {Integer.parseInt(date2[0]), Integer.parseInt(date2[1]), Integer.parseInt(date2[2]), Integer.parseInt(off[0]), Integer.parseInt(off[1])};
                             int[] timeonArray = {Integer.parseInt(date2[0]), Integer.parseInt(date2[1]), Integer.parseInt(date2[2]), Integer.parseInt(on[0]),Integer.parseInt(on[1])};
                             SignWayUtil.setPowerOnOffTimeFortYs(timeoffArray,timeonArray);

app/src/main/java/qianmu/container/util/DeviceUtil.java

@@ -418,21 +418,26 @@ public class DeviceUtil {
      * @param file 要删除的根目录
      */
     public static void recursionDeleteFile(File file) {
-        if (file.isFile()) {
-            file.delete();
-            return;
-        }
-        if (file.isDirectory()) {
-            File[] childFile = file.listFiles();
-            if (childFile == null || childFile.length == 0) {
+        try{
+            if (file.isFile()) {
                 file.delete();
                 return;
             }
-            for (File f : childFile) {
-                recursionDeleteFile(f);
+            if (file.isDirectory()) {
+                File[] childFile = file.listFiles();
+                if (childFile == null || childFile.length == 0) {
+                    file.delete();
+                    return;
+                }
+                for (File f : childFile) {
+                    recursionDeleteFile(f);
+                }
+                file.delete();
             }
-            file.delete();
+        }catch(Exception e){
+            LoggerUtil.e("fileDelete: ", e.getMessage());
         }
+
     }
 
 }

app/src/main/java/qianmu/container/util/SharedPreUtil.java

@@ -60,19 +60,18 @@ public class SharedPreUtil {
         SharedPreferences sp = context.getSharedPreferences(fileName, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = sp.edit();
 
-        if ("String".equals(type)) {
+        if (object instanceof String) {
             editor.putString(key, (String) object);
-        } else if ("Integer".equals(type)) {
+        } else if (object instanceof Integer) {
             editor.putInt(key, (Integer) object);
-        } else if ("Boolean".equals(type)) {
+        } else if (object instanceof Boolean) {
             editor.putBoolean(key, (Boolean) object);
-        } else if ("Float".equals(type)) {
+        } else if (object instanceof Float) {
             editor.putFloat(key, (Float) object);
-        } else if ("Long".equals(type)) {
+        } else if (object instanceof Long) {
             editor.putLong(key, (Long) object);
         }
-
-        editor.commit();
+        editor.apply();
     }
 
 

app/src/main/java/qianmu/container/util/SignWayUtil.java

@@ -193,46 +193,6 @@ public class SignWayUtil {
         }
     }
 
-
-
-    /**
-     * 3588时间开机关机
-     */
-    public static void setPowerOnOffTimeWithWeekFor3588(int[] timeonArray,int[] timeoffArray) {
-        MyManager manager = MyManager.getInstance(MyApplication.getInstance());
-//        int[] timeoffArray = {2018, 1, 10, 20, 38};
-//        int[] timeonArray = {2018, 1, 10, 20, 48};
-        int[] weekdays = {1,1,1,1,1,1,1};
-        clearPowerOnOffTime();
-        manager.setPowerOnOffWithWeekly(timeonArray,timeoffArray,weekdays);
-
-    }
-
-    /**
-     * 3588时间开机关机
-     */
-    public static void setPowerOnOffTimeFor3588(int[] timeonArray,int[] timeoffArray) {
-        MyManager manager = MyManager.getInstance(MyApplication.getInstance());
-//        int[] timeoffArray = {2018, 1, 10, 20, 38};
-//        int[] timeonArray = {2018, 1, 10, 20, 48};
-        clearPowerOnOffTime();
-        manager.setPowerOnOff(timeonArray,timeoffArray);
-
-    }
-
-    /**
-     * 3588时间开机关机
-     */
-    public static void setPowerOnOffTimeWithWeekFort982(int[] timeonArray,int[] timeoffArray) {
-        MyManager manager = MyManager.getInstance(MyApplication.getInstance());
-//        int[] timeoffArray = {2018, 1, 10, 20, 38};
-//        int[] timeonArray = {2018, 1, 10, 20, 48};
-        int[] weekdays = {1,1,1,1,1,1,1};
-        clearPowerOnOffTime();
-        manager.setPowerOnOffWithWeekly(timeonArray,timeoffArray,weekdays);
-
-    }
-
     /**
      * 按天设置定时开关机
      */
@@ -240,7 +200,6 @@ public class SignWayUtil {
         try {
             MyManager manager = MyManager.getInstance(MyApplication.getInstance());
             LoggerUtil.e("TAG","设置了定时开关机：关机："+GsonUtil.getGson().toJson(timeoffArray)+"，开机："+GsonUtil.getGson().toJson(timeonArray));
-            clearPowerOnOffTime();
             manager.setPowerOnOff(timeonArray,timeoffArray);
         }catch (Throwable t) {
             LoggerUtil.e("setPowerOnOffTimeFortYs", StringUtil.getThrowableStr(t));