version:2.9

fix:
update:增加台电MTK Android12签名

app/build.gradle

@@ -16,8 +16,8 @@ android {
         applicationId "com.uiuios.aios"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 18
+        versionCode 20
-        versionName "2.7"
+        versionName "2.9"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -74,19 +74,28 @@ android {
             v1SigningEnabled true
             v2SigningEnabled true
         }
+
+        MTK8183 {
+            storeFile file("keystore/TeclastMTK12.jks")
+            storePassword "123456"
+            keyAlias "teclastmtk12"
+            keyPassword "123456"
+            v1SigningEnabled true
+            v2SigningEnabled true
+        }
     }
 
     buildTypes {
-        MTKAndroid12Release.initWith(release)
+        MTK8183Debug.initWith(debug)
-        MTKAndroid12Release {
+        MTK8183Debug {
-            signingConfig signingConfigs.mtk12
-        }
-
-        MTKAndroid12Debug.initWith(debug)
-        MTKAndroid12Debug {
             versionNameSuffix "-debug"
             debuggable true
-            signingConfig signingConfigs.mtk12
+            signingConfig signingConfigs.MTK8183
+        }
+
+        MTK8183Release.initWith(release)
+        MTK8183Release {
+            signingConfig signingConfigs.MTK8183
         }
 
         zhanRuiRelease.initWith(release)

app/src/main/java/com/uiuios/aios/base/BaseApplication.java

@@ -103,6 +103,34 @@ public class BaseApplication extends Application {
             public void onSuccess(String response) {
                 Log.e("AliyunPush", "init cloudchannel success");
                 Log.e("AliyunPush", "init cloudchannel success  " + pushService.getDeviceId());
+                String sn = Utils.getSerial();
+                if (TextUtils.isEmpty(sn)) {
+                    return;
+                }
+                pushService.bindAccount(sn, new CommonCallback() {
+                    @Override
+                    public void onSuccess(String s) {
+                        Log.e("AliyunPush", "bind account " + sn + " success\n");
+                    }
+
+                    @Override
+                    public void onFailed(String errorCode, String errorMsg) {
+                        Log.e("AliyunPush", "bind account " + sn + " failed." +
+                                "errorCode: " + errorCode + ", errorMsg:" + errorMsg);
+                    }
+                });
+                pushService.addAlias(sn, new CommonCallback() {
+                    @Override
+                    public void onSuccess(String s) {
+                        Log.e("AliyunPush", "add alias " + sn + " success\n");
+                    }
+
+                    @Override
+                    public void onFailed(String errorCode, String errorMsg) {
+                        Log.e("AliyunPush", "add alias " + sn + " failed." +
+                                "errorCode: " + errorCode + ", errorMsg:" + errorMsg + "\n");
+                    }
+                });
             }
 
             @Override
@@ -110,34 +138,7 @@ public class BaseApplication extends Application {
                 Log.e("AliyunPush", "init cloudchannel failed -- errorcode:" + errorCode + " -- errorMessage:" + errorMessage);
             }
         });
-        String sn = Utils.getSerial();
-        if (TextUtils.isEmpty(sn)) {
-            return;
-        }
-        pushService.bindAccount(sn, new CommonCallback() {
-            @Override
-            public void onSuccess(String s) {
-                Log.e("AliyunPush", "bind account " + sn + " success\n");
-            }
 
-            @Override
-            public void onFailed(String errorCode, String errorMsg) {
-                Log.e("AliyunPush", "bind account " + sn + " failed." +
-                        "errorCode: " + errorCode + ", errorMsg:" + errorMsg);
-            }
-        });
-        pushService.addAlias(sn, new CommonCallback() {
-            @Override
-            public void onSuccess(String s) {
-                Log.e("AliyunPush", "add alias " + sn + " success\n");
-            }
-
-            @Override
-            public void onFailed(String errorCode, String errorMsg) {
-                Log.e("AliyunPush", "add alias " + sn + " failed." +
-                        "errorCode: " + errorCode + ", errorMsg:" + errorMsg + "\n");
-            }
-        });
     }
 
     private void catchException() {

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

@@ -10,4 +10,10 @@
         android:topRightRadius="10dp"
         android:bottomLeftRadius="10dp"
         android:bottomRightRadius="10dp" />
+
+    <padding
+        android:bottom="4dp"
+        android:left="4dp"
+        android:right="4dp"
+        android:top="4dp" />
 </shape>

niceimageview/build.gradle

@@ -11,8 +11,8 @@ android {
     }
 
     buildTypes {
-        MTKAndroid12Debug{}
+        MTK8183Debug{}
-        MTKAndroid12Release{}
+        MTK8183Release{}
         zhanRuiDebug {}
         zhanRuiRelease {}
         zhanRuiUserdebug{}