修改关于许多通用的接口 oa方面

WeiChat/src/main/AndroidManifest.xml

@@ -743,7 +743,7 @@
         </receiver>
         <!-- 在百度开发者中心查询应用的API Key -->
 
-        <receiver android:name=".ui.erp.util.auto.DateTimeReceiver" >
+        <receiver android:name=".ui.erp.util.oa.DateTimeReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.DATE_CHANGED" />
             </intent-filter>
@@ -781,7 +781,7 @@
             android:label="@string/activity_signing" />
 
         <service
-            android:name=".ui.erp.util.auto.AutoErpService"
+            android:name=".ui.erp.util.oa.AutoErpService"
             android:enabled="true"
             android:exported="true" />
 

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.CommonInterface;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.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;
@@ -158,8 +158,8 @@ public class ApplySubscribeActivity extends BaseActivity {
 //                Crouton.makeText(this, "提交成功", Style.CONFIRM).show();
                 CommonInterface.getInstance().getCodeByNet("SubsApply", new CommonInterface.OnResultListener() {
                     @Override
-                    public void result(boolean isOk, String result, String message) {
-                        sendApplyRequest(APPLY_SUBSCRIPTION, result);
+                    public void result(boolean isOk, int  result, String message) {
+                        sendApplyRequest(APPLY_SUBSCRIPTION, message);
                     }
                 });
 

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

@@ -48,7 +48,7 @@ import com.xzjmyk.pm.activity.ui.contact.ContactFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.AutoErpService;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.AutoErpService;
 import com.xzjmyk.pm.activity.ui.find.MyFriendFragment;
 import com.xzjmyk.pm.activity.ui.groupchat.GroupChatFragment;
 import com.xzjmyk.pm.activity.ui.me.MeFragment;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/ContactFragment.java

@@ -5,6 +5,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -20,7 +22,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.iflytek.cloud.speech.RecognizerResult;
 import com.iflytek.cloud.speech.SpeechError;
@@ -50,12 +51,13 @@ 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.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.CommonInterface;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.CompanyHandlerInfoUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
 import com.xzjmyk.pm.activity.ui.tool.ThreadPool;
-import com.xzjmyk.pm.activity.util.CompanyHandlerInfoUtil;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;
@@ -288,7 +290,9 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
                     HttpHandler.getInstance().post(new Runnable() {
                         @Override
                         public void run() {
-                            loadFriendsByNet();
+                            loadFriendsNet();
+                            //TODO 测试先隐藏
+//                            loadFriendsByNet();
                         }
                     });
                 else
@@ -440,6 +444,31 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         }
     }
 
+    private void loadFriendsNet() {
+        CommonInterface.getInstance().loadCompanyData(new CommonInterface.OnResultListener() {
+            @Override
+            public void result(@NonNull boolean success, @NonNull int what, @Nullable String message) {
+                try {
+                    if (success) {
+                        boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
+                        JSONObject object = JSON.parseObject(message);
+                        List<BaseSortModel<Friend>> chche = null;
+                        if (isB2b) {
+                            chche = getFriendsByErpDB(CompanyHandlerInfoUtil.getEmployeesByB2b(object));
+                        } else {
+                            List<EmployeesEntity> entities = CompanyHandlerInfoUtil.getEmployeesByNet(object);
+                            chche = getFriendsByErpDB(entities);
+                        }
+                        if (!ListUtils.isEmpty(chche))
+                            loadDataInThread(chche);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
     @Override
     public void onClick(View view) {
         Intent intent = null;
@@ -485,8 +514,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
                 boolean isB2b = bundle.getBoolean("isB2b");
                 List<BaseSortModel<Friend>> chche = null;
                 if (isB2b) {
-                    if (object.containsKey("data") && object.get("data") instanceof JSONArray)
-                        chche = getFriendsByErpDB(CompanyHandlerInfoUtil.getEmployeesByB2b(object.getJSONArray("data")));
+                    chche = getFriendsByErpDB(CompanyHandlerInfoUtil.getEmployeesByB2b(object));
                 } else {
                     List<EmployeesEntity> entities = CompanyHandlerInfoUtil.getEmployeesByNet(object);
                     chche = getFriendsByErpDB(entities);

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.CommonInterface;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.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;
@@ -143,8 +143,8 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                 if (type == 1) {
                     CommonInterface.getInstance().getCodeByNet("BusinessChanceData", new CommonInterface.OnResultListener() {
                         @Override
-                        public void result(boolean isOk, String result, String message) {
-                            bcd_code = result;
+                        public void result(boolean isOk, int result, String message) {
+                            bcd_code = message;
                             sendHttpResquest(Constants.HTTP_SUCCESS_INIT, "失效");
                         }
                     });

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -33,7 +33,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectAimActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.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;
@@ -56,7 +56,7 @@ import java.util.Map;
 /**
  * 拜访报告页面
  */
-public class VisitReportAddActivity extends BaseActivity implements View.OnClickListener,RecognizerDialogListener {
+public class VisitReportAddActivity extends BaseActivity implements View.OnClickListener, RecognizerDialogListener {
 
     private static final int LOAD_JIEDUAN = 67;
     @ViewInject(R.id.tv_address_login)
@@ -172,7 +172,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         } else if (type == 2) {
             String chche = getIntent().getStringExtra("data");
             JSONObject object = JSON.parseObject(chche);
-            LogUtil.prinlnLongMsg("flhplan",object.toString());
+            LogUtil.prinlnLongMsg("flhplan", object.toString());
             tv_date_start.setText(getJSONString(object, "vr_visittime"));
             tv_date_end.setText(getJSONString(object, "vr_visitend"));
             tv_customer_login.setText(getJSONString(object, "custname"));
@@ -180,6 +180,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             tv_address_login.setText(getJSONString(object, "address"));
             tv_visit_theme.setText(getJSONString(object, "vr_title"));
             tv_visit_steps.setText(getJSONString(object, "vr_nichestep"));
+            tv_visit_type.setText(getJSONString(object, "vr_class"));
 //            if (getJSONString(object,"vr_detail").contains("<div")){
 //                tv_visit_content.setText(Html.fromHtml(getJSONString(object, "vr_detail")));
 //            }else {
@@ -239,30 +240,30 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                     String start = tv_date_start.getText().toString().trim();
                     String end = tv_date_end.getText().toString().trim();
                     String current = TimeUtils.f_long_2_str(System.currentTimeMillis());
-                    if (!StringUtils.isEmpty(start)&&!StringUtils.isEmpty(end)){
+                    if (!StringUtils.isEmpty(start) && !StringUtils.isEmpty(end)) {
 //                        if (current.compareTo(end) < 0) {
 //                            Crouton.makeText(ct, "截止时间不能大于当前时间");
 //                        } else
                         if (start.compareTo(end) < 0) {
                             CommonInterface.getInstance().getCodeByNet("VisitRecord", new CommonInterface.OnResultListener() {
                                 @Override
-                                public void result(boolean isOk, String result, String message) {
-                                    sendHttpResquest(Constants.HTTP_SUCCESS_INIT, result);
+                                public void result(boolean isOk, int  result, String message) {
+                                    sendHttpResquest(Constants.HTTP_SUCCESS_INIT, message);
                                 }
                             });
                         } else {
                             Crouton.makeText(ct, R.string.end_less_start);
                         }
-                    }else{
+                    } else {
                         CommonInterface.getInstance().getCodeByNet("VisitRecord", new CommonInterface.OnResultListener() {
                             @Override
-                            public void result(boolean isOk, String result, String message) {
-                                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, result);
+                            public void result(boolean isOk, int result, String message) {
+                                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, message);
                             }
                         });
 //                        ToastMessage("开始时间和截止时间不能为空");
                     }
-                    
+
                 } else
                     Crouton.makeText(ct, "网络连接错误，请检查网络");
                 break;
@@ -554,7 +555,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
 
                 break;
             case R.id.voice_search_iv:
-                final VoiceToWord voice = new VoiceToWord(VisitReportAddActivity.this,"534e3fe2");
+                final VoiceToWord voice = new VoiceToWord(VisitReportAddActivity.this, "534e3fe2");
                 voice.setRecognizerDialogListener(this);  //自己调用自己
                 voice.GetWordFromVoice();
                 break;
@@ -728,6 +729,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         String text = JsonParser.parseIatResult(recognizerResult.getResultString());
         tv_visit_content.setText(tv_visit_content.getText().toString() + CommonUtil.getPlaintext(text));
     }
+
     @Override
     public void onError(SpeechError speechError) {
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -32,6 +32,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SelectBean;
@@ -710,7 +711,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
     public boolean onPrepareOptionsMenu(Menu menu) {
         if (CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(),"erp_master")
                 .equals("USOFTSYS")){
-            if ( PreferenceUtils.getBoolean("isAdmin", false)){
+            if ( PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false)){
                 menu.findItem(R.id.oa_signin_set).setVisible(true);
             }else {
                 menu.findItem(R.id.oa_signin_set).setVisible(false);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddMeetingActivity.java

@@ -26,7 +26,7 @@ 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.CommonInterface;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.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;
@@ -96,8 +96,8 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                             Crouton.makeText(ct, "添加会议成功，正在为会议成员创建日程");
                             CommonInterface.getInstance().getCodeByNet("ProjectTask", new CommonInterface.OnResultListener() {
                                 @Override
-                                public void result(boolean isOk, String result, String message) {
-                                    sendHttpResquest(result);
+                                public void result(boolean isOk, int what, String message) {
+                                    sendHttpResquest(message);
                                 }
                             });
                         } else {
@@ -153,8 +153,8 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         if (item.getItemId() == R.id.save) {
             CommonInterface.getInstance().getCodeByNet("Meetingroomapply", new CommonInterface.OnResultListener() {
                 @Override
-                public void result(boolean isOk, String result, String message) {
-                    ma_code = result;
+                public void result(boolean isOk, int  what, String message) {
+                    ma_code = message;
                     getIdByNet();
                 }
             });

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MissionSetActivity.java

@@ -15,7 +15,7 @@ import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SelectBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -54,7 +54,7 @@ import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OAListAdapter;
 import com.xzjmyk.pm.activity.ui.erp.fragment.CalendarFragmet;
 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.CommonInterface;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.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;
@@ -217,7 +217,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                                 if (StringUtils.isEmpty(isAdmin)) return;
                                 try {
                                     adminStatus = Integer.valueOf(isAdmin);
-                                    PreferenceUtils.putBoolean("isAdmin", adminStatus == 1);
+                                    PreferenceUtils.putBoolean(AppConfig.IS_ADMIN, adminStatus == 1);
                                 } catch (Exception e) {
                                 }
                             }
@@ -548,7 +548,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         if (adminStatus == -1) {
             judgeManager();
         }
-        CommonInterface.getInstance().saveOutSetInfo(null);
+        CommonInterface.getInstance().getOutSetInfo(null);
         int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_FUNCTION_NOTICE);
         if (new_function_notice == 1) {
             oamain_sign_statistical_notice_tv.setVisibility(View.INVISIBLE);
@@ -902,7 +902,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
             case R.id.signin://打卡签到
 //                startActivity(new Intent(activity, SigninActivity.class));
                 intent = new Intent(activity, WorkActivity.class);
-                boolean isAdmin = PreferenceUtils.getBoolean("isAdmin", false);
+                boolean isAdmin = PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false);
                 intent.putExtra(AppConfig.IS_ADMIN, isAdmin);//上传管理员状态
                 startActivity(intent);
                 break;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OutSigninOKActivity.java

@@ -39,12 +39,12 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-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;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.CommonInterface;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.AndroidUtils;
 import com.xzjmyk.pm.activity.util.CameraUtil;
@@ -493,14 +493,14 @@ public class OutSigninOKActivity extends BaseActivity {
         } else
             CommonInterface.getInstance().getIdByNet("MOBILE_OUTSIGN_SEQ", new CommonInterface.OnResultListener() {
                 @Override
-                public void result(boolean isOk, String result, String message) {
+                public void result(boolean isOk, int  what, String message) {
                     try {
-                        if (isOk && !StringUtils.isEmpty(result) && isNum(result))
-                            mo_id = Integer.valueOf(result);
+                        if (isOk && !StringUtils.isEmpty(message) && isNum(message))
+                            mo_id = Integer.valueOf(message);
                         CommonInterface.getInstance().getCodeByNet("MOBILE_OUTSIGN", new CommonInterface.OnResultListener() {
                             @Override
-                            public void result(boolean isOk, String result, String message) {
-                                doSignin(result, mo_id, id);
+                            public void result(boolean isOk, int what, String message) {
+                                doSignin(message, mo_id, id);
                             }
                         });
                     } catch (ClassCastException e) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OutofficeSetActivity.java

@@ -19,7 +19,7 @@ import com.xzjmyk.pm.activity.AppConfig;
 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.CommonInterface;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
@@ -215,7 +215,7 @@ public class OutofficeSetActivity extends BaseActivity {
         final int time = PreferenceUtils.getInt(AppConfig.AUTO_MISSION_TIME, 30);
         CommonInterface.getInstance().addOutSet(distance, time, isAuto, new CommonInterface.OnResultListener() {
             @Override
-            public void result(boolean isOk, String result, String message) {
+            public void result(boolean isOk, int result, String message) {
                 if (isOk && isAuto) {
                     Intent intent = new Intent(ct, MissionActivity.class);
                     intent.putExtra("flag", 2);

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.CommonInterface;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.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;
@@ -92,8 +92,8 @@ public class SaveMeetActivity extends BaseActivity {
                         id = parseObject(message).getInteger("id");
                         CommonInterface.getInstance().getCodeByNet("MeetingDoc", new CommonInterface.OnResultListener() {
                             @Override
-                            public void result(boolean isOk, String result, String message) {
-                                saveAble(result, id);
+                            public void result(boolean isOk, int  result, String message) {
+                                saveAble(message, id);
                             }
                         });
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectDepartmentActivity.java

@@ -26,12 +26,12 @@ import com.xzjmyk.pm.activity.ui.erp.model.oa.EmployeesModel;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.ui.erp.view.tree.MyTreeListViewAdapter;
 import com.xzjmyk.pm.activity.ui.erp.view.tree.Node;
 import com.xzjmyk.pm.activity.ui.erp.view.tree.TreeListViewAdapter;
 import com.xzjmyk.pm.activity.ui.erp.view.tree.bean.HrorgsModel;
-import com.xzjmyk.pm.activity.util.CompanyHandlerInfoUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.CompanyHandlerInfoUtil;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectRemarkActivity.java

@@ -26,7 +26,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.view.RecycleViewDivider;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/oa/WorkAdapter.java

@@ -19,7 +19,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.AutoMemoryUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.AutoMemoryUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/AttendanceFragment.java

@@ -22,10 +22,10 @@ import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.ui.erp.view.oacalender.CalenderView;
 import com.xzjmyk.pm.activity.util.TimeUtils;
-import com.xzjmyk.pm.activity.util.WorkHandlerUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.WorkHandlerUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/AttendancesFragment.java

@@ -20,7 +20,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.TeamsAttShowActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.MyListView;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/AddFlihtsPresenter.java

@@ -19,7 +19,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 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.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.ui.erp.view.tree.bean.HrorgsModel;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/FlightsPresernter.java

@@ -15,7 +15,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 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.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/MessagePresenter.java

@@ -31,7 +31,7 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMessageView;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 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.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
 import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/MissionPresenter.java

@@ -17,11 +17,11 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMissionPresenter;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.AutoErpService;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.AutoErpService;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
-import com.xzjmyk.pm.activity.util.WorkHandlerUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.WorkHandlerUtil;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SelectAimPresenter.java

@@ -18,7 +18,7 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectAim;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SelectCollisionPresenter.java

@@ -20,7 +20,7 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectActiveView;
 import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 
 import java.util.ArrayList;
 import java.util.Collections;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SubscriptionPresenter.java

@@ -12,7 +12,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISubscriptionView;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/WorkPresenter.java

@@ -3,6 +3,8 @@ package com.xzjmyk.pm.activity.ui.erp.presenter;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
@@ -24,15 +26,15 @@ import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkLocationModel;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IWorkPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IWorkView;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
-import com.xzjmyk.pm.activity.util.WorkHandlerUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.WorkHandlerUtil;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
@@ -48,7 +50,7 @@ import static com.xzjmyk.pm.activity.util.BaiduMapUtil.getInstence;
  * 班次的管理器,先不处理数据库数据
  * Created by Bitliker on 2016/12/12.
  */
-public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresenter {
+public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresenter  {
     private final int WORK_LOG = 0x12;
     private final int WORK_DATA = 0x11;
     private final int MAC_VAL = 0x13;
@@ -79,6 +81,7 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
     private boolean isB2b;
 
     public WorkPresenter(IWorkView iWorkView, String macAddress) {
+        if (iWorkView == null) new NullPointerException("iWorkView is cann't be null ");
         this.iWorkView = iWorkView;
         this.macAddress = macAddress;
     }
@@ -592,8 +595,8 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
                             JSON.parseObject(message).getBoolean("success")) {
                         CommonInterface.getInstance().getCodeByNet("CardLog", new CommonInterface.OnResultListener() {
                             @Override
-                            public void result(boolean isOk, String result, String message) {
-                                signinWork(bundle, result);
+                            public void result(boolean isOk, int result, String message) {
+                                signinWork(bundle, message);
                             }
                         });
                     }
@@ -665,6 +668,7 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
         }
     }
 
+
     public void showMyRele(Intent intent, List<WorkModel> models) {
         if (models instanceof ArrayList)
             intent.putParcelableArrayListExtra("data", (ArrayList<WorkModel>) models);
@@ -672,4 +676,6 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
         intent.putExtra("day", days);
         intent.putExtra("name", name);
     }
+
+
 }

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

@@ -16,30 +16,54 @@ public class OACheckUtil {
      * 通过json数据到TextView中，防止为空
      *
      * @param object
-     * @param key
+     * @param keys
      * @return
      */
-    public static String getJson2Text(JSONObject object, String key) {
-        if (object == null || !object.containsKey(key) || StringUtils.isEmpty(object.getString(key)))
-            return "";
-        return object.getString(key);
+    public static String getJson2Text(JSONObject object, String... keys) {
+        if (object == null || keys == null || keys.length <= 0) return "";
+        for (String key : keys) {
+            if (!object.containsKey(key) || StringUtils.isEmpty(object.getString(key)))
+                continue;
+            return object.getString(key);
+        }
+        return "";
     }
 
     /**
      * 获取json数据的int类型，因为接口经常返回一个null
      *
      * @param object
-     * @param key
+     * @param keys
      * @return
      */
-    public static int getJsonIntager(JSONObject object, String key) {
-        if (object == null || !object.containsKey(key) || object.get(key) == null)
-            return 0;
-        if (object.getInteger(key) instanceof Integer)
-            return object.getInteger(key);
+    public static int getJsonIntager(JSONObject object, String... keys) {
+        if (object == null || keys == null || keys.length <= 0) return 0;
+        for (String key : keys) {
+            if (!object.containsKey(key) || object.get(keys) == null)
+                continue;
+            if (object.getInteger(key) instanceof Integer)
+                return object.getInteger(key);
+        }
         return 0;
     }
 
+    /**
+     * 获取json数据的int类型，因为接口经常返回一个null
+     *
+     * @param object
+     * @param keys
+     * @return
+     */
+    public static boolean getJsonBoolean(JSONObject object, String... keys) {
+        if (object == null || keys == null || keys.length <= 0) return false;
+        for (String key : keys) {
+            if (!object.containsKey(key) || object.get(keys) == null)
+                continue;
+            if (object.getInteger(key) instanceof Integer)
+                return object.getBooleanValue(key);
+        }
+        return false;
+    }
 
     /**
      * 移除StringBuilder的最后一位

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.util.auto;
+package com.xzjmyk.pm.activity.ui.erp.util.oa;
 
 import android.app.Service;
 import android.content.BroadcastReceiver;
@@ -23,7 +23,6 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
-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.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
@@ -333,7 +332,6 @@ public class AutoErpService extends Service {
     }
 
 
-
     /**
      * 初始化数据库,1.清空昨天数据  2.缓存当天数据
      */
@@ -369,10 +367,10 @@ public class AutoErpService extends Service {
 
     /*初始化外勤 */
     private void initMission() {
-        CommonInterface.getInstance().saveOutSetInfo(new CommonInterface.OnResultListener() {
+        CommonInterface.getInstance().getOutSetInfo(new CommonInterface.OnResultListener() {
             @Override
-            public void result(boolean isOk, String result, String message) {
-                if (isOk && !"0".equals(result)) {//外勤计划为打卡
+            public void result(boolean isOk, int result, String message) {
+                if (isOk) {//外勤计划为打卡
                     canMission = true;
                     signinUitl.loadMissionPlan();
                 } else {

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.util.auto;
+package com.xzjmyk.pm.activity.ui.erp.util.oa;
 
 import android.content.Context;
 import android.content.Intent;
@@ -25,7 +25,6 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.MissionActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
-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.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
@@ -35,7 +34,6 @@ import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.MacAndIDUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
-import com.xzjmyk.pm.activity.util.WorkHandlerUtil;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
@@ -46,7 +44,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.xzjmyk.pm.activity.ui.erp.util.CommonUtil.getSharedPreferences;
-import static com.xzjmyk.pm.activity.ui.erp.util.auto.AutoErpService.CHANGE_WORK_TASK;
+import static com.xzjmyk.pm.activity.ui.erp.util.oa.AutoErpService.CHANGE_WORK_TASK;
 
 /**
  * 负责签到   内外勤
@@ -389,8 +387,8 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                         //TODo 修改接口回调
                         CommonInterface.getInstance().getCodeByNet("CardLog", new CommonInterface.OnResultListener() {
                             @Override
-                            public void result(boolean isOk, String result, String message) {
-                                signinWork(bundle, result);
+                            public void result(boolean isOk, int  result, String message) {
+                                signinWork(bundle, message);
                             }
                         });
                     }

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.util.auto;
+package com.xzjmyk.pm.activity.ui.erp.util.oa;
 
 /**
  * 自动打卡变量集合

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

@@ -1,34 +1,45 @@
-package com.xzjmyk.pm.activity.ui.erp.util;
+package com.xzjmyk.pm.activity.ui.erp.util.oa;
 
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil.getJsonIntager;
+
 /**
+ * 公用接口封装类
  * Created by Bitliker on 2016/12/30.
  */
 public class CommonInterface implements HttpHandler.OnResultListener {
-    private final int CODE_WHAT = 0x11;//获取code
-    private final int ID_WHAT = 0x12;//获取id
-    private final int OUT_SET_WHAT = 0x13;//获取
-    private final int ADD_OUT_SET_WHAT = 0x14;//外勤设置
-
     private static CommonInterface instance;
 
+    public static final int CODE_WHAT = 0x11;//获取code
+    public static final int ID_WHAT = 0x12;//获取id
+    public static final int OUT_SET_WHAT = 0x13;//获取外勤设置
+    public static final int ADD_OUT_SET_WHAT = 0x14;//外勤设置
+    public static final int LOAD_COMPANY_WHAT = 0x15;//外勤设置
+    public static final int ISMAIN_WHAT = 0x16;//是否管理员
+    public static final int LOAD_CONFIG_WHAT = 0x17;//获取高级设置
+    public static final int WORK_DATA_WHAT = 0x18;//获取班次接口
+    public static final int WORK_LOG_WHAT = 0x19;//获取班次打卡记录接口
+
     public static CommonInterface getInstance() {
         if (instance == null) {
             synchronized (CommonInterface.class) {
@@ -40,44 +51,43 @@ public class CommonInterface implements HttpHandler.OnResultListener {
 
 
     /**
-     * 获取服务端表的编号
+     * 获取服务端表的id
      *
-     * @param titleName        表名
+     * @param sql              表名+"_sql"
      * @param onResultListener 回调
      */
-    public void getCodeByNet(String titleName, OnResultListener onResultListener) {
+    public void getIdByNet(String sql, OnResultListener onResultListener) {
         Map<String, Object> param = new HashMap<>();
-        param.put("caller", titleName);
-        param.put("type", 2);
-        net(CODE_WHAT, "common/getCodeString.action", param, onResultListener);
+        param.put("seq", sql);
+        net(false, ID_WHAT, "common/getId.action", param, new Bundle(), onResultListener, true);
     }
 
     /**
-     * 获取服务端表的id
+     * 获取服务端表的编号
      *
-     * @param sql              表名+"_sql"
+     * @param titleName        表名
      * @param onResultListener 回调
      */
-    public void getIdByNet(String sql, OnResultListener onResultListener) {
+    public void getCodeByNet(String titleName, OnResultListener onResultListener) {
         Map<String, Object> param = new HashMap<>();
-        param.put("seq", sql);
-        net(ID_WHAT, "common/getId.action", param, onResultListener);
+        param.put("caller", titleName);
+        param.put("type", 2);
+        net(false, CODE_WHAT, "common/getCodeString.action", param, new Bundle(), onResultListener, true);
     }
 
+
     /**
      * 获取外勤设置，判断是否是
      *
      * @param onResultListener 回调
      */
-    public void saveOutSetInfo(OnResultListener onResultListener) {
+    public void getOutSetInfo(OnResultListener onResultListener) {
         boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         if (!isB2b)
-            net(OUT_SET_WHAT, "mobile/getOutSetInfo.action", new HashMap<String, Object>(), onResultListener);
+            net(isB2b, OUT_SET_WHAT, "mobile/getOutSetInfo.action", new HashMap<String, Object>(), new Bundle(), onResultListener, true);
         else {
-            Bundle bundle = new Bundle();
-            bundle.putSerializable("onResultListener", onResultListener);
             String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getOutSet;
-            HttpHandler.getInstance().loadB2BByNet(OUT_SET_WHAT, url, new HashMap<String, Object>(), bundle, this, "get");
+            net(isB2b, OUT_SET_WHAT, url, new HashMap<String, Object>(), new Bundle(), onResultListener, true);
         }
     }
 
@@ -92,102 +102,199 @@ public class CommonInterface implements HttpHandler.OnResultListener {
      */
     public void addOutSet(int distance, int time, boolean isAuto, OnResultListener onResultListener) {
         boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
-
         Map<String, Object> param = new HashMap<>();
-        param.put("caller", "OUTSET");
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> formStore = new HashMap<>();
         if (isB2b) {
-            map.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
-            map.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
-        }
-        map.put("mo_distance", distance);//距离
-        map.put("mo_time", time);//预留时间
-        map.put("mo_autosign", isAuto ? 1 : 0);//是否自动外勤
-        param.put("formStore", StringUtils.mapToJson(map));
+            formStore.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
+            formStore.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
+        } else param.put("caller", "OUTSET");
+
+        formStore.put("mo_distance", distance);//距离
+        formStore.put("mo_time", time);//预留时间
+        formStore.put("mo_autosign", isAuto ? 1 : 0);//是否自动外勤
+        param.put("formStore", StringUtils.mapToJson(formStore));
         if (isB2b) {
-            Bundle bundle = new Bundle();
-            bundle.putSerializable("onResultListener", onResultListener);
             String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().saveOutSet;
-            HttpHandler.getInstance().loadB2BByNet(ADD_OUT_SET_WHAT, url, param, bundle, this);
+            net(isB2b, ADD_OUT_SET_WHAT, url, param, new Bundle(), onResultListener, false);
         } else {
-            net(ADD_OUT_SET_WHAT, "mobile/addOutSet.action", param, onResultListener);
+            net(isB2b, ADD_OUT_SET_WHAT, "mobile/addOutSet.action", param, new Bundle(), onResultListener, false);
         }
     }
 
-    void net(int waht, String action, Map<String, Object> param, OnResultListener onResultListener) {
+    /**
+     * 获取企业架构数据
+     *
+     * @param onResultListener
+     */
+    public void loadCompanyData(OnResultListener onResultListener) {
+        String master = CommonUtil.getMaster();
+        Map<String, Object> param = new HashMap<>();
+        param.put("master", master);
+        param.put("lastdate", "");
+        Bundle bundle = new Bundle();
+        boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
+        bundle.putBoolean("isB2b", isB2b);
+        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getUsersInfo : "mobile/getAllHrorgEmps.action";
+        net(isB2b, LOAD_COMPANY_WHAT, url, param, bundle, onResultListener, true);
+
+    }
+
+
+    //判断是否管理员
+    private void judgeManager(OnResultListener onResultListener) {
+        Map<String, Object> param = new HashMap<>();
+        boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
+        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getUserInfo : "mobile/ifadmin.action";
+        param.put("emcode", CommonUtil.getEmcode());
+        net(isB2b, ISMAIN_WHAT, url, param, new Bundle(), onResultListener, true);
+    }
+
+    //获取高级设置数据
+    public void loadConfigs(OnResultListener onResultListener) {
+        //获取考勤高级设置时间请求
+        boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
+        Map<String, Object> param = new HashMap<>();
+        if (!isB2b)
+            param.put("code", 1);
+        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().get_plat_senior_setting_url : "/mobile/getconfigs.action";
+        net(isB2b, LOAD_CONFIG_WHAT, url, param, null, onResultListener, true);
+    }
+
+    //获取班次数据
+    private void loadWorkData(long time, OnResultListener onResultListener) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("date", TimeUtils.int_long_2_str(time));
         Bundle bundle = new Bundle();
+        bundle.putLong("time", time);
+        boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
+        if (!isB2b)
+            param.put("emcode", CommonUtil.getEmcode());
+        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_schedule_url : "mobile/getWorkDate.action";
+        net(isB2b, WORK_DATA_WHAT, url, param, bundle, onResultListener, true);
+    }
+
+    //获取打卡数据
+    private void loadLog(ArrayList<WorkModel> models, Bundle bundle) {
+        long time = 0;
+        if (bundle == null) bundle = new Bundle();
+        else time = bundle.getLong("time");
+        if (time == 0)
+            time = System.currentTimeMillis();
+        String date = TimeUtils.s_long_2_str(time);
+        Map<String, Object> param = new HashMap<>();
+        String code = CommonUtil.getEmcode();
+        param.put("currentMaster", CommonUtil.getMaster());
+        boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
+        if (isB2b)
+            param.put("pageNumber", 1);
+        else
+            param.put("page", 1);
+        param.put("pageSize", 100);
+        if (!isB2b)
+            param.put("condition", "cl_emcode='" + code + "' and to_char(cl_time,'yyyy-MM-dd')='" + date + "'");
+        else
+            param.put("date", TimeUtils.long2str(time, "yyyyMMdd"));
+        param.put("caller", "CardLog");
+        param.put("emcode", code);
+        param.put("master", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));
+        bundle.putParcelableArrayList("models", models);
+        bundle.putLong("time", time);
+        if (isB2b) {
+            String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_record_url;
+            HttpHandler.getInstance().loadB2BByNet(WORK_LOG_WHAT, url, param, bundle, this, "get");
+        } else
+            HttpHandler.getInstance().loadERPByNet(WORK_LOG_WHAT, "mobile/oa/workdata.action", param, bundle, this);
+    }
+
+    private void net(boolean isB2b, int waht, String url, Map<String, Object> param, Bundle bundle, OnResultListener onResultListener, boolean isGet) {
+        if (bundle == null) bundle = new Bundle();
         bundle.putSerializable("onResultListener", onResultListener);
-        HttpHandler.getInstance().loadERPByNet(waht, action, param, bundle, this);
+        if (isB2b)
+            HttpHandler.getInstance().loadB2BByNet(waht, url, param, bundle, this, isGet ? "get" : "post");
+        else
+            HttpHandler.getInstance().loadERPByNet(waht, url, param, bundle, this, isGet ? "get" : "post");
     }
 
+
     @Override
     public void result(int what, boolean isJSON, String message, Bundle bundle) {
+        OnResultListener listener = (OnResultListener) bundle.getSerializable("onResultListener");
+        String resultMessage = message;
         try {
-            if (!isJSON) return;
-            JSONObject json = JSON.parseObject(message);
-            OnResultListener listener = (OnResultListener) bundle.getSerializable("onResultListener");
+            if (!isJSON) {
+                if (listener != null)
+                    listener.result(false, what, message);
+                return;
+            }
+            JSONObject object = JSON.parseObject(message);
+            boolean success = true;
             switch (what) {
                 case CODE_WHAT://获取编号
-                    String code = json.getString("code");
-                    if (listener != null)
-                        listener.result(true, code, message);
+                    resultMessage = object.getString("code");
                     break;
                 case ID_WHAT:
-                    if (json.containsKey("success") && json.getBoolean("success")) {
-                        int id = JSON.parseObject(message).getInteger("id");
-                        if (listener != null)
-                            listener.result(true, String.valueOf(id), message);
-                    } else {
-                        if (listener != null)
-                            listener.result(false, "", message);
-                    }
+                    success = (object.containsKey("success") && object.getBoolean("success"));
+                    int id = getJsonIntager(object, "id");
+                    if (id != 0)
+                        resultMessage = String.valueOf(id);
+                    else success = false;
+                    break;
+                case OUT_SET_WHAT://获取外勤地址
+                    success = CommonInterfaceHandler.getOutSet(object);
+                    break;
+                case ADD_OUT_SET_WHAT://添加外勤地址
+                    success = true;
                     break;
-                case OUT_SET_WHAT:
-                    boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
-                    JSONObject object = null;
-                    if (!isB2b) {
-                        JSONArray array = json.getJSONArray("result");
-                        if (ListUtils.isEmpty(array)) return;
-                        object = array.getJSONObject(0);
-                    } else object = json;
-                    int distance = object.containsKey("mo_distance") ? object.getInteger("mo_distance") : object.getIntValue("MO_DISTANCE");
-                    int time = object.containsKey("mo_time") ? object.getInteger("mo_time") : object.getIntValue("MO_TIME");
-                    //TODO 先屏蔽
-//                    boolean isAuto = ((object.containsKey("mo_autosign") ? object.getInteger("mo_autosign") : object.getIntValue("MO_AUTOSIGN")) > 0) ? true : false;
-                    boolean isAuto = true;
-                    //获取到外勤设置   保存下来
-                    PreferenceUtils.putBoolean(AppConfig.AUTO_MISSION, isAuto);
-                    PreferenceUtils.putInt(AppConfig.ALARM_MISSION_DISTANCE, distance);
-                    PreferenceUtils.putInt(AppConfig.AUTO_MISSION_TIME, time);
-                    if (listener != null)
-                        listener.result(true, String.valueOf(isAuto ? distance : 0), message);
+                case LOAD_COMPANY_WHAT://获取企业信息的内容，有与该信息比较特殊，将数据处理逻辑放到外面去
                     break;
-                case ADD_OUT_SET_WHAT:
-                    if (listener != null)
-                        listener.result(true, null, message);
+                case ISMAIN_WHAT://判断是否是管理员
+                    success = CommonInterfaceHandler.saveMainStatus(object);
                     break;
+                case LOAD_CONFIG_WHAT:
+                    WorkHandlerUtil.handlerWorkSet(object);
+                    break;
+                case WORK_DATA_WHAT:
+                    break;
+                case WORK_LOG_WHAT:
+
+                    break;
+
             }
+            if (listener != null)
+                listener.result(success, what, resultMessage);
         } catch (NullPointerException e) {
-            if (e != null)
+            if (e != null) {
                 Log.i("gongpengming", "handleMessage NullPointerException=" + e.getMessage());
+                resultMessage = e.getMessage();
+            }
+            if (listener != null)
+                listener.result(false, what, resultMessage);
         } catch (Exception e) {
-            if (e != null)
+            if (e != null) {
                 Log.i("gongpengming", "handleMessage Exception=" + e.getMessage());
+                resultMessage = e.getMessage();
+            }
+            if (listener != null)
+                listener.result(false, what, resultMessage);
         }
     }
 
     @Override
     public void error(int what, int statuCode, String message, Bundle bundle) {
-
+        OnResultListener listener = (OnResultListener) bundle.getSerializable("onResultListener");
+        if (listener != null)
+            listener.result(false, what, message);
     }
 
 
     public interface OnResultListener extends Serializable {
         /**
-         * @param isOk    是否请求成功
-         * @param result  返回需要的接口  如code id 都转换成String
-         * @param message 返回值
+         * 通用接口保存后返回接口
+         *
+         * @param success 成功
+         * @param what    请求的what
+         * @param message 返回的外面需要用到的信息
          */
-        void result(boolean isOk, String result, String message);
+        void result(@NonNull boolean success, @NonNull int what, @Nullable String message);
     }
 }

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

@@ -0,0 +1,53 @@
+package com.xzjmyk.pm.activity.ui.erp.util.oa;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.xzjmyk.pm.activity.AppConfig;
+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.util.PreferenceUtils;
+import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
+import com.xzjmyk.pm.activity.wxapi.ApiUtils;
+
+/**
+ * Created by Bitliker on 2017/3/23.
+ */
+
+public class CommonInterfaceHandler {
+
+
+    public static boolean saveMainStatus(JSONObject object) throws Exception {
+        boolean isAdmin = false;
+        if (OACheckUtil.getJsonBoolean(object, "success") && object.containsKey("isAdmin")) {
+            if (StringUtils.isEmpty(OACheckUtil.getJson2Text(object, "isAdmin"))) {
+                isAdmin = OACheckUtil.getJsonIntager(object, "isAdmin") > 0;
+            } else {
+                String adminStatus = OACheckUtil.getJson2Text(object, "isAdmin");
+                isAdmin = Integer.valueOf(adminStatus) > 0;
+            }
+            PreferenceUtils.putBoolean(AppConfig.IS_ADMIN, isAdmin);
+        }
+        return isAdmin;
+    }
+
+    public static boolean getOutSet(JSONObject o) {
+        boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
+        JSONObject object = null;
+        if (!isB2b) {
+            JSONArray array = o.getJSONArray("result");
+            if (ListUtils.isEmpty(array)) return false;
+            object = array.getJSONObject(0);
+        } else object = o;
+        int distance = OACheckUtil.getJsonIntager(object, "mo_distance", "MO_DISTANCE");
+        int time = OACheckUtil.getJsonIntager(object, "mo_time", "MO_TIME");
+        boolean isAuto = OACheckUtil.getJsonIntager(object, "mo_autosign", "MO_AUTOSIGN") > 0;
+        //获取到外勤设置   保存下来
+        PreferenceUtils.putBoolean(AppConfig.AUTO_MISSION, isAuto);
+        PreferenceUtils.putInt(AppConfig.ALARM_MISSION_DISTANCE, distance);
+        PreferenceUtils.putInt(AppConfig.AUTO_MISSION_TIME, time);
+        return true;
+    }
+
+
+}

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.util;
+package com.xzjmyk.pm.activity.ui.erp.util.oa;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -11,6 +11,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.tool.ThreadUtil;
+import com.xzjmyk.pm.activity.util.StringUtils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -22,11 +23,17 @@ import java.util.List;
 import java.util.Map;
 
 /**
+ * 针对企业通讯录的接口的数据处理逻辑和保存工具
  * Created by Bitliker on 2017/2/28.
  */
 
 public class CompanyHandlerInfoUtil {
-    public static List<EmployeesEntity> getEmployeesByB2b(JSONArray array) throws Exception {
+
+    public static List<EmployeesEntity> getEmployeesByB2b(JSONObject object) throws Exception {
+        if (object == null) return null;
+        JSONArray array = null;
+        if (object.containsKey("data") && object.get("data") instanceof JSONArray)
+            array = object.getJSONArray("data");
         if (ListUtils.isEmpty(array)) return null;
         EmployeesEntity entity = null;
         JSONObject o = null;

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.util.auto;
+package com.xzjmyk.pm.activity.ui.erp.util.oa;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.util.auto;
+package com.xzjmyk.pm.activity.ui.erp.util.oa;
 
 import android.os.Bundle;
 import android.os.Handler;

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.util.auto;
+package com.xzjmyk.pm.activity.ui.erp.util.oa;
 
 import android.app.Activity;
 import android.app.Notification;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/REMAIN.md

@@ -1,2 +1,4 @@
-##自动考勤功能汇总
+###关于oa模块的处理过程工具类汇总
 > version 1.0
+
+>

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.util.auto;
+package com.xzjmyk.pm.activity.ui.erp.util.oa;
 
 import android.util.Log;
 

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.util;
+package com.xzjmyk.pm.activity.ui.erp.util.oa;
 
 import android.util.Log;
 
@@ -11,7 +11,7 @@ import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkLocationModel;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.AutoMemoryUtil;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 
@@ -298,7 +298,7 @@ public class WorkHandlerUtil {
         AutoMemoryUtil.loadWorkSeted = true;//是否下拉过高级考勤数据
         AutoMemoryUtil.autosign = getIntByJson(o, "autosign") == 1;     //是否自动考勤
         //TODO 发布版本先默认为true
-        AutoMemoryUtil.autosign = true;
+//        AutoMemoryUtil.autosign = true;
     }
 
 

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

@@ -26,9 +26,9 @@ 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.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.AutoMemoryUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.AutoMemoryUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
-import com.xzjmyk.pm.activity.util.WorkHandlerUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.WorkHandlerUtil;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/BackMessageFragment.java

@@ -72,7 +72,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
 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.ObjectUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.ui.message.uas.B2bMsgActivity;
 import com.xzjmyk.pm.activity.ui.tool.ThreadPool;
 import com.xzjmyk.pm.activity.util.HtmlUtils;
@@ -80,7 +80,7 @@ import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.util.ViewHolder;
-import com.xzjmyk.pm.activity.util.WorkHandlerUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.WorkHandlerUtil;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.DrawableCenterTextView;
 import com.xzjmyk.pm.activity.view.PullToRefreshSlideListView;

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

@@ -22,7 +22,6 @@ public class ApiPlatform extends ApiBase implements ApiModel {
     private String NOTIFICATION_CENTER_URL = mBaseUrl + "/noticeCenter/getAllNotices?pageNumber=1&pageSize=10&enuu=10030994";
     private String PUNCH_RECORD_URL = mBaseUrl + "mobile/signCardLog/getListdata";
     private String USER_INFO_QUERY_URL = mBaseUrl + "mobile/userCenter/getUserInfo";
-    private String PUNCH_RECORD_URL = mBaseUrl + "/signCardLog/getListdata";
     private String LEAVE_APPLICATION_URL = mBaseUrl + "/vacation/getAllVacation?emcode=1000003217&enuu=10030994&pageNumber=1&pageSize=10";
     private String DAILY_WORK_URL = mBaseUrl + "/workDaily/getWorkDaily?emcode=1000003217&pageNumber=1&pageSize=10&enuu=10030994";
     private String WORK_SCHEDULE_URL = mBaseUrl + "/workData/getWorkData?enuu=10030994";