diff --git a/app/build.gradle b/app/build.gradle
index 5ba916de..e9e123ef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,28 +44,30 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+
     //okhttp
     implementation 'com.squareup.okhttp3:okhttp:3.6.0'
     implementation 'com.squareup.okio:okio:1.11.0'
-    //mail
-    implementation 'com.sun.mail:android-mail:1.6.0'
-    implementation 'com.sun.mail:android-activation:1.6.0'
-    implementation 'com.android.support:design:28.0.0'
-    //android8.0以上需要使用到反射获取隐藏的系统api和动态代理隐藏的抽象类回调
-    //。其中动态代理抽象类回调需要使用ProxyBuilder类，故依赖一个库
-//    implementation 'com.linkedin.dexmaker:dexmaker-mockito:2.12.1'
-    //appupdate
-    implementation 'com.qianwen:update-app:3.5.2'
-    implementation 'com.qianwen:okhttp-utils:3.8.0'
-    implementation 'com.lzy.net:okgo:3.0.4'
-    // 友盟基础组件库（所有友盟业务SDK都依赖基础组件库）
-    implementation "com.umeng.umsdk:common:2.1.0"
-
-    // 下面各SDK根据宿主App是否使用相关业务按需引入。
-    // 友盟统计SDK
-    implementation "com.umeng.umsdk:analytics:8.1.3"
 
     //fastjson
     implementation "com.alibaba:fastjson:1.2.75"
 
+    //mail
+    implementation 'com.sun.mail:android-mail:1.6.0'
+    implementation 'com.sun.mail:android-activation:1.6.0'
+    implementation 'com.android.support:design:28.0.0'
+
+    //android8.0以上需要使用到反射获取隐藏的系统api和动态代理隐藏的抽象类回调
+    //其中动态代理抽象类回调需要使用ProxyBuilder类，故依赖一个库
+    //implementation 'com.linkedin.dexmaker:dexmaker-mockito:2.12.1'
+
+    //appupdate
+    implementation 'com.qianwen:update-app:3.5.2'
+    implementation 'com.qianwen:okhttp-utils:3.8.0'
+    implementation 'com.lzy.net:okgo:3.0.4'
+
+    //友盟基础组件库（所有友盟业务SDK都依赖基础组件库）
+    implementation "com.umeng.umsdk:common:9.3.6"
+    implementation "com.umeng.umsdk:asms:1.2.0"
+
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b0278b95..0923c0df 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
             android:value="SVSfseesfsf" />
         <meta-data
             android:name="UMENG_APPKEY"
-            android:value="5f217c02b4b08b653e8f6b3d" />
+            android:value="60254fc7425ec25f10f4293e" />
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="Umeng" />
diff --git a/app/src/main/java/com/idormy/sms/forwarder/MyApplication.java b/app/src/main/java/com/idormy/sms/forwarder/MyApplication.java
index e476b40d..adb982e6 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/MyApplication.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/MyApplication.java
@@ -64,7 +64,7 @@ public class MyApplication extends Application {
         super.onCreate();
         //初始化组件化基础库, 所有友盟业务SDK都必须调用此初始化接口。
         //建议在宿主App的Application.onCreate函数中调用基础组件库初始化函数。
-        UMConfigure.init(this, "5f217c02b4b08b653e8f6b3d", getChannelName(this), UMConfigure.DEVICE_TYPE_PHONE, "");
+        UMConfigure.init(this, "60254fc7425ec25f10f4293e", getChannelName(this), UMConfigure.DEVICE_TYPE_PHONE, "");
         // 选用LEGACY_AUTO页面采集模式
         MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.LEGACY_MANUAL);
         //pro close log
diff --git a/app/src/main/res/layout/activity_alter_dialog_setview_dingding.xml b/app/src/main/res/layout/activity_alter_dialog_setview_dingding.xml
index 98952afe..d3ad4e47 100644
--- a/app/src/main/res/layout/activity_alter_dialog_setview_dingding.xml
+++ b/app/src/main/res/layout/activity_alter_dialog_setview_dingding.xml
@@ -106,8 +106,8 @@
             android:id="@+id/switchDingdingAtAll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:ems="14"
-            android:checked="false" />
+            android:checked="false"
+            android:ems="14" />
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/rule_item.xml b/app/src/main/res/layout/rule_item.xml
index d69664a6..7f82bfb4 100644
--- a/app/src/main/res/layout/rule_item.xml
+++ b/app/src/main/res/layout/rule_item.xml
@@ -7,8 +7,8 @@
         android:id="@+id/rule_sender_image"
         android:layout_width="32dp"
         android:layout_height="32dp"
-        android:layout_margin="5dp"
-        android:layout_alignParentEnd="true" />
+        android:layout_alignParentEnd="true"
+        android:layout_margin="5dp" />
 
     <TextView
         android:id="@+id/rule_match"