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/ui/contact/ContactFragment.java

@@ -239,7 +239,8 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         mPullToRefreshView.setOnRefreshListener(new PullToRefreshView.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                loadDataInThread();
+                //loadDataInThread();
+                loadFriendsNet();
             }
         });
         //item点击事件处理

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/HttpClient.java

@@ -18,6 +18,8 @@ import org.apache.http.client.CookieStore;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.params.CoreConnectionPNames;
@@ -99,6 +101,7 @@ public class HttpClient {
 
     public String sendPostRequest(String url, Map<String, String> params)
             throws IOException {
+        SSLSocketFactory.getSocketFactory().setHostnameVerifier(new AllowAllHostnameVerifier());
         Log.i("HTTP", "post url=" + url);
         String result = null;
         HttpResponse response = null;
@@ -130,7 +133,7 @@ public class HttpClient {
         } catch (IOException e) {
             e.printStackTrace();
         }
-
+       
         if (response.getStatusLine().getStatusCode() == 200
                 || response.getStatusLine().getStatusCode() == 207) {
             String temp = EntityUtils.toString(response.getEntity());

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -451,8 +451,8 @@ public class ViewUtil {
         params.put("appId", "b2b");
         params.put("username", phone);
         params.put("password", password);
-//        params.put("spaceId", String.valueOf(spaceId));
-        params.put("spaceId", "76035");
+        params.put("spaceId", String.valueOf(spaceId));
+       // params.put("spaceId", "76035");
         startNetThread(url, params, handler, Constants.SUCCESS_B2B, null, null, "post");
     }
 

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

@@ -246,9 +246,11 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         if (ApiUtils.getApiModel() instanceof ApiUAS) {
             company_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_commpany"));
             master_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_master"));
+            rl_master_change.setVisibility(View.VISIBLE);
         } else {
             company_tv.setText(CommonUtil.getSharedPreferences(ct, "companyName"));
             master_tv.setText(CommonUtil.getSharedPreferences(ct, "spaceId"));
+            rl_master_change.setVisibility(View.GONE);
         }
 
 

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

@@ -7,7 +7,7 @@ package com.xzjmyk.pm.activity.wxapi;
  */
 public class ApiPlatform extends ApiBase implements ApiModel {
 //
-      private final String mBaseUrl="https://uas.ubtob.com/";
+      private final String mBaseUrl="http://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