From e0b32ed063b52c10c5fcff4c23791b778c19ba42 Mon Sep 17 00:00:00 2001 From: fanhuitong <981964879@qq.com> Date: Tue, 6 Dec 2022 10:51:48 +0800 Subject: [PATCH] =?UTF-8?q?version:6.5=20fix:=20update:=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=AE=89=E8=A3=85=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 31 ++++++++++++++---- app/keystore/mtkAndroid12.keystore | Bin 0 -> 2701 bytes app/{src/doc => keystore}/xueshibaoos.jks | Bin app/{src/doc => keystore}/zhanxun.keystore | Bin .../uiui/aios/fragment/ControlFragment.java | 2 ++ .../java/com/uiui/aios/utils/ApkUtils.java | 2 +- .../main/res/drawable/shape_thumb_icon.xml | 2 +- .../main/res/layout-land/fragment_control.xml | 13 ++++++-- .../main/res/layout-land/fragment_custom.xml | 4 +-- .../main/res/layout-port/fragment_control.xml | 15 +++++++-- niceimageview/build.gradle | 19 ++++------- 11 files changed, 58 insertions(+), 30 deletions(-) create mode 100644 app/keystore/mtkAndroid12.keystore rename app/{src/doc => keystore}/xueshibaoos.jks (100%) rename app/{src/doc => keystore}/zhanxun.keystore (100%) 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 0000000000000000000000000000000000000000..860f30f3fb87fbfeac382d4ac144be5ba998cd0c GIT binary patch literal 2701 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 literal 0 HcmV?d00001 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 {} } }