5.7.3 整理APiPlatform 前

WeiChat/src/main/java/com/xzjmyk/pm/activity/CustomCrashActivity.java

@@ -8,6 +8,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
@@ -30,7 +31,7 @@ public class CustomCrashActivity extends Activity {
         mErrorIv = (ImageView) findViewById(R.id.error_image);
         intent = getIntent();
         stackTraceString = CustomActivityOnCrash.getAllErrorDetailsFromIntent(this, intent);
-        if (stackTraceString != null) {
+        if (stackTraceString != null && !CommonUtil.isReleaseVersion()) {
             new MaterialDialog.Builder(this).content(stackTraceString)
                     .build().show();
         }

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

@@ -451,8 +451,13 @@ 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");
+        if (CommonUtil.isReleaseVersion()){
+            params.put("spaceId", String.valueOf(spaceId));
+            Log.i("fang",String.valueOf(spaceId)+"");
+        }else {
+            params.put("spaceId", "76035");
+            Log.i("fang", "76035");
+        }
         startNetThread(url, params, handler, Constants.SUCCESS_B2B, null, null, "post");
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/CommonUtil.java

@@ -1481,4 +1481,15 @@ public class CommonUtil {
         }
         return s;
     }
+
+    /**
+     * 判断是不是发布版本，true：发布版本
+     */
+    public static Boolean isReleaseVersion(){
+        if (!StringUtils.isEmpty(PropertiesUtil.readData(MyApplication.getInstance(),"release_version", R.raw.version_configuration)) &&
+                "true".equals(PropertiesUtil.readData(MyApplication.getInstance(),"release_version", R.raw.version_configuration)))
+        return true;
+        else
+            return false;
+    }
 }

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

@@ -1,5 +1,9 @@
 package com.xzjmyk.pm.activity.wxapi;
 
+import android.util.Log;
+
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+
 /**
  * Created by Arison on 2017/3/2.
  * 在ApiBase中定义公共方法(接口写在这里)
@@ -7,15 +11,17 @@ package com.xzjmyk.pm.activity.wxapi;
  */
 public class ApiPlatform extends ApiBase implements ApiModel {
 
+
 //     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://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="https://uas.ubtob.com/sso/login";
-   private String url_login_test = "http://113.105.74.135:8001/sso/login";
-  
-  
+//   private String url_login_test = "http://113.105.74.135:8001/sso/login";
+
+    private String mBaseUrl = "";
+    private String url_login_test = "";
    // 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";
     private String PUNCH_ADDRESS_URL = mBaseUrl + "/clockAddress/getSignCardAddress?enuu=10030994";
@@ -56,6 +62,17 @@ public class ApiPlatform extends ApiBase implements ApiModel {
          * @desc:统一不写全局变量,接口命名一律小写！父类不再用get set方法！
          * @author：Arison on 2017/3/21
          */
+        if (CommonUtil.isReleaseVersion()){
+            mBaseUrl="http://uas.ubtob.com/";
+            url_login_test="https://uas.ubtob.com/sso/login";
+            Log.i("fang",  mBaseUrl+","+url_login_test);
+        }else {
+            mBaseUrl = "http://218.17.158.219:9090/platform-b2b/"; //测试ip
+            url_login_test = "http://113.105.74.135:8001/sso/login";
+            Log.i("fang",  mBaseUrl+","+url_login_test);
+        }
+
+        initAllUrl();
         setLogin(url_login_test);
         //考勤单据
         setList_vacation(mBaseUrl + "mobile/vacation/getAllVacation");
@@ -157,5 +174,40 @@ public class ApiPlatform extends ApiBase implements ApiModel {
 
     }
 
+    private void initAllUrl() {
+        OBTAIN_ANNOUNCE_URL = mBaseUrl + "/bulletinCenter/getAllbulletins?pageNumber=1&pageSize=10&enuu=10030994";
+        PUNCH_ADDRESS_URL = mBaseUrl + "/clockAddress/getSignCardAddress?enuu=10030994";
+        TRAVEL_REQUEST_URL = mBaseUrl + "/feePlease/getFeePlease?enuu=10030994&emcode=1000003217&pageNumber=1&pageSize=10";
+        NEWS_CENTER_URL = mBaseUrl + "/newsCenter/getAllNews?pageNumber=1&pageSize=10&enuu=10030994";
+        NOTIFICATION_CENTER_URL = mBaseUrl + "/noticeCenter/getAllNotices?pageNumber=1&pageSize=10&enuu=10030994";
+
+        LEAVE_APPLICATION_URL = mBaseUrl + "/vacation/getAllVacation?emcode=1000003217&enuu=10030994&pageNumber=1&pageSize=10";
+        DAILY_WORK_URL = mBaseUrl + "/workDaily/getWorkDaily?emcode=1000003217&pageNumber=1&pageSize=10&enuu=10030994";
+        WORK_SCHEDULE_URL = mBaseUrl + "/workData/getWorkData?enuu=10030994";
+        WORK_OVERTIME_URL = mBaseUrl + "/workOvertime/getWorkOvertime?enuu=10030994&emcode=1000003217&pageNumber=1&pageSize=10";
+        WORK_ORDER_URL = mBaseUrl + "mobile/workSchedule/getWorkSchedule?enuu=10030994&emcode=1000003217";
+        SAVE_LEAVE_URL = mBaseUrl + "mobile/vacation/saveVacation";
+        SAVE_TRAVEL_URL = mBaseUrl + "mobile/feePlease/saveFeePlease";
+        SAVE_OVERTIME_URL = mBaseUrl + "mobile/workOvertime/saveWorkOvertime";
+        SIGN_GET_OFFICE_URL = mBaseUrl + "mobile/clockAddress/getSignCardAddress";
+        DELETE_PLAT_OFFICE_ADDRESS_URL = mBaseUrl + "mobile/clockAddress/deleteById";
+        GET_PLAT_SENIOR_SETTING_URL = mBaseUrl + "mobile/advancedSettings/getAdvancedSettings";
+        SAVE_PLAT_SENIOR_TIME_URL = mBaseUrl + "mobile/advancedSettings/saveAdvancedSettings";
+        SAVE_PLAT_OFFICE_ADDRESS_URL = mBaseUrl + "mobile/clockAddress/saveSignCardAddress";
+        //工作日报
+        FIRST_ADD_WORKDAILY_URL = mBaseUrl + "mobile/workDaily/saveWorkDaily";
+        DELETE_WORK_DAILY_URL = mBaseUrl + "mobile/workDaily/deleteById";
+        UPDATE_WORK_DAILY_URL = mBaseUrl + "mobile/workDaily/updateWorkDaily";
+        GETDAILY_LIST_URL = mBaseUrl + "mobile/workDaily/getWorkDaily";
+
+        //单据
+        COMMON_APP_FLOW_NODES_URL = mBaseUrl + "mobile/approvalflow/getNodesAndLog";
+        COMMON_DOC_DETAILY_URL = mBaseUrl + "mobile/detailCenter/getDetail";
+
+        //单据的领导审批操作 同意/不同意/变更处理人
+        COMMON_DOC_EXAMINE_AND_APPROVE_URL = mBaseUrl + "mobile/approvalflow/auditDocuments";
+        COMMON_DELETE_APPROVAL_FLOW_URL = mBaseUrl + "mobile/detailCenter/resubmitDocuments";  //通用删除的审批流
+    }
+
 
 }