Merge branch 'FCL-Team:main' into main

Redstone2337 · Jul 22, 2024 · c1f8246 · c1f8246
2 parents 6cd7e6c + d0fd983
commit c1f8246
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/FCL/build.gradle b/FCL/build.gradle
@@ -43,8 +43,8 @@ android {
         applicationId "com.tungsten.fcl"
         minSdk 26
         targetSdk 34
-        versionCode 1172
-        versionName "1.1.7.2"
+        versionCode 1173
+        versionName "1.1.7.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/FCLLibrary/src/main/java/com/tungsten/fcllibrary/browser/FileBrowserActivity.java b/FCLLibrary/src/main/java/com/tungsten/fcllibrary/browser/FileBrowserActivity.java
@@ -170,7 +170,7 @@ public void onClick(View view) {
         }
         if (view == openExternal) {
             if (currentPath.toFile().getAbsolutePath().equals(Environment.getExternalStorageDirectory().getAbsolutePath())) {
-                return;
+                currentPath = currentPath.resolve("FCL");
             }
             Uri uri = FileProvider.getUriForFile(this, getString(R.string.file_browser_provider), currentPath.toFile());
             Intent intent = new Intent(Intent.ACTION_SEND);

diff --git a/FCLLibrary/src/main/java/com/tungsten/fcllibrary/util/LocaleUtils.java b/FCLLibrary/src/main/java/com/tungsten/fcllibrary/util/LocaleUtils.java
@@ -85,7 +85,11 @@ public static String formatDateTime(Context context, Instant instant) {
     public static DateTimeFormatter getDateTimeFormatter(Context context) {
         if (dateTimeFormatter == null) {
             @SuppressLint("DiscouragedApi") int resId = context.getResources().getIdentifier("world_time", "string", context.getPackageName());
-            dateTimeFormatter = DateTimeFormatter.ofPattern(context.getString(resId)).withZone(ZoneId.systemDefault());
+            String time = "EEE, MMM d, yyyy HH:mm:ss";
+            if (resId != 0) {
+                time = context.getString(resId);
+            }
+            dateTimeFormatter = DateTimeFormatter.ofPattern(time).withZone(ZoneId.systemDefault());
         }
         return dateTimeFormatter;
     }

diff --git a/version_map.json b/version_map.json
@@ -1,20 +1,20 @@
 [
   {
     "type": "release",
-    "versionCode": 1172,
-    "versionName": "1.1.7.2",
-    "date": "2024.07.05",
+    "versionCode": 1173,
+    "versionName": "1.1.7.3",
+    "date": "2024.07.22",
     "description": [
       {
         "lang": "en",
         "text": "Fix some fatal error.\nAdd some features. \nSee github for details."
       },
       {
         "lang": "zh_CN",
-        "text": "FCL 1.1.7.2更新内容（若启动器内下载缓慢请使用网盘下载,64位的请下载arm64，不知道该下哪个的请下载all）\n1.修复按键文件损坏导致启动器无限闪退的bug\n2.修复读取“guiScale”错误可能导致闪退的bug\n3.允许zink使用系统Vulkan驱动\n4.修复删除版本可能导致启动器卡住闪退的bug\n5.增加libsqlite以支持部分模组（Distant Horizons)"
+        "text": "FCL 1.1.7.3更新内容（若启动器内下载缓慢请使用网盘下载,64位的请下载arm64，不知道该下哪个的请下载all）\n1.增加功能'允许调用FCL安装.apk/.apk.1'\n2.修复一个由于部分系统时间格式获取错误导致下载闪退的bug\n3.新增功能'禁止在崩溃界面截图'\n4.允许直接浏览FCL日志目录（FCL/log）\n5.修改公告内链接颜色\n6.优化部分删除功能，防止启动器卡住导致的崩溃\n7.自动居中鼠标\n8.修复皮肤手臂与腿底部贴图错误的bug"
       }
     ],
-    "netdiskUrl": "https://pan.quark.cn/s/f9d78e3b91fa",
-    "url": "https://github.com/FCL-Team/FoldCraftLauncher/releases/download/1.1.7.2/FCL-release-1.1.7.2-all.apk"
+    "netdiskUrl": "https://pan.quark.cn/s/8749d4b10260",
+    "url": "https://github.com/FCL-Team/FoldCraftLauncher/releases/download/1.1.7.3/FCL-release-1.1.7.3-all.apk"
   }
 ]