提交分类： bug修复

提交内容：  公共网页打开页面换用腾讯tbs控件
当前版本：  正式版本6.2.1
是否冲突：  否

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Feb 28 09:29:25 CST 2018
-debugName=273
+#Thu Mar 01 09:54:22 CST 2018
+debugName=285
 versionName=620
-debugCode=273
+debugCode=285
 versionCode=159

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

@@ -35,7 +35,7 @@ public class HttpClient {
 
     private HttpBase httpBase;
 
-    private int what;
+    private int what = -1;
 
     public HttpClient(Builder builder) {
         super();
@@ -117,7 +117,7 @@ public class HttpClient {
         private long retryTimeout = 5;//重试间隔时间
         private boolean isDebug;// 是否开启打印日志
         private HttpBase httpBase;//具体的网络请求类
-        private int what;
+        private int what = -1;
 
         //默认的参数
         public Builder() {

app_modular/apputils/src/main/java/com/modular/apputils/activity/SimpleWebActivity.java

@@ -21,6 +21,7 @@ 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.me.network.app.http.ssl.TrustAllCerts;
 import com.modular.apputils.R;
 import com.tencent.smtt.sdk.CookieManager;
 import com.tencent.smtt.sdk.TbsReaderView;
@@ -30,12 +31,20 @@ import com.tencent.smtt.sdk.WebView;
 import com.tencent.smtt.sdk.WebViewClient;
 
 import java.io.File;
+import java.security.SecureRandom;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+
+import okhttp3.OkHttpClient;
 
 public class SimpleWebActivity extends OABaseActivity implements ReaderCallback {
     private static final String TAG = "SimpleWebActivity";
     private WebView webView;
     private TbsReaderView mTbsReaderView;
     private String filepath;
+    private OkHttpClient mOkHttpClient;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -52,7 +61,7 @@ public class SimpleWebActivity extends OABaseActivity implements ReaderCallback
         webView.getSettings().setDatabaseEnabled(true);
         webView.getSettings().setAppCacheEnabled(true);
         webView.getSettings().setCacheMode(WebSettings.LOAD_DEFAULT);
-        
+
         Intent intent = getIntent();
         String url = intent.getStringExtra("url");
         getSupportActionBar().setTitle(intent.getStringExtra("p"));
@@ -66,6 +75,33 @@ public class SimpleWebActivity extends OABaseActivity implements ReaderCallback
 
         if ("http://mall.ubtob.com".equals(url)) {
             initBusinessToken();
+
+            /*mOkHttpClient = new OkHttpClient.Builder()
+                    .sslSocketFactory(createSSLSocketFactory(), new TrustAllCerts())
+                    .hostnameVerifier(new TrustAllHostnameVerifier())
+                    .connectTimeout(30, TimeUnit.SECONDS)
+                    .readTimeout(30, TimeUnit.SECONDS).build();
+
+            RequestBody requestBody = new FormBody.Builder()
+                    .add("appId", "b2b")
+                    .add("username", "13641490964")
+                    .add("password", "111111")
+                    .add("spaceId", "82121")
+                    .build();
+            Request request = new Request.Builder().url("https://account.ubtob.com/sso/login").post(requestBody).build();
+
+            mOkHttpClient.newCall(request).enqueue(new Callback() {
+                @Override
+                public void onFailure(Call call, IOException e) {
+
+                }
+
+                @Override
+                public void onResponse(Call call, Response response) throws IOException {
+                    Headers headers = response.headers();
+//                    List<String> headers = response.headers("Set-Cookie");
+                }
+            });*/
         }
 
         setThirdPartyCookiesEnabled(true);
@@ -203,4 +239,15 @@ public class SimpleWebActivity extends OABaseActivity implements ReaderCallback
     public void onCallBackAction(Integer integer, Object o, Object o1) {
 
     }
+
+    public SSLSocketFactory createSSLSocketFactory() {
+        SSLSocketFactory ssfFactory = null;
+        try {
+            SSLContext sc = SSLContext.getInstance("TLS");
+            sc.init(null, new TrustManager[]{new TrustAllCerts()}, new SecureRandom());
+            ssfFactory = sc.getSocketFactory();
+        } catch (Exception e) {
+        }
+        return ssfFactory;
+    }
 }

app_modular/appworks/src/main/java/com/uas/appworks/activity/CustomerInquiryDetailActivity.java

@@ -269,11 +269,11 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
 
             mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_customer), customer, "", "客户", "", 0, null));
             mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_customer_address), customerAddress, "", "客户地址", "", 0, null));
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_customer_phone), userTel, "", "联系电话", "", 0, null));
             if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)
                     || Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(mState)) {
                 mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.public_inquiry_contact), userName, "", "联系人", "", 0, null));
             }
+            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_customer_phone), userTel, "", "联系电话", "", 0, null));
             mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_bill_num), billNum, "", "单据", "", 0, null));
             mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_material), material, "", "物料", "", 0, null));
 

app_modular/appworks/src/main/java/com/uas/appworks/activity/PublicInquiryDetailActivity.java

@@ -204,8 +204,8 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
 
         mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_id), inquiryId, "", "询价编号", ""));
         mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_company), inquiryCompany, "", "询价企业", ""));
-        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_phone), phone, "", "联系电话", ""));
         mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_contact), contact, "", "联系人", ""));
+        mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_phone), phone, "", "联系电话", ""));
         mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_enddate), enddate, "", "报价截止如期", ""));
         if (!TextUtils.isEmpty(attachs)) {
             mInquiryListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_attachs), attachs, "", "附件", ""));
@@ -223,7 +223,7 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
         }
         mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.customer_inquiry_currency), currency, "", "币别", ""));
         if (!TextUtils.isEmpty(taxrate)) {
-            mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.customer_inquiry_taxrate), taxrate, "", "税率", ""));
+            mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_taxrate), taxrate, "", "税率", ""));
         }
 
         mMaterialListAdapter.notifyDataSetChanged();

app_modular/appworks/src/main/res/values-en/strings.xml

@@ -132,4 +132,5 @@
     <string name="public_inquiry_search_hint">单据编号/客户名称/物料名称</string>
     <string name="register_unsuccessed_sure_to_exit">注册未完成，确定退出？</string>
     <string name="please_select_currency">请选择币别</string>
+    <string name="public_inquiry_taxrate">税率(%)</string>
 </resources>

app_modular/appworks/src/main/res/values-zh-rCN/strings.xml

@@ -131,4 +131,5 @@
     <string name="public_inquiry_search_hint">单据编号/客户名称/物料名称</string>
     <string name="register_unsuccessed_sure_to_exit">注册未完成，确定退出？</string>
     <string name="please_select_currency">请选择币别</string>
+    <string name="public_inquiry_taxrate">税率(%)</string>
 </resources>

app_modular/appworks/src/main/res/values-zh-rTW/strings.xml

@@ -131,4 +131,5 @@
     <string name="public_inquiry_search_hint">单据编号/客户名称/物料名称</string>
     <string name="register_unsuccessed_sure_to_exit">注册未完成，确定退出？</string>
     <string name="please_select_currency">请选择币别</string>
+    <string name="public_inquiry_taxrate">税率(%)</string>
 </resources>

app_modular/appworks/src/main/res/values/strings.xml

@@ -163,6 +163,7 @@
     <string name="public_inquiry_search_hint">单据编号/客户名称/物料名称</string>
     <string name="register_unsuccessed_sure_to_exit">注册未完成，确定退出？</string>
     <string name="please_select_currency">请选择币别</string>
+    <string name="public_inquiry_taxrate">税率(%)</string>
 
 
 </resources>