songw пре 7 месеци
родитељ
комит
5b7ac320e8

+ 4 - 3
app/build.gradle

@@ -136,9 +136,10 @@ dependencies {
     //权限工具
     implementation 'com.permissionx.guolindev:permissionx:1.3.0'
 
-    implementation  'com.umeng.umsdk:common:9.4.0'// 必选
-    implementation  'com.umeng.umsdk:asms:1.2.3'// 必选
-    implementation 'com.umeng.umsdk:apm:1.4.0' // 错误分析升级为独立SDK,看crash数据请一定集成,可选
+    // 友盟基础组件库(所有友盟业务SDK都依赖基础组件库)
+    implementation 'com.umeng.umsdk:common:9.4.4' //(必选)
+    implementation 'com.umeng.umsdk:asms:1.4.1' // asms包依赖(必选)
+    implementation 'com.umeng.umsdk:apm:1.5.2' // U-APM包依赖(必选) 错误分析升级为独立SDK,看crash数据请一定集成
 
     implementation 'org.greenrobot:eventbus:3.1.1'  //eventBus
     implementation 'org.apache.commons:commons-text:1.9'

+ 13 - 1
app/proguard-rules.pro

@@ -18,4 +18,16 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+#友盟混淆
+-keep class com.umeng.** {*;}
+-keep class org.repackage.** {*;}
+-keep class com.uyumao.** { *; }
+-keepclassmembers class * {
+   public <init> (org.json.JSONObject);
+}
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}

+ 4 - 1
app/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.CAMERA" />
 
@@ -19,6 +19,9 @@
 
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT " />
 
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+
 
     <application
         android:name="uas.erp.punaier_wms.application.PdaApplication"

+ 2 - 3
app/src/main/java/uas/erp/punaier_wms/application/PdaApplication.java

@@ -117,7 +117,6 @@ public class PdaApplication extends Application {
         @Override
         public void onFinish() {
             // 倒计时完成时的操作
-
             // 更新UI
             Activity activity=new Activity();
             String maName = SharedPreUtil.getString(activity, Constants.FLAG.ACCOUNT_NAME_CACHE, null);
@@ -140,12 +139,12 @@ public class PdaApplication extends Application {
 
     private void initUmeng() {
         //2.在Application.oncreate()中调用预初始化函数
-        UMConfigure.preInit(this, "6170b8b61c91e0671bb0da5a","umeng");
+        UMConfigure.preInit(this, "6809a85c79267e021045ae2a","umeng");
         UMConfigure.setLogEnabled(true);
         //3.客户端用户同意隐私政策后,正式初始化友盟+SDK
         UMConfigure.init(
                 this,
-                "6170b8b61c91e0671bb0da5a",
+                "6809a85c79267e021045ae2a",
                 "umeng",
                 UMConfigure.DEVICE_TYPE_PHONE, ""
         );