version:6.5

fix:
update:优化显示，默认显示第三方安装应用

app/build.gradle

@@ -16,8 +16,8 @@ android {
         applicationId "com.uiui.aios"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 55
+        versionCode 56
-        versionName "6.4"
+        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优化

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();

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)) {

app/src/main/res/drawable/shape_thumb_icon.xml

@@ -9,5 +9,5 @@
         android:width="@dimen/dp_2"
         android:color="#e1e8f0" />
 
-    <solid android:color="#535353" />
+    <solid android:color="#0480ff" />
 </shape>

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 @@
 
                     <TextView
                         android:id="@+id/tv_wifi_ssid"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_marginEnd="@dimen/dp_4"
+                        android:ellipsize="marquee"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
                         android:text="ssid"
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="@+id/tv_wifi"
                         app:layout_constraintTop_toBottomOf="@+id/tv_wifi"
                         app:layout_constraintVertical_bias="0.2" />
@@ -320,12 +325,14 @@
 
                     <TextView
                         android:id="@+id/tv_bt_ssid"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_marginEnd="@dimen/dp_4"
                         android:text="ssid"
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="@+id/tv_bt"
                         app:layout_constraintTop_toBottomOf="@+id/tv_bt"
                         app:layout_constraintVertical_bias="0.2" />

app/src/main/res/layout-land/fragment_custom.xml

@@ -182,8 +182,8 @@
 
                 <com.king.view.circleprogressview.CircleProgressView
                     android:id="@+id/cpv"
-                    android:layout_width="@dimen/dp_128"
+                    android:layout_width="@dimen/dp_96"
-                    android:layout_height="@dimen/dp_128"
+                    android:layout_height="@dimen/dp_96"
                     app:cpvDuration="1000"
                     app:cpvLabelTextColor="@color/white"
                     app:cpvLabelTextSize="26sp"

app/src/main/res/layout-port/fragment_control.xml

@@ -92,7 +92,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_17"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -104,12 +104,19 @@
 
                 <TextView
                     android:id="@+id/tv_wifi_ssid"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/dp_6"
+                    android:layout_marginEnd="@dimen/dp_4"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:marqueeRepeatLimit="marquee_forever"
+                    android:singleLine="true"
                     android:text="ssid"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_12"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="@+id/tv_wifi"
                     app:layout_constraintTop_toBottomOf="@+id/tv_wifi" />
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -158,12 +165,14 @@
 
                 <TextView
                     android:id="@+id/tv_bt_ssid"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/dp_6"
+                    android:layout_marginEnd="@dimen/dp_4"
                     android:text="ssid"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_12"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="@+id/tv_bt"
                     app:layout_constraintTop_toBottomOf="@+id/tv_bt" />
             </androidx.constraintlayout.widget.ConstraintLayout>

niceimageview/build.gradle

@@ -11,19 +11,12 @@ android {
     }
 
     buildTypes {
-        zhanRuiRelease{
+        MTKAndroid12Release {}
-
+        MTKAndroid12Debug {}
-        }
+        zhanRuiRelease {}
-        zhanRuiDebug{
+        zhanRuiDebug {}
-
+        debug {}
-        }
+        release {}
-        debug{
-
-        }
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
     }
 
 }