diff --git a/app/build.gradle b/app/build.gradle index 94737bf..5ec21b1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.uiui.aios" minSdkVersion 24 targetSdkVersion 29 - versionCode 55 - versionName "6.4" + versionCode 56 + versionName "6.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -54,7 +54,7 @@ android { signingConfigs { zhanRui { - storeFile file("src/doc/zhanxun.keystore") + storeFile file("keystore/zhanxun.keystore") storePassword "123456" keyAlias "zhanxun" keyPassword "123456" @@ -63,24 +63,42 @@ android { } mtk { - storeFile file("src/doc/xueshibaoos.jks") + storeFile file("keystore/xueshibaoos.jks") storePassword "123456" keyAlias "xueshibaoos" keyPassword "123456" v2SigningEnabled false } + + mtk12 { + storeFile file("keystore/mtkAndroid12.keystore") + storePassword "123456" + keyAlias "mtk12" + keyPassword "123456" + v2SigningEnabled false + } } buildTypes { + MTKAndroid12Release.initWith(release) + MTKAndroid12Release { + signingConfig signingConfigs.mtk12 + } + + MTKAndroid12Debug.initWith(debug) + MTKAndroid12Debug { + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.mtk12 + } + zhanRuiRelease.initWith(release) zhanRuiRelease { - buildConfigField "boolean", "LOG_DEBUG", "false" signingConfig signingConfigs.zhanRui } zhanRuiDebug.initWith(debug) zhanRuiDebug { - buildConfigField "boolean", "LOG_DEBUG", "true" versionNameSuffix "-debug" debuggable true signingConfig signingConfigs.zhanRui @@ -88,7 +106,6 @@ android { debug { // 显示Log - buildConfigField "boolean", "LOG_DEBUG", "true" versionNameSuffix "-debug" minifyEnabled false //Zipalign优化 diff --git a/app/keystore/mtkAndroid12.keystore b/app/keystore/mtkAndroid12.keystore new file mode 100644 index 0000000..860f30f Binary files /dev/null and b/app/keystore/mtkAndroid12.keystore differ diff --git a/app/src/doc/xueshibaoos.jks b/app/keystore/xueshibaoos.jks similarity index 100% rename from app/src/doc/xueshibaoos.jks rename to app/keystore/xueshibaoos.jks diff --git a/app/src/doc/zhanxun.keystore b/app/keystore/zhanxun.keystore similarity index 100% rename from app/src/doc/zhanxun.keystore rename to app/keystore/zhanxun.keystore diff --git a/app/src/main/java/com/uiui/aios/fragment/ControlFragment.java b/app/src/main/java/com/uiui/aios/fragment/ControlFragment.java index ceafd9b..647ed12 100644 --- a/app/src/main/java/com/uiui/aios/fragment/ControlFragment.java +++ b/app/src/main/java/com/uiui/aios/fragment/ControlFragment.java @@ -168,6 +168,8 @@ public class ControlFragment extends Fragment { } private void initView() { + tv_wifi_ssid.requestFocus(); + getWifi(); registerReceivers(); getBluetooth(); diff --git a/app/src/main/java/com/uiui/aios/utils/ApkUtils.java b/app/src/main/java/com/uiui/aios/utils/ApkUtils.java index f4b0cee..265ebfd 100644 --- a/app/src/main/java/com/uiui/aios/utils/ApkUtils.java +++ b/app/src/main/java/com/uiui/aios/utils/ApkUtils.java @@ -170,7 +170,7 @@ public class ApkUtils { packageList = new ArrayList<>(Arrays.asList(appListString.split(","))); } - int setting_other_appInstaller = Settings.Global.getInt(context.getContentResolver(), "setting_other_appInstaller", 0); + int setting_other_appInstaller = Settings.Global.getInt(context.getContentResolver(), "setting_other_appInstaller", 1); for (ApplicationInfo app : appInfos) { if (appIsDisable(context, app.packageName)) { diff --git a/app/src/main/res/drawable/shape_thumb_icon.xml b/app/src/main/res/drawable/shape_thumb_icon.xml index 1620744..4798c6b 100644 --- a/app/src/main/res/drawable/shape_thumb_icon.xml +++ b/app/src/main/res/drawable/shape_thumb_icon.xml @@ -9,5 +9,5 @@ android:width="@dimen/dp_2" android:color="#e1e8f0" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_control.xml b/app/src/main/res/layout-land/fragment_control.xml index ad5faa3..cf5e2c4 100644 --- a/app/src/main/res/layout-land/fragment_control.xml +++ b/app/src/main/res/layout-land/fragment_control.xml @@ -98,7 +98,7 @@ android:id="@+id/tv_wifi" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="WIFI" + android:text="网络" android:textColor="@color/white" android:textSize="@dimen/sp_15" app:layout_constraintBottom_toBottomOf="parent" @@ -110,12 +110,17 @@ @@ -320,12 +325,14 @@ diff --git a/app/src/main/res/layout-land/fragment_custom.xml b/app/src/main/res/layout-land/fragment_custom.xml index 72c14f8..978951d 100644 --- a/app/src/main/res/layout-land/fragment_custom.xml +++ b/app/src/main/res/layout-land/fragment_custom.xml @@ -182,8 +182,8 @@ @@ -158,12 +165,14 @@ diff --git a/niceimageview/build.gradle b/niceimageview/build.gradle index fc0ddf3..22734c5 100644 --- a/niceimageview/build.gradle +++ b/niceimageview/build.gradle @@ -11,19 +11,12 @@ android { } buildTypes { - zhanRuiRelease{ - - } - zhanRuiDebug{ - - } - debug{ - - } - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } + MTKAndroid12Release {} + MTKAndroid12Debug {} + zhanRuiRelease {} + zhanRuiDebug {} + debug {} + release {} } }