From: snickersun <scy@incartech.cn>
Date: Thu, 22 Oct 2020 04:06:55 +0000 (+0800)
Subject: release IcAkLauncher V163
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=9d54478a60dba471f2ab90996cb470461781df33;p=aklauncher.git

release IcAkLauncher V163
1、日志重定向到/sdcard/Android/ic/com.ic.ak.launcher
2、back执行finish Dialog
---

diff --git a/app/libs/android-logging-log4j-1.0.3.jar b/app/libs/android-logging-log4j-1.0.3.jar
new file mode 100644
index 0000000..7d4146f
Binary files /dev/null and b/app/libs/android-logging-log4j-1.0.3.jar differ
diff --git a/app/libs/ftp4j-1.7.2.jar b/app/libs/ftp4j-1.7.2.jar
new file mode 100644
index 0000000..fca26ec
Binary files /dev/null and b/app/libs/ftp4j-1.7.2.jar differ
diff --git a/app/libs/log4j-1.2.17.jar b/app/libs/log4j-1.2.17.jar
new file mode 100644
index 0000000..068867e
Binary files /dev/null and b/app/libs/log4j-1.2.17.jar differ
diff --git a/app/release/ICAkLauncher_V161_202010211934_release.apk b/app/release/ICAkLauncher_V163_202010221200_release.apk
similarity index 53%
rename from app/release/ICAkLauncher_V161_202010211934_release.apk
rename to app/release/ICAkLauncher_V163_202010221200_release.apk
index 4ab0614..5606237 100644
Binary files a/app/release/ICAkLauncher_V161_202010211934_release.apk and b/app/release/ICAkLauncher_V163_202010221200_release.apk differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index daf8a38..407179f 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,10 +11,10 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 161,
-      "versionName": "202010211934",
+      "versionCode": 163,
+      "versionName": "202010221200",
       "enabled": true,
-      "outputFile": "ICAkLauncher_V161_202010211934_release.apk"
+      "outputFile": "ICAkLauncher_V163_202010221200_release.apk"
     }
   ]
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/ak/launcher/LauncherApp.java b/app/src/main/java/com/ic/ak/launcher/LauncherApp.java
index bc7c011..785b279 100644
--- a/app/src/main/java/com/ic/ak/launcher/LauncherApp.java
+++ b/app/src/main/java/com/ic/ak/launcher/LauncherApp.java
@@ -11,6 +11,7 @@ import com.ic.ak.launcher.data.hardware.HardwareDispose;
 import com.ic.ak.launcher.data.phone.PhoneDispose;
 import com.ic.ak.launcher.data.time.TimeDispose;
 import com.ic.ak.launcher.util.CrashHandler;
+import com.ic.ak.launcher.util.ICLogger;
 import com.ic.ak.launcher.util.IcLog;
 import com.jakewharton.threetenabp.AndroidThreeTen;
 
@@ -30,6 +31,7 @@ public class LauncherApp extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        ICLogger.setContext(this);
         CrashHandler crashHandler = CrashHandler.getInstance();
         crashHandler.init(getApplicationContext());
 
diff --git a/app/src/main/java/com/ic/ak/launcher/ui/DialogActivity.java b/app/src/main/java/com/ic/ak/launcher/ui/DialogActivity.java
index f84a1f0..f68c95b 100644
--- a/app/src/main/java/com/ic/ak/launcher/ui/DialogActivity.java
+++ b/app/src/main/java/com/ic/ak/launcher/ui/DialogActivity.java
@@ -51,7 +51,7 @@ public class DialogActivity extends AppCompatActivity {
         IcLog.i(DialogActivity.class.getSimpleName(),"keyCode "+keyCode+" "+event.getKeyCode());
 
         if(keyCode==KeyEvent.KEYCODE_BACK || keyCode==KeyEvent.KEYCODE_HOME){
-  //          this.finish();
+            this.finish();
             IcLog.i(DialogActivity.class.getSimpleName(),"finish!");
         }
         return true;
diff --git a/app/src/main/java/com/ic/ak/launcher/util/ICLogger.java b/app/src/main/java/com/ic/ak/launcher/util/ICLogger.java
new file mode 100644
index 0000000..7677e48
--- /dev/null
+++ b/app/src/main/java/com/ic/ak/launcher/util/ICLogger.java
@@ -0,0 +1,314 @@
+package com.ic.ak.launcher.util;
+
+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(mContext)+ 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(mContext)+ File.separator + name+".txt";
+      RollingFileAppender rollingFileAppender= null;
+      try {
+        rollingFileAppender = new RollingFileAppender(fileLayout,filename);
+      } catch (IOException e) {
+        e.printStackTrace();
+        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 "msg 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/ic/ak/launcher/util/IcLog.java b/app/src/main/java/com/ic/ak/launcher/util/IcLog.java
index 3d2f5b7..a536b06 100644
--- a/app/src/main/java/com/ic/ak/launcher/util/IcLog.java
+++ b/app/src/main/java/com/ic/ak/launcher/util/IcLog.java
@@ -17,31 +17,31 @@ public class IcLog {
 
     public static void v(String tag, String msg) {
         if (isDebug) {
-            Log.v(mergeHeadTag(tag), msg);
+            ICLogger.v(mergeHeadTag(tag)+" "+ msg);
         }
     }
 
     public static void d(String tag, String msg) {
         if (isDebug) {
-            Log.d(mergeHeadTag(tag), msg);
+            ICLogger.d(mergeHeadTag(tag)+" "+ msg);
         }
     }
 
     public static void i(String tag, String msg) {
         if (isDebug) {
-            Log.i(mergeHeadTag(tag), msg);
+            ICLogger.i(mergeHeadTag(tag)+" "+ msg);
         }
     }
 
     public static void w(String tag, String msg) {
         if (isDebug) {
-            Log.w(mergeHeadTag(tag), msg);
+            ICLogger.w(mergeHeadTag(tag)+" "+ msg);
         }
     }
 
     public static void e(String tag, String msg,Throwable e) {
         if (isDebug) {
-            Log.e(mergeHeadTag(tag), msg,e);
+            ICLogger.e(mergeHeadTag(tag)+" "+ msg,e);
         }
     }
 
diff --git a/app/src/main/java/com/ic/ak/launcher/util/StorageUtils.java b/app/src/main/java/com/ic/ak/launcher/util/StorageUtils.java
new file mode 100644
index 0000000..d291d14
--- /dev/null
+++ b/app/src/main/java/com/ic/ak/launcher/util/StorageUtils.java
@@ -0,0 +1,169 @@
+/*******************************************************************************
+ * Copyright 2011-2013 Sergey Tarasevich
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *******************************************************************************/
+package com.ic.ak.launcher.util;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Environment;
+import android.os.StatFs;
+
+import com.ic.ak.launcher.BuildConfig;
+import com.ic.ak.launcher.data.app.AppConfig;
+
+import java.io.File;
+import java.io.IOException;
+
+import static android.os.Environment.MEDIA_MOUNTED;
+
+/**
+ * Provides application storage paths
+ *
+ * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
+ * @since 1.0.0
+ */
+public final class StorageUtils {
+
+	private static final String EXTERNAL_STORAGE_PERMISSION = "android.permission.WRITE_EXTERNAL_STORAGE";
+	private static final String INDIVIDUAL_DIR_NAME = "uil-images";
+
+	private StorageUtils() {
+	}
+
+	public static String getExternalStorageLogDir(Context context) {
+
+		if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
+			File dir = new File(Environment.getExternalStorageDirectory().getPath(), "Android/ic/"+ context.getApplicationInfo().packageName);
+			String path = dir.getPath();
+			if (!dir.exists()) {
+				dir.mkdirs();
+			}
+			return path;
+		}
+		return "/storage/emulated/0/Android/ic/icprotocol";
+	}
+	/**
+	 * Returns application cache directory. Cache directory will be created on SD card
+	 * <i>("/Android/data/[app_package_name]/cache")</i> if card is mounted and app has appropriate permission. Else -
+	 * Android defines cache directory on device's file system.
+	 *
+	 * @param context Application context
+	 * @return Cache {@link File directory}.<br />
+	 * <b>NOTE:</b> Can be null in some unpredictable cases (if SD card is unmounted and
+	 * {@link Context#getCacheDir() Context.getCacheDir()} returns null).
+	 */
+	public static File getCacheDirectory(Context context) {
+		return getCacheDirectory(context, true);
+	}
+
+	/**
+	 * Returns application cache directory. Cache directory will be created on SD card
+	 * <i>("/Android/data/[app_package_name]/cache")</i> (if card is mounted and app has appropriate permission) or
+	 * on device's file system depending incoming parameters.
+	 *
+	 * @param context        Application context
+	 * @param preferExternal Whether prefer external location for cache
+	 * @return Cache {@link File directory}.<br />
+	 * <b>NOTE:</b> Can be null in some unpredictable cases (if SD card is unmounted and
+	 * {@link Context#getCacheDir() Context.getCacheDir()} returns null).
+	 */
+	public static File getCacheDirectory(Context context, boolean preferExternal) {
+		File appCacheDir = null;
+		if (preferExternal && MEDIA_MOUNTED
+				.equals(Environment.getExternalStorageState()) && hasExternalStoragePermission(context) && haveFreeSpace()) {
+			appCacheDir = getExternalCacheDir(context);
+		}
+		if (appCacheDir == null) {
+			appCacheDir = context.getCacheDir();
+		}
+		if (appCacheDir == null) {
+			String cacheDirPath = "/data/data/" + context.getPackageName() + "/cache/";
+			appCacheDir = new File(cacheDirPath);
+		}
+		return appCacheDir;
+	}
+
+	/**
+	 * Returns individual application cache directory (for only image caching from ImageLoader). Cache directory will be
+	 * created on SD card <i>("/Android/data/[app_package_name]/cache/uil-images")</i> if card is mounted and app has
+	 * appropriate permission. Else - Android defines cache directory on device's file system.
+	 *
+	 * @param context Application context
+	 * @return Cache {@link File directory}
+	 */
+	public static File getIndividualCacheDirectory(Context context) {
+		File cacheDir = getCacheDirectory(context);
+		File individualCacheDir = new File(cacheDir, INDIVIDUAL_DIR_NAME);
+		if (!individualCacheDir.exists()) {
+			if (!individualCacheDir.mkdir()) {
+				individualCacheDir = cacheDir;
+			}
+		}
+		return individualCacheDir;
+	}
+
+	/**
+	 * Returns specified application cache directory. Cache directory will be created on SD card by defined path if card
+	 * is mounted and app has appropriate permission. Else - Android defines cache directory on device's file system.
+	 *
+	 * @param context  Application context
+	 * @param cacheDir Cache directory path (e.g.: "AppCacheDir", "AppDir/cache/images")
+	 * @return Cache {@link File directory}
+	 */
+	public static File getOwnCacheDirectory(Context context, String cacheDir) {
+		File appCacheDir = null;
+		if (MEDIA_MOUNTED.equals(Environment.getExternalStorageState()) && hasExternalStoragePermission(context)) {
+			appCacheDir = new File(Environment.getExternalStorageDirectory(), cacheDir);
+		}
+		if (appCacheDir == null || (!appCacheDir.exists() && !appCacheDir.mkdirs())) {
+			appCacheDir = context.getCacheDir();
+		}
+		return appCacheDir;
+	}
+
+	private static File getExternalCacheDir(Context context) {
+		File dataDir = new File(new File(Environment.getExternalStorageDirectory(), "Android"), "data");
+		File appCacheDir = new File(new File(dataDir, context.getPackageName()), "cache");
+		if (!appCacheDir.exists()) {
+			if (!appCacheDir.mkdirs()) {
+				return null;
+			}
+			try {
+				new File(appCacheDir, ".nomedia").createNewFile();
+			} catch (IOException e) {
+			}
+		}
+		return appCacheDir;
+	}
+
+	private static boolean hasExternalStoragePermission(Context context) {
+		int perm = context.checkCallingOrSelfPermission(EXTERNAL_STORAGE_PERMISSION);
+		return perm == PackageManager.PERMISSION_GRANTED;
+	}
+
+	private static boolean haveFreeSpace() {
+        if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
+            StatFs st = new StatFs(Environment.getExternalStorageDirectory().getPath());
+            int blockSize = st.getBlockSize();
+            long available = st.getAvailableBlocks();
+            long availableSize = (blockSize * available);
+            if (availableSize < 1024 * 1024 * 10) {// //sd卡空间如果小于10M，就认为sd卡空间不足
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/app/version_code.properties b/app/version_code.properties
index fb82437..88ce61f 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Oct 21 19:34:49 CST 2020
-VERSION_CODE=161
+#Thu Oct 22 12:00:35 CST 2020
+VERSION_CODE=163