RaoMeng 9 жил өмнө
parent
commit
d753771e3e

+ 8 - 8
WeiChat/src/main/java/com/xzjmyk/pm/activity/ApplySubscribeActivity.java

@@ -12,7 +12,7 @@ import com.andreabaccega.widget.FormEditText;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
-import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
@@ -156,13 +156,13 @@ public class ApplySubscribeActivity extends BaseActivity {
         switch (item.getItemId()) {
             case R.id.subscribe_apply:
 //                Crouton.makeText(this, "提交成功", Style.CONFIRM).show();
-                CodeUtil.getInstance().getCode(ApplySubscribeActivity.this,
-                        "SubsApply", new CodeUtil.OnCodeLinstener() {
-                            @Override
-                            public void callBack(String code) {
-                                sendApplyRequest(APPLY_SUBSCRIPTION, code);
-                            }
-                        });
+                CommonInterface.getInstance().getCodeByNet("SubsApply", new CommonInterface.OnResultListener() {
+                    @Override
+                    public void result(boolean isOk, String result, String message) {
+                        sendApplyRequest(APPLY_SUBSCRIPTION, result);
+                    }
+                });
+
                 break;
         }
         return super.onOptionsItemSelected(item);

+ 4 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessLessActivity.java

@@ -26,7 +26,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
@@ -156,10 +156,10 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
         switch (item.getItemId()) {
             case R.id.btn_save:
                 if (type == 1) {
-                    CodeUtil.getInstance().getCode(ct, "BusinessChanceData", new CodeUtil.OnCodeLinstener() {
+                    CommonInterface.getInstance().getCodeByNet("BusinessChanceData", new CommonInterface.OnResultListener() {
                         @Override
-                        public void callBack(String code) {
-                            bcd_code = code;
+                        public void result(boolean isOk, String result, String message) {
+                            bcd_code = result;
                             sendHttpResquest(Constants.HTTP_SUCCESS_INIT, "失效");
                         }
                     });

+ 4 - 5
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -24,7 +24,7 @@ import com.xzjmyk.pm.activity.bean.oa.SelectBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
@@ -185,11 +185,10 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                     String start = tv_date_start.getText().toString().trim();
                     String end = tv_date_end.getText().toString().trim();
                     if (!StringUtils.isEmpty(start) && !StringUtils.isEmpty(end) && start.compareTo(end) < 0) {
-                        CodeUtil.getInstance().getCode(ct, "VisitRecord", new CodeUtil.OnCodeLinstener() {
+                        CommonInterface.getInstance().getCodeByNet("VisitRecord", new CommonInterface.OnResultListener() {
                             @Override
-                            public void callBack(String code) {
-
-                                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, code);
+                            public void result(boolean isOk, String result, String message) {
+                                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, result);
                             }
                         });
                     } else {

+ 4 - 10
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddMeetingActivity.java

@@ -21,7 +21,6 @@ import com.xzjmyk.pm.activity.bean.oa.SelectBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
@@ -95,12 +94,6 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                                     sendHttpResquest(result);
                                 }
                             });
-//                            CodeUtil.getInstance().getCode(ct, "ProjectTask", new CodeUtil.OnCodeLinstener() {
-//                                @Override
-//                                public void callBack(String code) {
-//                                    sendHttpResquest(code);
-//                                }
-//                            });
                         } else {
                             Crouton.makeText(ct, "添加会议成功!");
                             sumitExamine();
@@ -151,13 +144,14 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.save) {
-            CodeUtil.getInstance().getCode(ct, "Meetingroomapply", new CodeUtil.OnCodeLinstener() {
+            CommonInterface.getInstance().getCodeByNet("Meetingroomapply", new CommonInterface.OnResultListener() {
                 @Override
-                public void callBack(final String code) {
-                    ma_code = code;
+                public void result(boolean isOk, String result, String message) {
+                    ma_code = result;
                     getIdByNet();
                 }
             });
+
         }
         return super.onOptionsItemSelected(item);
     }

+ 5 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SaveMeetActivity.java

@@ -18,7 +18,7 @@ import com.xzjmyk.pm.activity.bean.oa.MeetingDocBean;
 import com.xzjmyk.pm.activity.bean.oa.SelectBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
@@ -90,12 +90,13 @@ public class SaveMeetActivity extends BaseActivity {
                 case 0x16://获取id
                     if (parseObject(message).containsKey("success") && parseObject(message).getBoolean("success")) {
                         id = parseObject(message).getInteger("id");
-                        CodeUtil.getInstance().getCode(ct, "MeetingDoc", new CodeUtil.OnCodeLinstener() {
+                        CommonInterface.getInstance().getCodeByNet("MeetingDoc", new CommonInterface.OnResultListener() {
                             @Override
-                            public void callBack(String code) {
-                                saveAble(code, id);
+                            public void result(boolean isOk, String result, String message) {
+                                saveAble(result, id);
                             }
                         });
+
                     } else {
                         Crouton.makeText(ct, "获取id错误");
                     }

+ 0 - 106
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/CodeUtil.java

@@ -1,106 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.util;
-
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
-
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import static com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.ct;
-
-/**
- * 因为没有处理好内存,该类会引起内存泄露
- * Created by gongpm on 2016/8/5.
- */
-@Deprecated
-public class CodeUtil {
-    private static CodeUtil instance = null;//多次使用,转为静态
-    private static OnCodeLinstener linstener;
-
-    public static CodeUtil getInstance() {
-        if (instance == null) {
-            synchronized (CodeUtil.class) {
-                instance = new CodeUtil();
-            }
-        }
-        return instance;
-    }
-
-    //多次重复使用,采用静态方式保证内存唯一
-    private static Handler handler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            String message = msg.getData().getString("result");
-            String code = null;
-            if (msg.what == 0x11) {
-                JSONObject json = JSON.parseObject(message);
-                code = json.getString("code");
-                if (linstener != null) {
-                    linstener.callBack(code);
-                    return;
-                }
-            } else if (msg.what == 0x12) {
-                if (JSON.parseObject(message).containsKey("success") && JSON.parseObject(message).getBoolean("success")) {
-                    code = String.valueOf(JSON.parseObject(message).getInteger("id"));
-                } else {
-                    Crouton.makeText(ct, "获取id错误");
-                }
-                if (linstener != null) {
-                    linstener.callBack(code);
-                    return;
-                }
-            }
-            //TODO 容错、待修改(网络修复后)
-            if (linstener != null) {
-                linstener.callBack(code);
-            }
-        }
-    };
-
-    //外勤
-    private void getIdByNet(Context context, String sql) {
-        String url = CommonUtil.getSharedPreferences(context, "erp_baseurl") + "common/getId.action";
-        final Map<String, Object> param = new HashMap<>();
-        param.put("seq", sql);
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(context, "sessionId"));
-        com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.httpSendRequest(context, url, param, handler, headers, 0x12, null, null, "post");
-    }
-
-    //    private void
-    private void getCodeByNet(Context context, String titleName) {
-        String url = CommonUtil.getSharedPreferences(context, "erp_baseurl") + "common/getCodeString.action";
-        final Map<String, Object> param = new HashMap<>();
-        String caller = titleName;
-        param.put("caller", caller);
-        param.put("type", 2);
-        param.put("sessionId", CommonUtil.getSharedPreferences(context, "sessionId"));
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(context, "sessionId"));
-        com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.httpSendRequest(context, url, param, handler, headers, 0x11, null, null, "post");
-    }
-
-
-    private CodeUtil() {
-    }
-
-    public void getId(Context context, String sql, OnCodeLinstener linstener) {
-        this.linstener = linstener;
-        getIdByNet(context, sql);
-    }
-
-    public void getCode(Context context, String titleName, OnCodeLinstener linstener) {
-        this.linstener = linstener;
-        getCodeByNet(context, titleName);
-    }
-
-    public interface OnCodeLinstener {
-        void callBack(String code);
-    }
-}