集成tbs。目前没有进行64位手机适配。

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

# Conflicts:
#	WeiChat/version.properties
#	app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceDataFormAddActivity.java

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Jan 19 16:04:42 CST 2018
-debugName=132
+#Mon Jan 22 14:23:05 CST 2018
+debugName=133
 versionName=613
-debugCode=132
+debugCode=133
 versionCode=152

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BaseInfoActivity.java

@@ -65,8 +65,9 @@ import java.util.List;
 
 
 /**
- * 个人资料页面
- */
+  * @desc:用户个人资料界面
+  * @author：Arison on 2018/1/23
+  */
 public class BaseInfoActivity extends BaseActivity implements View.OnClickListener {
 
     private ImageView iv_headImage;

app_modular/apputils/src/main/java/com/modular/apputils/IntentUrlActivity.java

@@ -27,27 +27,27 @@ private static final String TAG = "IntentUrlActivity";
                 String id= uri.getQueryParameter("id");
                 LogUtil.d(TAG,"pagekind:"+pagekind+" id:"+id);
                 if ("A".equals(pagekind)){
-                    Intent intent=new Intent(this, SimpleWebActivity.class);
-                    intent.putExtra("id",id);
-                    intent.putExtra("url","https://www.baidu.com");
-                    intent.putExtra("p","询价单");
-                    startActivity(intent);
+//                    Intent intent=new Intent(this, CustomerInquiryDetailActivity
+//                            .class);
+//             
+//                    intent.putExtra("extra_b2b_list_id",id);
+//                    intent.putExtra("extra_b2b_list_state","todo");
+//                    startActivity(intent);
                     
                 }
-                if ("B".equals(pagekind)){
-                    Intent intent=new Intent(this, SimpleWebActivity.class);
-                    intent.putExtra("id",id);
-                    intent.putExtra("url","https://github.com");
-                    intent.putExtra("p","公共询价单");
-                    startActivity(intent);
+                if ("B".equals(pagekind)){//公共询价单
+//                    Intent intent=new Intent(this, CustomerInquiryDetailActivity
+//                            .class);
+//                    intent.putExtra("extra_b2b_list_id",id);
+//                    intent.putExtra("extra_b2b_list_state","public_todo");
+//                    startActivity(intent);
                   
                 }
                 if ("C".equals(pagekind)){
-                    Intent intent=new Intent(this, SimpleWebActivity.class);
-                    intent.putExtra("id",id);
-                    intent.putExtra("url","https://www.jianshu.com/u/7cfc7246c714");
-                    intent.putExtra("p","采购单");
-                    startActivity(intent);
+//                    Intent intent=new Intent(this, PurchaseDetailsActivity.class);
+//                    intent.putExtra("extra_b2b_list_id",id);
+//                    intent.putExtra("extra_b2b_list_state","todo");
+//                    startActivity(intent);
                 }
                 overridePendingTransition(0,0);
                 finish();