浏览代码

Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_raomeng

# Conflicts:
#	WeiChat/version.properties
RaoMeng 7 年之前
父节点
当前提交
e19dc80126

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Sep 05 09:10:07 CST 2018
+#Fri Sep 07 20:56:33 CST 2018
 debugName=579
-versionName=653
+versionName=641
 debugCode=579
-versionCode=195
+versionCode=197

+ 2 - 2
app_modular/appworks/src/main/java/com/uas/appworks/activity/TimeHelperActivity.java

@@ -228,8 +228,8 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
 
     private void getByDaySchedule(String day) {
         mPresenter.httpRequest(mContext,
-//                "https://mobile.ubtob.com:8443/"
-                "http://192.168.253.230:8080/"
+                "https://mobile.ubtob.com:8443/"
+//                "http://192.168.253.230:8080/"
                 ,
                 new HttpParams.Builder()
                         .url("schedule/schedule/getByDaySchedule")