Browse Source

集成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
Arison 8 years ago
parent
commit
1dfa3c71d0

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -352,7 +352,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             @Override
             public void onClick(View v) {
               startActivity(new Intent("com.modular.apputils.activity.SimpleWebActivity")
-              .putExtra("url","https://192.168.253.200:8081/Chapter/")
+              .putExtra("url","http://qq784602719.imwork.net:13767/Chapter/")
               );
             }
         });

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jan 17 09:59:36 CST 2018
-debugName=127
+#Fri Jan 19 16:04:42 CST 2018
+debugName=132
 versionName=613
-debugCode=127
+debugCode=132
 versionCode=152