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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddB2BActivity.java
#	WeiChat/src/main/res/layout/activity_login.xml

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiPlatform.java

@@ -6,13 +6,14 @@ package com.xzjmyk.pm.activity.wxapi;
  * 在ApiModel中定义公共逻辑方法
  */
 public class ApiPlatform extends ApiBase implements ApiModel {
-
-    private final String mBaseUrl = "http://218.17.158.219:9090/platform-b2b/"; //测试ip
+//
+      private final String mBaseUrl="https://uas.ubtob.com/";
+   // private final String mBaseUrl = "http://218.17.158.219:9090/platform-b2b/"; //测试ip
 //    private final String mBaseUrl = "http://192.168.253.102:8090/platform-b2b/"; //董必伟本地ip
 //    private final String mBaseUrl = "http://192.168.253.192:8088/platform-b2b/"; //何本地ip
 
-
-    private String url_login_test = "http://113.105.74.135:8001/sso/login";
+    private String url_login_test="https://uas.ubtob.com/sso/login";
+    //private String url_login_test = "http://113.105.74.135:8001/sso/login";
     private String url_login_formal = "https://account.ubtob.com/sso/login";
 
     private String OBTAIN_ANNOUNCE_URL = mBaseUrl + "/bulletinCenter/getAllbulletins?pageNumber=1&pageSize=10&enuu=10030994";

WeiChat/src/main/res/layout/activity_login.xml

@@ -15,14 +15,14 @@
             android:layout_width="80dp"
             android:layout_height="80dp" 
             android:layout_centerHorizontal="true"
-            android:layout_above="@+id/ll_content"
+            android:layout_marginTop="50dp"
             android:layout_marginBottom="20dp"
             android:src="@drawable/login_header"/>
         <LinearLayout
             android:id="@+id/ll_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
+            android:layout_below="@+id/iv_head"
             android:layout_marginBottom="10dp"
             android:orientation="vertical">
           <LinearLayout