Browse Source

通用表单闪退问题

RaoMeng 6 years ago
parent
commit
0a4f92595a

+ 3 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewCommActivity.java

@@ -135,6 +135,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         Map<String, String> headers = new HashMap<>();
         headers.put("clientType", "uas client");
         headers.put("Cookie", com.core.utils.CommonUtil.getErpCookie(ct));
+        headers.put("master", com.core.utils.CommonUtil.getMaster());
         headers.put("sessionUser", com.core.utils.CommonUtil.getEmcode());
         headers.put("sessionId", com.core.utils.CommonUtil.getSharedPreferences(ct, "sessionId"));
         return headers;
@@ -237,7 +238,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         if (isCookie) {
             synCookies(this, url);
         }
-
+        Log.d("webUrl", url);
         webView.loadUrl(url, getWebHeader());
         webView.setWebChromeClient(new ChromeClient());
         webView.setWebViewClient(new WebViewClient() {
@@ -263,6 +264,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                Log.d("webUrl", url);
                 if (!TextUtils.isEmpty(url)) {
                     if (url.contains("https://account.ubtob.com/sso/login") ||
 //                            url.equals("https://sso.ubtob.com/") ||

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Sun May 19 20:15:08 CST 2019
+#Wed May 22 19:29:50 CST 2019
 debugName=972
-versionName=679
+versionName=680
 debugCode=972
-versionCode=234
+versionCode=235

+ 3 - 0
app_modular/apputils/src/main/java/com/modular/apputils/activity/BillInputActivity.java

@@ -577,6 +577,9 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
     }
 
     protected void handlerSelectDbFind(JSONObject object, int groupId, boolean isForm) {
+        if (object == null) {
+            return;
+        }
         if (isForm) {
             List<BillGroupModel.BillModel> formBillModels = mBillAdapter.getFormBillModels();