二维码替换，解决内置webview不能下载的问题

解决9.14部分bug

WeiChat/src/main/java/com/xzjmyk/pm/activity/CaptureResultActivity.java

@@ -5,11 +5,14 @@ package com.xzjmyk.pm.activity;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.webkit.DownloadListener;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -43,7 +46,25 @@ public class CaptureResultActivity extends Activity {
         webSettings.setLoadWithOverviewMode(true);
 
         webSettings.setDomStorageEnabled(true);
-//        mWebView.setWebViewClient(new WebViewClient());
+        webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
+        mWebView.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                /*view.loadUrl(url);
+                return true;*/
+                return false;
+            }
+        });
+
+        mWebView.setDownloadListener(new DownloadListener() {
+            @Override
+            public void onDownloadStart(String url, String userAgent, String contentDisposition, String mimetype, long contentLength) {
+                Uri uri = Uri.parse(url);
+                Intent intent = new Intent(Intent.ACTION_VIEW,uri);
+                startActivity(intent);
+//                finish();
+            }
+        });
     }
 
     private void initData() {
@@ -74,14 +95,6 @@ public class CaptureResultActivity extends Activity {
                             finish();
                         }
                     });
-                    /*Timer timer = new Timer();
-                    TimerTask task = new TimerTask() {
-                        @Override
-                        public void run() {
-                            finish();
-                        }
-                    };
-                    timer.schedule(task,500);*/
                 }
             }
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/CommonWebviewActivity.java

@@ -2,9 +2,12 @@ package com.xzjmyk.pm.activity;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
+import android.webkit.DownloadListener;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 
 /**
  * Created by RaoMeng on 2016/9/14.
@@ -12,6 +15,7 @@ import android.webkit.WebView;
 public class CommonWebviewActivity extends Activity {
     private WebView mWebView;
     private String mUrl;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -26,6 +30,24 @@ public class CommonWebviewActivity extends Activity {
         webSettings.setLoadWithOverviewMode(true);
 
         webSettings.setDomStorageEnabled(true);
+        mWebView.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                /*view.loadUrl(url);
+                return true;*/
+                return false;
+            }
+        });
+
+        mWebView.setDownloadListener(new DownloadListener() {
+            @Override
+            public void onDownloadStart(String url, String userAgent, String contentDisposition, String mimetype, long contentLength) {
+                Uri uri = Uri.parse(url);
+                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                startActivity(intent);
+//                finish();
+            }
+        });
 
         Intent intent = getIntent();
         mUrl = intent.getStringExtra("scan_url");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessLessActivity.java

@@ -86,7 +86,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
 
     private void initData() {
         loadLeader(2);
-        tv_date.setText(DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd"));
+        tv_date.setText(DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd HH:mm:ss"));
         Intent intent = getIntent();
         if (intent != null) {
             type = intent.getIntExtra("type", 1);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -107,7 +107,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         tv_linksman_login.setText(bean.getVp_contact() == null ? "未填写" : bean.getVp_contact());
         tv_address_login.setText(bean.getAddress() == null ? "未填写" : bean.getAddress());
         tv_visit_theme.setText(bean.getRemark() == null ? "未填写" : bean.getRemark());
-        tv_visit_steps.setText(bean.getNichestep() == null ? "未填写" : bean.getNichestep());
+        tv_visit_steps.setText(bean.getNichestep() == null ? "" : bean.getNichestep());
 
     }
 

WeiChat/src/main/res/layout/activity_customter_add.xml

@@ -107,13 +107,19 @@
                 android:text="*"
                 android:textColor="@color/red" />
 
-            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            <!--<com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_cu_address"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
                 whatever:testType="regexp"
                 whatever:customRegexp="^[\u4e00-\u9fa5]{1,500}$|^[\dA-Za-z_]{1,500}$"
-                whatever:testErrorString="限定字符长度不大于500" />
+                whatever:testErrorString="限定字符长度不大于500" />-->
+
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/tv_cu_address"
+                style="@style/form_relative_right_text"
+                android:hint="请输入"
+                editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
 

WeiChat/src/main/res/values/styles.xml

@@ -740,7 +740,7 @@
     <style name="TextView_VerticalCenter">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_gravity">top</item>
     </style>
 
     <style name="TextView_Basic">