集成友盟Log日志分析,修复出库获取空数据时的异常问题

app/build.gradle

@@ -80,9 +80,11 @@ dependencies {
     implementation deps.permisson
     implementation deps.basePopup
     implementation deps.smartTable
-    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'
     implementation 'com.gavin.com.library:stickyDecoration:1.4.11'
     implementation 'com.android.support:design:28.0.0'

app/proguard-rules.pro

@@ -166,4 +166,17 @@
 ################################
 ##实体类
 #-keep class com.uas.uas_mes_stw.bean.** {*;}
-##-keep .** {*;}
+##-keep .** {*;}
+
+
+#友盟混淆
+-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);
+}

app/src/main/AndroidManifest.xml

@@ -19,6 +19,10 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+
 
     <application
         android:name="com.uas.uas_mes_stw.application.PdaApplication"
@@ -40,6 +44,7 @@
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
+                <data android:scheme="um.67add3829a16fe6dcd463bb1" />
             </intent-filter>
         </activity>
 

app/src/main/java/com/uas/uas_mes_stw/application/PdaApplication.java

@@ -11,7 +11,6 @@ import com.android.volley.toolbox.Volley;
 import com.facebook.stetho.Stetho;
 import com.uas.uas_mes_stw.R;
 import com.uas.uas_mes_stw.util.AndroidUtil;
-import com.uas.uas_mes_stw.util.CrashHandler;
 import com.uas.uas_mes_stw.util.FakeX509TrustManager;
 import com.uas.uas_mes_stw.util.SoundUtil;
 import com.umeng.analytics.MobclickAgent;
@@ -53,8 +52,8 @@ public class PdaApplication extends Application {
         mInstance = this;
         mContext = getApplicationContext();
 
-        CrashHandler crashHandler = CrashHandler.getInstance();
-        crashHandler.init(mContext);
+//        CrashHandler crashHandler = CrashHandler.getInstance();
+//        crashHandler.init(mContext);
 
         FakeX509TrustManager.allowAllSSL();//去掉SSL证书验证
         if (mRequestQueue == null)
@@ -91,18 +90,18 @@ public class PdaApplication extends Application {
         mSoundMap.put(SoundUtil.SOUND_TETHYS, mSoundPool.load(this, R.raw.tethys, 1));
         mSoundMap.put(SoundUtil.SOUND_TITAN, mSoundPool.load(this, R.raw.titan, 1));
         //友盟统计SDK
-       // initUmeng();
+        initUmeng();
     }
 
 
     private void initUmeng() {
         //2.在Application.oncreate()中调用预初始化函数
-        UMConfigure.preInit(this, "6170b8b61c91e0671bb0da5a","umeng");
+        UMConfigure.preInit(this, "67add3829a16fe6dcd463bb1","umeng");
         UMConfigure.setLogEnabled(true);
         //3.客户端用户同意隐私政策后，正式初始化友盟+SDK
         UMConfigure.init(
                 this,
-                "6170b8b61c91e0671bb0da5a",
+                "67add3829a16fe6dcd463bb1",
                 "umeng",
                 UMConfigure.DEVICE_TYPE_PHONE, ""
         );

app/src/main/java/com/uas/uas_mes_stw/fragment/IOCOutMakeMaterialOper.java

@@ -749,7 +749,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                 bean.setPD_OUTQTY(jsonObject.getInt("PD_OUTQTY"));
                 bean.setV_RESQTY(jsonObject.getInt("V_RESQTY"));
                 bean.setPR_DETAIL(jsonObject.getString("PR_DETAIL"));
-                bean.setPR_DETAIL(jsonObject.getString("PR_SPEC"));
+                bean.setPR_SPEC(jsonObject.getString("PR_SPEC"));
                 bean.setSelect(false);
                 itemNumberList.add(bean);
             } catch (JSONException e) {
@@ -788,9 +788,38 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         edit_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                try {
+                    if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_SEND || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                        String mSearchStr = edit_et.getText().toString().trim();
+                        if (!TextUtils.isEmpty(mSearchStr) && itemNumberList.size() > 0) {
+                            List<ItemNumberBean> thisList = new ArrayList<>();
+                            for (int i = 0; i < itemNumberList.size(); i++) {
+                                if (itemNumberList.get(i).getPD_PRODCODE().contains(mSearchStr)
+                                        || itemNumberList.get(i).getPR_DETAIL().contains(mSearchStr)
+                                        || itemNumberList.get(i).getPR_SPEC().contains(mSearchStr)
+                                ) {
+                                    thisList.add(itemNumberList.get(i));
+                                }
+                            }
+                            if (thisList.size() > 0) {
+                                materialAdapter.setmList(thisList);
+                            }
+                        } else {
+                            materialAdapter.setmList(itemNumberList);
+                        }
+                        return true;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                return false;
+            }
+        });
+
+        search_im.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                try {
                     String mSearchStr = edit_et.getText().toString().trim();
                     if (!mSearchStr.isEmpty()) {
                         List<ItemNumberBean> thisList = new ArrayList<>();
@@ -804,42 +833,14 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                         }
                         if (thisList.size() > 0) {
                             materialAdapter.setmList(thisList);
-                        }
-                    } else {
-                        materialAdapter.setmList(itemNumberList);
-                    }
-
-                    return true;
-                }
-                return false;
-            }
-        });
-
-        search_im.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                String mSearchStr = edit_et.getText().toString().trim();
-                if (!mSearchStr.isEmpty()) {
-                    List<ItemNumberBean> thisList = new ArrayList<>();
-                    for (int i = 0; i < itemNumberList.size(); i++) {
-                        if ((!TextUtils.isEmpty(itemNumberList.get(i).getPD_PRODCODE()) && itemNumberList.get(i).getPD_PRODCODE().contains(mSearchStr))
-                                || (!TextUtils.isEmpty(itemNumberList.get(i).getPR_DETAIL()) && itemNumberList.get(i).getPR_DETAIL().contains(mSearchStr))
-                                || (!TextUtils.isEmpty(itemNumberList.get(i).getPR_SPEC()) && itemNumberList.get(i).getPR_SPEC().contains(mSearchStr))
-                        ) {
-                            thisList.add(itemNumberList.get(i));
+                        } else {
+                            materialAdapter.setmList(itemNumberList);
                         }
                     }
-                    if (thisList.size() > 0) {
-                        pd_prodcode = "";
-                        //setAdapterData(thisList);
-                        materialAdapter.updateList(thisList);
-                    } else {
-                        setAdapterData(itemNumberList);
-                        //                        materialAdapter.setmList(itemNumberList);
-                    }
+                }catch (Exception e) {
+                    e.printStackTrace();
                 }
             }
-
         });
 
         //确定

build.gradle

@@ -54,8 +54,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 29,
-            versionName      : "v1.2.0"
+            versionCode      : 30,
+            versionName      : "v1.2.2"
     ]
 
     depsVersion = [