From d1f700269a0a8088799a571ae04775ac9adc4759 Mon Sep 17 00:00:00 2001 From: SuperMonster003 Date: Tue, 29 Apr 2025 19:04:12 +0800 Subject: [PATCH] =?UTF-8?q?6.6.3=20-=20Alpha=20-=20=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=B8=8E=E5=BC=80=E5=8F=91=E8=80=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=B0=B4=E5=B9=B3=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changelog/lang_zh-Hans.json | 1 + app/src/main/java/org/autojs/autojs/App.kt | 2 +- .../autojs/autojs/network/UpdateChecker.java | 41 ++- .../autojs/ui/settings/AboutActivity.kt | 15 +- .../main/res/drawable/ic_about_license.png | Bin 5146 -> 5780 bytes .../drawable/ic_about_version_histories.png | Bin 0 -> 7190 bytes .../main/res/layout-land/activity_about.xml | 321 ++++++++++++++++++ app/src/main/res/layout/activity_about.xml | 321 +++++++++++++----- .../activity_about_function_buttons.xml | 199 ++++++----- .../main/res/layout/activity_about_items.xml | 174 ---------- app/src/main/res/values-ar/strings.xml | 2 + app/src/main/res/values-en/strings.xml | 2 + app/src/main/res/values-es/strings.xml | 2 + app/src/main/res/values-fr/strings.xml | 2 + app/src/main/res/values-ja/strings.xml | 2 + app/src/main/res/values-ko/strings.xml | 2 + app/src/main/res/values-ru/strings.xml | 2 + app/src/main/res/values-zh-rHK/strings.xml | 2 + app/src/main/res/values-zh-rTW/strings.xml | 2 + app/src/main/res/values-zh/strings.xml | 2 + app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/strings.xml | 5 +- 22 files changed, 745 insertions(+), 355 deletions(-) create mode 100644 app/src/main/res/drawable/ic_about_version_histories.png create mode 100644 app/src/main/res/layout-land/activity_about.xml delete mode 100644 app/src/main/res/layout/activity_about_items.xml diff --git a/.changelog/lang_zh-Hans.json b/.changelog/lang_zh-Hans.json index fa0107c4..789e780d 100644 --- a/.changelog/lang_zh-Hans.json +++ b/.changelog/lang_zh-Hans.json @@ -17,6 +17,7 @@ "README.md 中部分语言日期格式不正确的问题" ], "improvement": [ + "关于应用与开发者页面增加水平布局适配", "打包单文件时自动读取并勾选已安装应用的声明权限 _[`issue #362`](http://issues.autojs6.com/362)_", "版本更新信息支持多语言显示 (与当前显示语言同步)", "使用异步加载方式一定程度提升文件管理器列表滑动流畅性" diff --git a/app/src/main/java/org/autojs/autojs/App.kt b/app/src/main/java/org/autojs/autojs/App.kt index 68830ff4..e91eacf9 100644 --- a/app/src/main/java/org/autojs/autojs/App.kt +++ b/app/src/main/java/org/autojs/autojs/App.kt @@ -64,7 +64,7 @@ class App : MultiDexApplication() { setUpLeakCanary() AutoJs.initInstance(this) - GlobalKeyObserver.initIfNeeded() + GlobalKeyObserver.initIfNeeded(applicationContext) setupDrawableImageLoader() TimedTaskScheduler.init(this) initDynamicBroadcastReceivers() diff --git a/app/src/main/java/org/autojs/autojs/network/UpdateChecker.java b/app/src/main/java/org/autojs/autojs/network/UpdateChecker.java index 6318b65f..31aab773 100644 --- a/app/src/main/java/org/autojs/autojs/network/UpdateChecker.java +++ b/app/src/main/java/org/autojs/autojs/network/UpdateChecker.java @@ -63,6 +63,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -114,11 +115,15 @@ public class UpdateChecker { mPendingDialog.show(); } + AtomicReference errorBlob = new AtomicReference<>(); + AtomicReference errorRaw = new AtomicReference<>(); + Observable obsBlobSafe = getStreamingApi() .streamingUrl(URL_VERSION_PROPS_BLOB) .subscribeOn(Schedulers.io()) .onErrorResumeNext(e -> { Log.d(TAG, "Error from obsBlobSafe while parsing version.properties"); + errorBlob.set(e.getMessage()); e.printStackTrace(); return Observable.empty(); }); @@ -128,13 +133,14 @@ public class UpdateChecker { .subscribeOn(Schedulers.io()) .onErrorResumeNext(e -> { Log.d(TAG, "Error from obsRawSafe while parsing version.properties"); + errorRaw.set(e.getMessage()); e.printStackTrace(); return Observable.empty(); }); Observable.amb(Arrays.asList(obsBlobSafe, obsRawSafe)) .observeOn(AndroidSchedulers.mainThread()) - .switchIfEmpty(Observable.error(new Exception("To trigger onError"))) + .switchIfEmpty(Observable.error(new ObservableEmptyException())) .subscribe(new SimpleObserver<>() { @Override public void onNext(@NotNull ResponseBody responseBody) { @@ -188,9 +194,32 @@ public class UpdateChecker { } if (mPromptMode == PromptMode.DIALOG) { - new Dialog.Builder.Prompt(mContext, R.string.error_check_for_update, e.getMessage()) - .positiveText(R.string.text_cancel) - .build().show(); + if (!(e instanceof ObservableEmptyException)) { + new Dialog.Builder.Prompt(mContext, R.string.error_check_for_update, e.getMessage()) + .positiveText(R.string.dialog_button_dismiss) + .build().show(); + return; + } + if (errorBlob.get() != null || errorRaw.get() != null) { + StringBuilder message = new StringBuilder(); + if (errorBlob.get() != null) { + message.append("Error message of blob:\n\n").append(errorBlob.get()); + } + if (errorRaw.get() != null) { + if (message.length() > 0) { + message.append("\n\n"); + } + message.append("Error message of raw:\n\n").append(errorRaw.get()); + } + new Dialog.Builder.Prompt(mContext, R.string.error_check_for_update, message.toString()) + .positiveText(R.string.dialog_button_dismiss) + .build().show(); + } else { + new Dialog.Builder.Prompt(mContext, R.string.error_check_for_update, + R.string.error_failed_to_retrieve_version_properties_file_to_parse_version_information) + .positiveText(R.string.dialog_button_dismiss) + .build().show(); + } } } }); @@ -887,4 +916,8 @@ public class UpdateChecker { } + private static class ObservableEmptyException extends RuntimeException { + /* Empty body. */ + } + } \ No newline at end of file diff --git a/app/src/main/java/org/autojs/autojs/ui/settings/AboutActivity.kt b/app/src/main/java/org/autojs/autojs/ui/settings/AboutActivity.kt index a019e805..7e24b9fd 100644 --- a/app/src/main/java/org/autojs/autojs/ui/settings/AboutActivity.kt +++ b/app/src/main/java/org/autojs/autojs/ui/settings/AboutActivity.kt @@ -22,7 +22,6 @@ import org.autojs.autojs6.BuildConfig import org.autojs.autojs6.R import org.autojs.autojs6.databinding.ActivityAboutBinding import org.autojs.autojs6.databinding.ActivityAboutFunctionButtonsBinding -import org.autojs.autojs6.databinding.ActivityAboutItemsBinding /** * Created by Stardust on Feb 2, 2017. @@ -31,7 +30,6 @@ import org.autojs.autojs6.databinding.ActivityAboutItemsBinding open class AboutActivity : BaseActivity() { private lateinit var activityBinding: ActivityAboutBinding - private lateinit var itemsBinding: ActivityAboutItemsBinding private lateinit var functionsButtonsBinding: ActivityAboutFunctionButtonsBinding override fun onCreate(savedInstanceState: Bundle?) { @@ -40,7 +38,6 @@ open class AboutActivity : BaseActivity() { setContentView(it.root) it.version.text = BuildConfig.VERSION_NAME it.since.text = BuildConfig.VERSION_DATE - itemsBinding = it.activityAboutItems functionsButtonsBinding = it.activityAboutFunctionButtons } setToolbarAsBack(R.string.text_about) @@ -48,14 +45,14 @@ open class AboutActivity : BaseActivity() { } private fun setupBindingListeners() { - itemsBinding.avatarOriginalDeveloper.setOnClickListener { toastForUnderDevelopment() } - itemsBinding.avatarDeveloper.setOnClickListener { toastForUnderDevelopment() } + activityBinding.avatarOriginalDeveloper.setOnClickListener { toastForUnderDevelopment() } + activityBinding.avatarDeveloper.setOnClickListener { toastForUnderDevelopment() } - itemsBinding.avatarOriginalDeveloperUserContents.setOnClickListener { toastForUnderDevelopment() } - itemsBinding.avatarDeveloperUserContents.setOnClickListener { toastForUnderDevelopment() } + activityBinding.avatarOriginalDeveloperUserContents.setOnClickListener { toastForUnderDevelopment() } + activityBinding.avatarDeveloperUserContents.setOnClickListener { toastForUnderDevelopment() } - itemsBinding.icon1stDeveloperIdentifier.setOnClickListener { toastForFirstDeveloperIdentifier() } - itemsBinding.icon2ndDeveloperIdentifier.setOnClickListener { toastForSecondDeveloperIdentifier() } + activityBinding.icon1stDeveloperIdentifier.setOnClickListener { toastForFirstDeveloperIdentifier() } + activityBinding.icon2ndDeveloperIdentifier.setOnClickListener { toastForSecondDeveloperIdentifier() } activityBinding.iconAboutAppSvgView.setOnClickListener { showDeviceInfo() } activityBinding.iconAboutAppSvgView.setOnLongClickListener { true.also { launchDeveloperOptions() } } diff --git a/app/src/main/res/drawable/ic_about_license.png b/app/src/main/res/drawable/ic_about_license.png index 38744e4bfd6e056603a625848d199babe5a5c7c3..3b649ab3abf8dde0fe0bedc09abab4bd2dbbe3fe 100644 GIT binary patch literal 5780 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 F{{c2Jqgwy~ literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout-land/activity_about.xml b/app/src/main/res/layout-land/activity_about.xml new file mode 100644 index 00000000..82002763 --- /dev/null +++ b/app/src/main/res/layout-land/activity_about.xml @@ -0,0 +1,321 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index c2dd8853..cdd1bc21 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,53 +1,54 @@ - + + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true" + android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:theme="@style/AppTheme.AppBarOverlay" + android:fitsSystemWindows="true"> + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:background="?attr/colorPrimary" + android:theme="@style/ToolBarStyle" + app:popupTheme="@style/AppTheme.PopupOverlay" + app:title="@string/text_about" /> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_margin="16dp" + android:orientation="vertical"> + android:id="@+id/icon_container" + android:layout_width="match_parent" + android:layout_height="210dp" + android:gravity="center" + android:orientation="vertical" + android:background="@android:color/transparent" + android:foreground="?selectableItemBackgroundBorderless"> + android:layout_width="wrap_content" + android:layout_height="wrap_content"> - + app:animatedSvgTraceTimePerGlyph="500" /> - + + + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="center" + android:textColor="@color/about_app_version_info" + android:textSize="16sp" + android:text="@string/text_sample_string" /> - - + android:id="@+id/since" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="center" + android:textColor="@color/about_app_version_info" + android:textSize="13sp" + android:text="@string/text_sample_string" /> - - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginTop="16dp" + android:orientation="vertical"> + + + + + + + + + android:clickable="true" + android:focusable="true"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:id="@+id/activity_about_function_buttons" + layout="@layout/activity_about_function_buttons" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:layout_marginTop="20dp" + tools:text="@string/text_copyright_sample" + android:textColor="@color/prefTextColorPrimary" + android:textSize="14sp" /> diff --git a/app/src/main/res/layout/activity_about_function_buttons.xml b/app/src/main/res/layout/activity_about_function_buttons.xml index 30148994..75b6a1ff 100644 --- a/app/src/main/res/layout/activity_about_function_buttons.xml +++ b/app/src/main/res/layout/activity_about_function_buttons.xml @@ -1,113 +1,144 @@ - + + + - - + android:gravity="top|center" + android:layout_marginHorizontal="3dp" + android:focusable="true" + android:clickable="true"> + android:layout_width="40dp" + android:layout_height="40dp" + android:layout_gravity="center" + android:layout_marginTop="4dp" + android:src="@drawable/ic_about_license" + android:contentDescription="@string/text_about_functions_licenses" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginVertical="6dp" + android:text="@string/text_about_functions_licenses" + android:maxLines="2" + android:gravity="center" + android:textSize="13sp" + android:textColor="@color/about_app_function_buttons" /> + android:id="@+id/about_functions_button_update" + android:layout_width="80dp" + android:layout_height="match_parent" + android:orientation="vertical" + android:background="?selectableItemBackground" + android:gravity="top|center" + android:layout_marginHorizontal="3dp" + android:focusable="true" + android:clickable="true"> + android:layout_width="40dp" + android:layout_height="40dp" + android:layout_gravity="center" + android:layout_marginTop="4dp" + android:src="@drawable/ic_about_update" + android:contentDescription="@string/text_about_functions_update" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginVertical="6dp" + android:maxLines="2" + android:gravity="center" + android:text="@string/text_about_functions_update" + android:textSize="13sp" + android:textColor="@color/about_app_function_buttons" /> + android:id="@+id/about_functions_button_version_histories" + android:layout_width="80dp" + android:layout_height="match_parent" + android:orientation="vertical" + android:background="?selectableItemBackground" + android:gravity="top|center" + android:layout_marginHorizontal="3dp" + android:focusable="true" + android:clickable="true"> + android:layout_width="40dp" + android:layout_height="40dp" + android:layout_gravity="center" + android:layout_marginTop="4dp" + android:src="@drawable/ic_about_version_histories" + android:contentDescription="@string/text_about_functions_version_histories" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginVertical="6dp" + android:maxLines="2" + android:gravity="center" + android:text="@string/text_about_functions_version_histories" + android:textSize="13sp" + android:textColor="@color/about_app_function_buttons" /> + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_about_items.xml b/app/src/main/res/layout/activity_about_items.xml deleted file mode 100644 index 765cee00..00000000 --- a/app/src/main/res/layout/activity_about_items.xml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index cf07b7b7..b94aa26a 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1003,5 +1003,7 @@ تحسين التبعيات تعديلات على إصدارات بعض التبعيات أو المكتبات المحلية + Version histories + Failed to retrieve version.properties to parse version information diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 88943a03..754b12d4 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -998,5 +998,7 @@ Improvement Dependency Some dependency or local library version adjustments + Version histories + Failed to retrieve version.properties to parse version information diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d7098a43..5f499493 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1001,5 +1001,7 @@ Mejora Dependencia Ajustes en algunas dependencias o versiones de bibliotecas locales + Version histories + Failed to retrieve version.properties to parse version information diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 182813b7..b06a5da5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1001,5 +1001,7 @@ Amélioration Dépendance Certaines dépendances ou versions de bibliothèques locales ont été ajustées + Version histories + Failed to retrieve version.properties to parse version information diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b040b727..68fe9954 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1002,5 +1002,7 @@ 改善 依存関係 一部の依存関係またはローカルライブラリのバージョン調整 + Version histories + Failed to retrieve version.properties to parse version information diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index d2c5e8c9..365babb2 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1003,5 +1003,7 @@ 개선 의존성 일부 의존성 또는 로컬 라이브러리 버전 조정 + Version histories + Failed to retrieve version.properties to parse version information diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e2a9ac3c..c5c08eb9 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1001,5 +1001,7 @@ Улучшение Зависимость Изменения версий некоторых зависимостей или локальных библиотек + Version histories + Failed to retrieve version.properties to parse version information diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 656c254b..6d535baf 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -999,5 +999,7 @@ 優化 依賴 部分依賴或本地庫版本調整 + Version histories + Failed to retrieve version.properties to parse version information diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 29cf6410..29565437 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -999,5 +999,7 @@ 最佳化 依賴 部分依賴或本地庫版本調整 + Version histories + Failed to retrieve version.properties to parse version information diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index fb2ceb03..a8fdb8ec 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -999,5 +999,7 @@ 优化 依赖 部分依赖或本地库版本调整 + 版本历史 + 获取 version.properties 失败, 无法解析版本信息 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index bc84cdc0..8dbee01b 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,6 +1,7 @@ 50dp + 60dp 16dp 6dp 16dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c0a7894d..dbd27b2b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -27,9 +27,6 @@ @string/key_keep_screen_on_when_in_foreground_disabled @string/key_root_record_out_file_type_binary main.js - about_functions_button_feedback - about_functions_button_licenses - about_functions_button_update SuperMonster003 SuperMonster003 ... ... @@ -1229,5 +1226,7 @@ Improvement Dependency Some dependency or local library version adjustments + Version histories + Failed to retrieve version.properties to parse version information