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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -680,7 +680,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         unWorkReadTV = (TextView) findViewById(R.id.main_tab_five_tv);
         main_tab_three_tv = (TextView) findViewById(R.id.main_tab_three_tv);
 
-        //TODO 当前隐藏性功能提醒红点
+        //TODO 当前隐藏新功能提醒红点
         PreferenceUtils.putInt(MainActivity.NEW_FUNCTION_NOTICE, 1);
         PushManager.resumeWork(MyApplication.getInstance());
         int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_FUNCTION_NOTICE);

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

@@ -141,6 +141,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
                     if (msg.getData() != null) {
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
                             ToastMessage(msg.getData().getString("result"));
+                            progressDialog.show();
                         }
                     }
                     break;

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

@@ -7,6 +7,7 @@ public abstract class ApiBase {
     //定义各种公共接口
     public String login;//登录
     public String getMasters;//获取账套
+    public  String cookie="";
 
 
     public String getGetMasters() {
@@ -24,4 +25,24 @@ public abstract class ApiBase {
     public void setLogin(String login) {
         this.login = login;
     }
+
+    public String getCookie() {
+        if (ApiUtils.getApiModel() instanceof ApiPlatform){
+            //获取不同身份的cookie
+        }
+        if (ApiUtils.getApiModel() instanceof  ApiUAS){
+
+        }
+        return cookie;
+    }
+
+    public void setCookie(String cookie) {
+        if (ApiUtils.getApiModel() instanceof ApiPlatform){
+            //保存不同身份的cookie
+        }
+        if (ApiUtils.getApiModel() instanceof  ApiUAS){
+            
+        }
+        this.cookie = cookie;
+    }
 }

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

@@ -8,6 +8,7 @@ public class ApiConfig {
     private static ApiConfig mInstance;
     
     private ApiModel mApiConfig;
+    private ApiBase mApiBase;
     
 
     public ApiConfig(ApiModel api) {
@@ -26,6 +27,9 @@ public class ApiConfig {
         return mInstance;
     }
 
+    public ApiBase getmApiBase() {
+        return mApiBase;
+    }
     public ApiModel getmApiConfig() {
         return mApiConfig;
     }

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

@@ -5,8 +5,11 @@ package com.xzjmyk.pm.activity.wxapi;
  * Created by Arison on 2017/3/2.
  */
 public interface ApiModel {
-    
-     void init();//初始化api接口
-     void setCookie(String cookie);//设置cookie
-     String getCookie();//获取cookie
+      
+     /**
+       * @desc:初始化api接口
+       * @author：Arison on 2017/3/3
+       */
+     void init();
+     
 }

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

@@ -2,32 +2,17 @@ package com.xzjmyk.pm.activity.wxapi;
 
 /**
  * Created by Arison on 2017/3/2.
+ * 在ApiBase中定义公共方法(接口写在这里)
+ * 在ApiModel中定义公共逻辑方法
  */
 public class ApiPlatform extends ApiBase implements ApiModel{
-    //登录
-    private  String cookie="";
-
-   
+ 
     
     @Override
     public void init() {
-        login="";
+        //这里开始写接口
+        setLogin("");
+        setGetMasters("");
     }
     
-    public String getLogin() {
-        return login;
-    }
-
-    public void setLogin(String login) {
-        this.login = login;
-    }
-
-    public String getCookie() {
-        return cookie;
-    }
-
-    public void setCookie(String cookie) {
-        this.cookie = cookie;
-    }
-
 }

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

@@ -0,0 +1,28 @@
+package com.xzjmyk.pm.activity.wxapi;
+
+import android.content.Context;
+
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+
+/**
+ * Created by Arison on 2017/3/3.
+ */
+public class ApiUtils {
+
+    /**
+      * @desc:判断当前系统属于哪种身份
+      * @author：Arison on 2017/3/3
+      */
+    public static ApiModel getApiModel(){
+        Context ct=MyApplication.getInstance().getApplicationContext();
+//        Boolean b2bLogin=   CommonUtil.getSharedPreferencesBoolean(ct,"b2b_login");
+        Boolean erpLogin= CommonUtil.getSharedPreferencesBoolean(ct, "erp_login");
+        if(erpLogin){
+            return new ApiUAS();
+        }else{
+            return new ApiPlatform();
+        }
+    }
+    
+}

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

@@ -395,7 +395,7 @@
                         android:orientation="vertical"
                         android:layout_marginTop="2dp"
                         android:paddingLeft="5dp"
-                        android:visibility="visible"
+                        android:visibility="invisible"
                         >
                         <FrameLayout
                             android:id="@+id/notice_head_area"