Преглед изворни кода

提交代码保存
1.隐藏CRm2.0功能
2.修复个别bug
3.修正个别翻译

Bitliker пре 8 година
родитељ
комит
d3cc5cfcdf

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

@@ -12,11 +12,11 @@ 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.oa.CommonInterface;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 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;
-import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;
@@ -42,31 +42,30 @@ public class ApplySubscribeActivity extends BaseActivity {
     private int mAsId;
     private DBManager dbManager;
 
-    private String mEmCode,mEmName,mEmDepart,mEmPort;
+    private String mEmCode, mEmName, mEmDepart, mEmPort;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_apply_subscribe);
         getSupportActionBar().setTitle("申请订阅");
-
         initView();
         initEvent();
         initData();
     }
 
 
-    private Handler mHandler = new Handler(){
+    private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            switch (msg.what){
+            switch (msg.what) {
                 case GET_AS_ID:
                     String resultStr = msg.getData().getString("result");
                     try {
                         JSONObject resultJsonObject = new JSONObject(resultStr);
                         if (resultJsonObject != null && resultJsonObject.getBoolean("success")) {
                             mAsId = resultJsonObject.getInt("id");
-                            Log.d("apply_subscribe_id",mAsId+"");
+                            Log.d("apply_subscribe_id", mAsId + "");
                         }
                     } catch (JSONException e) {
                         e.printStackTrace();
@@ -75,10 +74,10 @@ public class ApplySubscribeActivity extends BaseActivity {
                 case APPLY_SUBSCRIPTION:
                     String saveResult = msg.getData().getString("result");
                     Log.d("apply_subscribe_save", saveResult + "");
-                    Crouton.makeText(ApplySubscribeActivity.this,"申请保存成功",Style.CONFIRM).show();
+                    Crouton.makeText(ApplySubscribeActivity.this, "申请保存成功", Style.CONFIRM).show();
                     try {
                         JSONObject saveObject = new JSONObject(saveResult);
-                        if (saveObject != null && saveObject.getBoolean("success")){
+                        if (saveObject != null && saveObject.getBoolean("success")) {
                             sendSubmitRequest();
                         }
                     } catch (JSONException e) {
@@ -88,9 +87,9 @@ public class ApplySubscribeActivity extends BaseActivity {
                 case SUBMIT_SUBSCRIPTION:
                     progressDialog.dismiss();
                     String submitResult = msg.getData().getString("result");
-                    Log.d("apply_subscrive_submit",submitResult);
-                    Crouton.makeText(ApplySubscribeActivity.this,"申请提交成功",Style.CONFIRM).show();
-                    CommonUtil.imageToast(ApplySubscribeActivity.this,R.drawable.ic_apply_submit_success,"",2000);
+                    Log.d("apply_subscrive_submit", submitResult);
+                    Crouton.makeText(ApplySubscribeActivity.this, "申请提交成功", Style.CONFIRM).show();
+                    CommonUtil.imageToast(ApplySubscribeActivity.this, R.drawable.ic_apply_submit_success, "", 2000);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
@@ -110,7 +109,7 @@ public class ApplySubscribeActivity extends BaseActivity {
         mBranchEt = (FormEditText) findViewById(R.id.apply_subscribe_branch_et);
         mReasonEt = (FormEditText) findViewById(R.id.apply_subscribe_reason_et);
 
-        CommonUtil.getCommonId(this,"SUBSAPPLY_SEQ",mHandler,GET_AS_ID);
+        CommonUtil.getCommonId(this, "SUBSAPPLY_SEQ", mHandler, GET_AS_ID);
 
         mEmCode = CommonUtil.getSharedPreferences(ct, "erp_username");
     }
@@ -131,7 +130,7 @@ public class ApplySubscribeActivity extends BaseActivity {
                 Log.i(TAG, "initData:" + model.getEM_DEPART());
                 Log.i(TAG, "initData:" + model.getEM_POSITION());
                 Log.i(TAG, "initData:" + model.getCOMPANY());
-                Log.i(TAG, "initData:" +model.getEm_IMID()  );
+                Log.i(TAG, "initData:" + model.getEm_IMID());
 
             }
             mEmName = db.get(0).getEM_NAME();
@@ -145,6 +144,7 @@ public class ApplySubscribeActivity extends BaseActivity {
         mPostEt.setText(mEmPort);
         mBranchEt.setText(mEmDepart);
     }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_apply_subscribe, menu);
@@ -158,7 +158,7 @@ public class ApplySubscribeActivity extends BaseActivity {
 //                Crouton.makeText(this, "提交成功", Style.CONFIRM).show();
                 CommonInterface.getInstance().getCodeByNet("SubsApply", new CommonInterface.OnResultListener() {
                     @Override
-                    public void result(boolean isOk, int  result, String message) {
+                    public void result(boolean isOk, int result, String message) {
                         sendApplyRequest(APPLY_SUBSCRIPTION, message);
                     }
                 });
@@ -173,9 +173,9 @@ public class ApplySubscribeActivity extends BaseActivity {
      */
     private void sendSubmitRequest() {
         String submitUrl = Constants.getAppBaseUrl(ct) + "/common/submitCommon.action";
-        Map<String,Object> params = new HashMap<>();
-        params.put("caller","SubsApply");
-        params.put("id",mAsId);
+        Map<String, Object> params = new HashMap<>();
+        params.put("caller", "SubsApply");
+        params.put("id", mAsId);
 
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -184,6 +184,7 @@ public class ApplySubscribeActivity extends BaseActivity {
 
     /**
      * 申请保存
+     *
      * @param what
      * @param code
      */
@@ -191,7 +192,7 @@ public class ApplySubscribeActivity extends BaseActivity {
         String formStore = "";
         if (mSubscribeNameEt.testValidity() && mDataEt.testValidity()
                 && mStatusEt.testValidity() && mSubscribePersonEt.testValidity()
-                && mPostEt.testValidity() && mBranchEt.testValidity()){
+                && mPostEt.testValidity() && mBranchEt.testValidity()) {
             progressDialog.show();
             formStore =
                     "{\n" +
@@ -203,9 +204,9 @@ public class ApplySubscribeActivity extends BaseActivity {
                             + "\",\n" +
                             "\"date_\":\"" + DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd")
                             + "\",\n" +
-                            "\"status_\":\"" +"在录入"
+                            "\"status_\":\"" + "在录入"
                             + "\",\n" +
-                            "\"statuscode_\":\"" +"ENTERING"
+                            "\"statuscode_\":\"" + "ENTERING"
                             + "\",\n" +
                             "\"empcode_\":\"" + mEmCode
                             + "\",\n" +
@@ -220,7 +221,7 @@ public class ApplySubscribeActivity extends BaseActivity {
                             "\"reason_\":\"" + " "
                             + "\"\n" +
                             "}";
-        }else {
+        } else {
             return;
         }
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CompanyContactsActivity.java

@@ -51,11 +51,11 @@ 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.entity.Hrorgs;
 import com.xzjmyk.pm.activity.ui.erp.entity.HrorgsEntity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 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;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.util.DisplayUtil;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ContactManAddActivity.java

@@ -15,9 +15,9 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 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.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 import com.xzjmyk.pm.activity.view.wheel.OptionPicker;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/TaskAddActivity.java

@@ -24,12 +24,12 @@ 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.activity.oa.UserSelectActivity;
 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.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/me/FeedbackActivity.java

@@ -246,7 +246,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
     }
 
     private void getCommonId() {
-        CommonUtil.getCommonId(ct, "Commentsback_mobile_SEQ", mHandler, common_id_request);
+        CommonUtil.getCommonId("http://218.18.115.198:8888/ERP/",ct, "Commentsback_mobile_SEQ", mHandler, common_id_request);
         cb_emcode = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");;
     }
 

+ 9 - 6
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/CommonUtil.java

@@ -644,9 +644,9 @@ public class CommonUtil {
         return android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED);
     }
 
-    public static boolean isBiteman(){
-        String baseUrl=getSharedPreferences(MyApplication.getInstance(),"erp_base");
-        return !StringUtils.isEmpty(baseUrl)&&baseUrl.contains("http://202.104.151.184:8099/ERP/");
+    public static boolean isBiteman() {
+        String baseUrl = getSharedPreferences(MyApplication.getInstance(), "erp_base");
+        return !StringUtils.isEmpty(baseUrl) && baseUrl.contains("http://202.104.151.184:8099/ERP/");
     }
 
     /**
@@ -986,15 +986,18 @@ public class CommonUtil {
     }
 
     public static void getCommonId(Context ct, String seq, Handler mHandler, int codeWhat) {
-        String url = "http://218.18.115.198:8888/ERP/common/getId.action";
+        getCommonId(Constants.getAppBaseUrl(ct), ct, seq, mHandler, codeWhat);
+    }
+
+    public static void getCommonId(String action, Context ct, String seq, Handler mHandler, int codeWhat) {
+        String url = action + "/common/getId.action";
         final Map<String, Object> param = new HashMap<>();
         param.put("seq", seq);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, param, mHandler, headers, codeWhat, null, null, "post");
+        com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.httpSendRequest(ct, url, param, mHandler, headers, codeWhat, null, null, "post");
     }
 
-
     /**
      * 判断某个界面是否在前台
      *

+ 3 - 45
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/ViewUtil.java

@@ -17,23 +17,14 @@ 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 Administrator on 2016/1/30.
  */
+@Deprecated
 public class ViewUtil {
 
-    //TODO 待采用更好的方式处理 定义的属性太多了
-    private static boolean isNetByHandler = false;//判断是否是经过重登录后的请求
-    private static String url;
-    private static Context ct;
-    private static Handler h;
-    private static Map<String, Object> params;
-    private static LinkedHashMap<String, Object> headers;
-    private static int what;
-    private static Message message;
-    private static Bundle bundle;
-    private static String request;
-
     public static HttpUtil.Response httpSendTask(
             String url,
             Map<String, Object> params,
@@ -53,40 +44,7 @@ public class ViewUtil {
         return response;
     }
 
-    private Handler handler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            if (msg.what == 500) {//重登陆
-                LoginERPTask();
-            } else if (msg.what == 0x11) {
-                //判断登陆成功
-                if (msg.getData() != null && com.xzjmyk.pm.activity.util.StringUtils.isEmpty(msg.getData().getString("result"))) {
-                    JsonValidator jva = new JsonValidator();
-                    String json = msg.getData().getString("result");
-                    if (jva.validate(json)) {
-                        if (JSON.parseObject(json).containsKey("success") && JSON.parseObject(json).getBoolean("success")) {
-                            isNetByHandler = true;
-                            httpSendRequest(ct, url, params, handler, headers, what, message, bundle, request);
-                        }
-                    }
-                }
-            }
-        }
-    };
 
-    // 登录ERP gongpengming
-    public void LoginERPTask() {
-        Context ct = MyApplication.getInstance();
-        String url = Constants.getAppBaseUrl(ct) + "mobile/login.action";
-        String master = CommonUtil.getSharedPreferences(ct, "erp_master");
-        String phone = CommonUtil.getSharedPreferences(ct, "user_phone");
-        String password = CommonUtil.getSharedPreferences(ct, "user_password");
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("username", phone);
-        params.put("password", password);
-        params.put("master", master);
-        com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.startNetThread(url, params, handler, 0x11, null, null, "post");
-    }
 
     /**
      * @author Administrator

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/OAConfig.java

@@ -26,6 +26,6 @@ public class OAConfig {
 
     /*是否显示Crm2.0功能*/
     public static boolean canShowCrm2_0() {
-        return false;
+        return true;
     }
 }

+ 1 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/AutoCreateChatFragment.java

@@ -51,7 +51,6 @@ 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;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
@@ -625,8 +624,7 @@ public class AutoCreateChatFragment extends EasyFragment {
         params.put("sessionId", CommonUtil.getSharedPreferences(mContext, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(mContext, "sessionId"));
-        com.xzjmyk.pm.activity.ui.erp.util.ViewUtil.httpSendRequest(
-                mContext, url, params, handler, headers, 1, null, null, "get");
+        ViewUtil.httpSendRequest(mContext, url, params, handler, headers, 1, null, null, "get");
     }
 
     private Handler handler = new Handler() {

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

@@ -39,7 +39,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
+import  com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.MasterDialog;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
@@ -133,7 +133,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                                 Master.class);
                         getChMaster(mList);
                     } else {
-                        ViewUtil.ShowMessageFDialogAutoDismiss(ct, "获取账套信息失败!", 2000);
+                        ToastUtil.showToast(ct, "获取账套信息失败!");
                     }
                     break;
                 case 2://切换账套
@@ -165,7 +165,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                     Map<String, Object> results = FlexJsonUtil.fromJson(msg
                             .getData().getString("result"));
                     if ((Boolean) results.get("success")) {
-                        com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.ToastMessage(ct, "账套切换成功!", Style.holoGreenLight, 3000);
+                       ViewUtil.ToastMessage(ct, "账套切换成功!", Style.holoGreenLight, 3000);
                         String sessionId = results.get("sessionId").toString();
                         String master = msg.getData().getString("master");
                         String master_ch = msg.getData().getString("master_ch");

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/ChatActivity.java

@@ -47,8 +47,8 @@ import com.xzjmyk.pm.activity.helper.UploadEngine;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.circle.SendBaiDuLocate;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.me.LocalVideoActivity;
 import com.xzjmyk.pm.activity.util.CameraUtil;
 import com.xzjmyk.pm.activity.util.Constants;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MucChatActivity.java

@@ -47,7 +47,7 @@ import com.xzjmyk.pm.activity.helper.UploadEngine;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.circle.SendBaiDuLocate;
-import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.me.LocalVideoActivity;
 import com.xzjmyk.pm.activity.util.CameraUtil;
 import com.xzjmyk.pm.activity.util.Constants;

+ 1 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/RoomInfoActivity.java

@@ -1213,8 +1213,7 @@ public class RoomInfoActivity extends BaseActivity {
         params.put("sessionId", CommonUtil.getSharedPreferences(mContext, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(mContext, "sessionId"));
-        com.xzjmyk.pm.activity.ui.erp.util.ViewUtil.httpSendRequest(
-                mContext, url, params, handler, headers, 1, null, null, "get");
+        ViewUtil.httpSendRequest(mContext, url, params, handler, headers, 1, null, null, "get");
     }
 
     private Handler handler = new Handler() {