11:27

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

@@ -1,6 +1,3 @@
-/**
- *
- */
 package com.xzjmyk.pm.activity;
 
 import android.app.Activity;
@@ -15,12 +12,14 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import com.alibaba.fastjson.JSON;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.common.file.DownloadUtil;
+import com.core.app.MyApplication;
+import com.core.utils.CommonUtil;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 import com.xzjmyk.pm.activity.ui.me.ScanInfoResultsActivity;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.LifecycleCallback;
 
@@ -28,6 +27,7 @@ import com.xzjmyk.pm.activity.view.crouton.LifecycleCallback;
 /**
  * @author RaoMeng
  * update fanglh 2017-6-7 新增扫描名片二维码需求
+ * update fanglh 2017-9-14 新增扫描UAS二维码登录功能
  */
 public class CaptureResultActivity extends Activity {
     private WebView mWebView;
@@ -111,14 +111,11 @@ public class CaptureResultActivity extends Activity {
                 }else {
                     if (CommonUtil.isWebsite(result)){
                         mWebView.loadUrl(result);
-//                    finish();
                     }else {
                         doJudgeInfoCard(result);//进行是否为名片二维码判断
                     }
                 }
                 Log.d("scanurl",result);
-
-
             }
         }
     }
@@ -129,11 +126,48 @@ public class CaptureResultActivity extends Activity {
             startActivity(new Intent(this, ScanInfoResultsActivity.class)
                     .putExtra("ScanResults",result)
                     .putExtra("isQRData",true));// true ：扫描到的是名片信息标志
+        }else if (isJSONData && result.contains("clientId")){
+            doUasLoginRequest(result);
         }else {
             startActivity(new Intent(this, ScanInfoResultsActivity.class)
-                                        .putExtra("ScanResults",result)
-                                        .putExtra("isQRData",false));
+                    .putExtra("ScanResults",result)
+                    .putExtra("isQRData",false));
         }
+//        finish();
+    }
+
+    /**
+     * 新增扫描UAS二维码登录功能
+     * @param result
+     */
+    private void doUasLoginRequest(String result) {
+        String clientId  = JSON.parseObject(result).getString("clientId");
+        if (StringUtil.isEmail(clientId)) return;
+
+        /*HttpClient httpClient = new HttpClient.Builder("http://192.168.253.63:8080/ERP/").build();
+        httpClient.Api().send(new HttpClient.Builder()
+        .url("common/checkQrcodeScan.action")
+        .add("clientId",clientId)
+        .add("em_code ", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"))
+        .add("sob",CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"))
+        .method(Method.GET)
+        .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                Log.i("FLH",JSON.toJSONString(o)+"");
+                Toast.makeText(MyApplication.getInstance(),JSON.toJSONString(o)+"",Toast.LENGTH_LONG).show();
+            }
+        }));*/
+        String url = null;
+//        url = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_baseurl")+"common/checkQrcodeScan.action";
+        url = "http://192.168.253.63:8080/ERP/"+"common/checkQrcodeScan.action";
+        String em_code = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");
+        String sob = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master");
+        Intent intent_web = new Intent("com.modular.main.WebViewCommActivity");
+        intent_web.putExtra("url", url + "?clientId=" + clientId + "?em_code=" + em_code + "?sob=" + sob);
+        intent_web.putExtra("title", "UAS网页登录");
+        intent_web.putExtra("cookie", true);
+        startActivity(intent_web);
         finish();
     }
 

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -694,4 +694,16 @@ public class CommonUtil {
         }
         view.setText(style);
     }
+    /**
+     * 检验是否是正确的网址
+     *
+     * @param s
+     * @return
+     */
+    public static boolean isWebsite(String s) {
+        String regex = "^([hH][tT]{2}[pP]://|[hH][tT]{2}[pP][sS]://)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\\\\/])+$";
+        Pattern p = Pattern.compile(regex);
+        Matcher m = p.matcher(s);
+        return m.matches();
+    }
 }

app_core/network/src/main/java/com/me/network/app/http/HttpClient.java

@@ -279,6 +279,8 @@ public class HttpClient {
             httpBase.initClient();
         }else{
             httpBase= RetrofitImpl.getInstance();
+            httpBase.setBuilder(this);
+            httpBase.initClient();
         }
         return httpBase;
     }

app_core/network/src/main/java/com/me/network/app/http/impl/RetrofitImpl.java

@@ -70,9 +70,12 @@ public class RetrofitImpl extends HttpBase {
 
 		LogInterceptor logInterceptor = new LogInterceptor();
 		logInterceptor.setBuilder(mbuilder);
-		okBuilder.addInterceptor(logInterceptor);	
-		okBuilder.cache(new Cache(mbuilder.getCacheFile(), mbuilder.getCacheFileSize()));
-		okBuilder.addInterceptor(new CacheInterceptor(String.valueOf(mbuilder.getCacheTime()),mbuilder.getCacheType()));
+		okBuilder.addInterceptor(logInterceptor);
+		if(mbuilder.getCacheFileSize()!=0){
+			okBuilder.cache(new Cache(mbuilder.getCacheFile(), mbuilder.getCacheFileSize()));
+			okBuilder.addInterceptor(new CacheInterceptor(String.valueOf(mbuilder.getCacheTime()),mbuilder.getCacheType()));
+		}
+
 
 
 		OkHttpClient client = okBuilder.build();

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/WorkDailyAddActivity.java

@@ -516,7 +516,6 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
                                 } else {
                                     Intent intent1 = new Intent("com.modular.work.OAActivity");
                                     intent1.putExtra("WorkDailyAdd", "WorkDailyAdd");
-                                    intent1.addCategory("com.modular.work.OAActivity");
                                     startActivity(intent1);
                                 }
                                 finish();
@@ -527,7 +526,6 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
             } else {
                 Intent intent1 = new Intent("com.modular.work.OAActivity");
                 intent1.putExtra("WorkDailyAdd", "WorkDailyAdd");
-                intent1.addCategory("com.modular.work.OAActivity");
                 startActivity(intent1);
                 finish();
             }
@@ -569,7 +567,6 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
         } else {
             Intent intent1 = new Intent("com.modular.work.OAActivity");
             intent1.putExtra("WorkDailyAdd", "WorkDailyAdd");
-            intent1.addCategory("com.modular.work.OAActivity");
             startActivity(intent1);
             finish();
         }