Explorar el Código

Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer_fix

# Conflicts:
#	WeiChat/version.properties
Arison hace 8 años
padre
commit
1ffffb8739

+ 1 - 1
WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -860,7 +860,7 @@
     <string name="work_oa">行政办公</string>
     <string name="work_business_manage">商务管理</string>
     <string name="work_business_mall">优软商城</string>
-    <string name="work_business_find">商品查询</string>
+    <string name="work_business_find">优软商城</string>
     <string name="work_business_me">我的商务</string>
     <string name="work_oa_sigin">自动考勤</string>
     <string name="work_oa_order">查看订单询价单</string>

+ 1 - 1
WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -832,7 +832,7 @@
     <string name="work_oa">行政辦公</string>
     <string name="work_business_manage">商務管理</string>
     <string name="work_business_mall">優軟商城</string>
-    <string name="work_business_find">商品查詢</string>
+    <string name="work_business_find">優軟商城</string>
     <string name="work_business_me">我的商務</string>
     <string name="work_oa_sigin">自動考勤</string>
     <string name="work_oa_order">查看訂單詢價單</string>

+ 1 - 1
WeiChat/src/main/res/values/strings.xml

@@ -1551,7 +1551,7 @@
     <string name="real_arrival_time">实际到达时间</string>
     <string name="recent_record_time">最近记录时间</string>
     <string name="select_client">选择客户</string>
-    <string name="work_business_find">商品查询</string>
+    <string name="work_business_find">优软商城</string>
     <string name="app_trytoget_outplan">获取外勤计划失败</string>
     <string name="set_language">切换语言</string>
     <string name="select_form_phoneablum">从手机相册选择</string>

+ 5 - 5
WeiChat/version.properties

@@ -1,8 +1,8 @@
-#Tue Jan 02 11:04:08 CST 2018
-debugName=370
-versionName=613
+#Thu Jan 04 16:26:00 CST 2018
+debugName=377
 >>>>>>>=ee498070608d5e9e61ea28c6cea1571216fbad83
-debugCode=370
+versionName=613
+debugCode=377
 versionCode=152
-<<<<<<<=HEAD
 =\=\=\=\=\=\=
+<<<<<<<=HEAD

+ 1 - 1
app_core/common/src/main/res/values-zh-rTW/strings.xml

@@ -835,7 +835,7 @@
     <string name="work_oa">行政辦公</string>
     <string name="work_business_manage">商務管理</string>
     <string name="work_business_mall">優軟商城</string>
-    <string name="work_business_find">商品查詢</string>
+    <string name="work_business_find">優軟商城</string>
     <string name="work_business_me">我的商務</string>
     <string name="work_oa_sigin">自動考勤</string>
     <string name="work_oa_order">查看訂單詢價單</string>

+ 1 - 1
app_core/common/src/main/res/values/strings.xml

@@ -1553,7 +1553,7 @@
     <string name="real_arrival_time">实际到达时间</string>
     <string name="recent_record_time">最近记录时间</string>
     <string name="select_client">选择客户</string>
-    <string name="work_business_find">商品查询</string>
+    <string name="work_business_find">优软商城</string>
     <string name="app_trytoget_outplan">获取外勤计划失败</string>
     <string name="set_language">切换语言</string>
     <string name="select_form_phoneablum">从手机相册选择</string>

+ 1 - 1
app_modular/appme/src/main/res/values/strings.xml

@@ -1549,7 +1549,7 @@
     <string name="real_arrival_time">实际到达时间</string>
     <string name="recent_record_time">最近记录时间</string>
     <string name="select_client">选择客户</string>
-    <string name="work_business_find">商品查询</string>
+    <string name="work_business_find">优软商城</string>
     <string name="app_trytoget_outplan">获取外勤计划失败</string>
     <string name="set_language">切换语言</string>
     <string name="select_form_phoneablum">从手机相册选择</string>

+ 36 - 2
app_modular/apputils/src/main/java/com/modular/apputils/activity/SimpleWebActivity.java

@@ -13,8 +13,14 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
+import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
 import com.modular.apputils.R;
 
 public class SimpleWebActivity extends BaseActivity {
@@ -33,7 +39,7 @@ private static final String TAG = "SimpleWebActivity";
         webView.getSettings().setDatabaseEnabled(true);
         webView.getSettings().setAppCacheEnabled(true);
         webView.getSettings().setCacheMode(WebSettings.LOAD_DEFAULT);
-
+        //initBusinessToken();
         
         Intent intent = getIntent();
         String  url = intent.getStringExtra("url");
@@ -62,10 +68,38 @@ private static final String TAG = "SimpleWebActivity";
                 super.onPageFinished(view, url);
             }
         });
-        webView.loadUrl(url);
+      //  webView.loadUrl(url);
     }
 
 
+  
+    public void initBusinessToken(){
+          HttpClient httpClient=new HttpClient.Builder("https://account.ubtob.com/").build();
+                 httpClient.Api().send(new HttpClient.Builder()
+                 .url("api/user/getToken")
+                         .add("appId","b2b")
+                         .add("spaceDialectUID","0")
+                         .add("uid", MyApplication.getInstance().mLoginUser.getTelephone())
+                 .method(Method.GET)
+                 .build(),new ResultSubscriber<Object>(new ResultListener<Object>() {
+          
+                     @Override
+                     public void onResponse(Object o) {
+                         try {
+//                             {
+//                             "success": true,
+//                                     "content": "fe7120a70d3c40c59830dbb5c0efb7f7"
+//                         }
+                             LogUtil.d(TAG,o.toString());
+                             String token= JSON.parseObject(o.toString()).getString("content");
+                             String url="https://account.ubtob.com/sso/login/proxy?appId=b2b&returnURL=https://www.usoftmall.com&token="+token+"&baseURL=https://www.usoftmall.com/login/other&isLoginAll=false";
+                             webView.loadUrl(url);
+                         } catch (Exception e) {
+                             e.printStackTrace();
+                         }
+                     }
+                 }));
+    }
 
     public static void synCookies(Context context, String url,String cookies) {
         CookieSyncManager.createInstance(context);