bug修复，截图优化

.github/workflows/android-test.yml

@@ -22,16 +22,14 @@ jobs:
           java-version: 17
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
-      - name: set up kotlin
-        uses: fwilhe2/setup-kotlin@main
-        with:
-          version: 1.6.20
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
       - name: Build with Gradle
         run: |
           chmod 777 ./gradlew 
           ./gradlew :inrt:assemble 
           ./gradlew :app:assembleRelease
       - uses: actions/upload-artifact@v3
         with:
-          name: apks
+          name: apks(no signing)
           path: app/build/outputs/apk/v6/release/*

.github/workflows/android.yml

@@ -21,6 +21,8 @@ jobs:
         with:
           distribution: temurin
           java-version: 17
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 
@@ -41,8 +43,8 @@ jobs:
           alias: ${{ secrets.AALIAS }}
           keyStorePassword: ${{ secrets.AKEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.AKEY_PASSWORD }}
-        env:
-          BUILD_TOOLS_VERSION: "33.0.0"
+        env: 
+          BUILD_TOOLS_VERSION: "34.0.0"
       - name: rename apk
         run: |
           cd build/app/signed

app/src/main/AndroidManifest.xml

@@ -2,6 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -440,7 +447,7 @@
             android:theme="@style/EditorTheme" />
         <activity android:name="org.autojs.autojs.ui.settings.AboutActivity_" />
         <activity
-            android:name="org.autojs.autojs.ui.settings.SettingsActivity_"
+            android:name="org.autojs.autojs.ui.settings.SettingsActivity"
             android:theme="@style/AppTheme.Settings" />
         <activity android:name="org.autojs.autojs.ui.error.ErrorReportActivity" />
         <activity

app/src/main/java/org/autojs/autojs/autojs/AutoJs.java

@@ -32,7 +32,7 @@
 import org.autojs.autojs.ui.floating.layoutinspector.LayoutBoundsFloatyWindow;
 import org.autojs.autojs.ui.floating.layoutinspector.LayoutHierarchyFloatyWindow;
 import org.autojs.autojs.ui.log.LogActivityKt;
-import org.autojs.autojs.ui.settings.SettingsActivity_;
+import org.autojs.autojs.ui.settings.SettingsActivity;
 
 
 /**
@@ -181,7 +181,7 @@ protected AccessibilityConfig createAccessibilityConfig() {
     @Override
     protected ScriptRuntime createRuntime() {
         ScriptRuntime runtime = super.createRuntime();
-        runtime.putProperty("class.settings", SettingsActivity_.class);
+        runtime.putProperty("class.settings", SettingsActivity.class);
         runtime.putProperty("class.console", LogActivityKt.class);
         runtime.putProperty("broadcast.inspect_layout_bounds", LayoutBoundsFloatyWindow.class.getName());
         runtime.putProperty("broadcast.inspect_layout_hierarchy", LayoutHierarchyFloatyWindow.class.getName());

app/src/main/java/org/autojs/autojs/theme/ThemeColorManagerCompat.java

@@ -2,9 +2,9 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
 import androidx.core.content.ContextCompat;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.preference.PreferenceManager;
 
 import com.stardust.app.GlobalAppContext;
 

app/src/main/java/org/autojs/autojs/ui/main/components/main_ui.kt

@@ -24,8 +24,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.stardust.util.IntentUtil
 import org.autojs.autojs.ui.log.LogActivityKt
-import org.autojs.autojs.ui.main.web.DocumentSource
 import org.autojs.autojs.ui.main.web.DocumentSourceSelectDialog
+import org.autojs.autojs.ui.main.web.EditorAppManager.Companion.loadHomeDocument
 import org.autojs.autoxjs.R
 
 //主界面日志按钮
@@ -57,7 +57,7 @@ fun DocumentPageMenuButton(getWebView: () -> WebView) {
             onDismissRequest = { expanded = false }) {
             DropdownMenuItem(onClick = {
                 dismissMenu()
-                getWebView().loadUrl(DocumentSource.DOC_V1.uri)
+                loadHomeDocument(getWebView())
             }) {
                 Icon(Icons.Default.Home, contentDescription = null)
                 Text(text = "回到主页")

app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerPage.kt

@@ -59,7 +59,7 @@ import org.autojs.autojs.ui.compose.widget.MyAlertDialog1
 import org.autojs.autojs.ui.compose.widget.MyIcon
 import org.autojs.autojs.ui.compose.widget.MySwitch
 import org.autojs.autojs.ui.floating.FloatyWindowManger
-import org.autojs.autojs.ui.settings.SettingsActivity_
+import org.autojs.autojs.ui.settings.SettingsActivity
 import org.autojs.autoxjs.R
 import org.joda.time.DateTimeZone
 import org.joda.time.Instant
@@ -272,7 +272,7 @@ private fun BottomButtons() {
                 context.startActivity(
                     Intent(
                         context,
-                        SettingsActivity_::class.java
+                        SettingsActivity::class.java
                     )
                 )
             },

app/src/main/java/org/autojs/autojs/ui/main/web/EditorAppManager.kt

@@ -23,16 +23,8 @@ class EditorAppManager : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        val saveStatus = getSaveStatus(requireContext())
-        val name = saveStatus.getString(DocumentSourceKEY, DocumentSource.DOC_V1_LOCAL.name)
         return swipeRefreshWebView.apply {
-            switchDocument(
-                webView, try {
-                    DocumentSource.valueOf(name!!)
-                } catch (e: Exception) {
-                    DocumentSource.DOC_V1_LOCAL
-                }
-            )
+            loadHomeDocument(this.webView)
             fillMaxSize()
         }
     }
@@ -51,6 +43,18 @@ class EditorAppManager : Fragment() {
             return saveStatus!!
         }
 
+        fun loadHomeDocument(webView: WebView) {
+            val saveStatus = getSaveStatus(webView.context)
+            val name = saveStatus.getString(DocumentSourceKEY, DocumentSource.DOC_V1_LOCAL.name)
+            switchDocument(
+                webView, try {
+                    DocumentSource.valueOf(name!!)
+                } catch (e: Exception) {
+                    DocumentSource.DOC_V1_LOCAL
+                }
+            )
+        }
+
         fun switchDocument(webView: WebView, documentSource: DocumentSource) {
             if (documentSource.isLocal) {
                 webView.webViewClient = WebViewClient(webView.context, documentSource.uri)