Bitliker 9 роки тому
батько
коміт
ea4f962e4e

+ 8 - 13
WeiChat/src/main/AndroidManifest.xml

@@ -82,7 +82,10 @@
         <activity
             android:name=".ui.SplashActivity"
             android:theme="@style/SplashTheme">
-
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
         <!-- 登录模块 -->
         <activity android:name=".ui.account.LoginActivity" />
@@ -139,12 +142,7 @@
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateUnspecified|adjustNothing" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+            android:windowSoftInputMode="stateUnspecified|adjustNothing"></activity>
         <!-- 消息模块 -->
         <activity android:name=".ui.message.ChatActivity" />
         <activity android:name=".ui.message.NewFriendActivity" />
@@ -449,8 +447,9 @@
         <activity android:name=".ui.erp.activity.oa.AddNextSigninActivity" />
         <activity android:name=".ui.erp.activity.oa.SigninTimeSetActivity" />
         <activity android:name=".ui.erp.activity.oa.SuperSetActivity" />
-        <activity android:name=".ui.erp.activity.oa.AddLogActivity"
-            android:label="新增日志"/>
+        <activity
+            android:name=".ui.erp.activity.oa.AddLogActivity"
+            android:label="新增日志" />
         <activity android:name=".ui.circle.view.SelectLocationActivity" />
         <activity
             android:name=".ui.erp.activity.oa.SigninTimeSetActivity"
@@ -481,10 +480,6 @@
             android:name=".ui.erp.activity.oa.OutSigninOKActivity"
             android:label="签到" />
         <activity android:name=".ui.erp.activity.crm.ContactManAddActivity"></activity>
-        <activity android:name=".ui.erp.activity.oa.TestActivity" />
-        <activity
-            android:name=".ui.erp.activity.oa.OutSigninOKActivity"
-            android:label="签到" />
         <activity android:name=".ui.erp.activity.oa.SaveMeetActivity" />
         <activity
             android:name=".ui.erp.activity.oa.MeetSelectActivity"

+ 10 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/OutSigninBean.java

@@ -4,14 +4,23 @@ package com.xzjmyk.pm.activity.bean.oa;
  * Created by gongpm on 2016/7/22.
  */
 public class OutSigninBean {
+    private String mo_code;
     private String mo_signtime;
     private String mo_address;
     private String mo_mancode;
     private String mo_man;
     private String mo_remark;
-    private int  mo_attachid;
+    private int mo_attachid;
     private String mo_company;
 
+    public String getMo_code() {
+        return mo_code;
+    }
+
+    public void setMo_code(String mo_code) {
+        this.mo_code = mo_code;
+    }
+
     public String getMo_company() {
         return mo_company;
     }

+ 9 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/SigninBean.java

@@ -4,6 +4,7 @@ package com.xzjmyk.pm.activity.bean.oa;
  * Created by gongpm on 2016/7/14.
  */
 public class SigninBean {
+    private String cl_code;//
     private String cl_time;  //打卡时间
     private String cl_address;//打卡地址
     private String cl_phone;//打卡手机号
@@ -12,6 +13,14 @@ public class SigninBean {
     private String cl_location;//考勤地址
     private int cl_distance;//考勤距离
 
+    public String getCl_code() {
+        return cl_code;
+    }
+
+    public void setCl_code(String cl_code) {
+        this.cl_code = cl_code;
+    }
+
     public String getCl_time() {
         return cl_time;
     }

+ 5 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -91,7 +91,11 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.login_btn:// 登陆
-                login();
+                //TODO 登陆修改
+//                login();
+                final String phoneNumber = "18565605807";
+                final String password = "111111";
+                login_manage(phoneNumber, password);
                 break;
         }
     }

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

@@ -37,6 +37,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.calendar.cons.DPMode;
 import com.xzjmyk.pm.activity.ui.calendar.views.TaskDatePicker;
 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.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
@@ -84,14 +85,13 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
     private String baseUrl;
     private int request = 0x13;
     public static int resultCode = 0x14;
-    private final int codeWhat = 0x15;
 
     ArrayList<MeetUserEntity> entities = null;//成员
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             String message = (String) msg.getData().get("result");
-            Log.i("gongpengming", message);
+            progressDialog.dismiss();
             switch (msg.what) {
                 case whatSignin:
                     //TODO 创建会议成功  开始创建群组
@@ -109,18 +109,6 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                 case whatAdd:
                     Log.i("gongpengming", "msg==whatAdd");
                     break;
-                case codeWhat:
-                    try {
-                        JSONObject json = new JSONObject(message);
-                        if (json.isNull("success") || !json.getBoolean("success") || json.isNull("code")) {
-                            ToastUtil.showToast(ct, "业务繁忙,请稍后重试");
-                        } else {
-                            signinAble(json.getString("code"));
-                        }
-                    } catch (JSONException e) {
-                        e.printStackTrace();
-                    }
-                    break;
                 case Constants.HTTP_SUCCESS_INIT:
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
@@ -232,8 +220,13 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                 showDialog(false);
                 break;
             case R.id.bt_save:
-                getCodeByNet();
                 progressDialog.show();
+                CodeUtil.getInstance().getCode(ct, "Meetingroomapply", new CodeUtil.OnCodeLinstener() {
+                    @Override
+                    public void callBack(String code) {
+                        signinAble(code);
+                    }
+                });
                 break;
             case R.id.users_rl://选择参会人员
                 Intent intent = new Intent(ct, MeetSelectActivity.class);
@@ -400,22 +393,6 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         dialog.getWindow().setGravity(Gravity.CENTER);
     }
 
-
-    private void getCodeByNet() {
-        if (baseUrl == null) {
-            baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
-        }
-        String url = baseUrl + "common/getCodeString.action";
-        final Map<String, Object> param = new HashMap<>();
-        String caller = "Meetingroomapply";
-        param.put("caller", caller);
-        param.put("type", 2);
-        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, param, handler, headers, codeWhat, null, null, "post");
-    }
-
     //提交表单
     private void doSignin(String gruop, String ids, String code) {
         if (baseUrl == null) {

+ 71 - 28
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -38,11 +38,14 @@ import com.xzjmyk.pm.activity.view.MyListView;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class OAActivity extends BaseActivity implements View.OnClickListener, AdapterView.OnItemSelectedListener {
     private static final int whatVisit = 0x10,//拜访报告接口
@@ -74,22 +77,19 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
     @ViewInject(R.id.date_tv)
     private TextView date_tv;  //当前月份
 
-    private PopupMenu poAddMenu;
     private int typeWhat = -1;
-
+    private Set<Integer> set;
     private String date;
-    private List<Map<String, Object>> mapList;
-    private List<Map<String, Object>> taskList;
-    private List<Map<String, Object>> visitList;
-    private List<Map<String, Object>> scheduleList;
-    private MyListViewAdapter adapter;
+    private List<Map<String, Object>> taskList;//任务列表
+    private List<Map<String, Object>> visitList;//拜访列表
+    private List<Map<String, Object>> scheduleList;//日程列表
+    private MyListViewAdapter adapter;   //
 
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             progressDialog.dismiss();
             String message = (String) msg.getData().get("result");
-            typeWhat = msg.what;
             switch (msg.what) {
                 case whatVisit:
                     try {
@@ -98,7 +98,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
                             ToastUtil.showToast(ct, "数据返回错误");
                             return;
                         }
-                        mapList = JsonUtils.parseListKeyMaps("visitplan", message);
+                        visitList = JsonUtils.parseListKeyMaps("visitplan", message);
+                        addTaskDate("vp_status", visitList);
                         updateUI();
                     } catch (JSONException e) {
                         e.printStackTrace();
@@ -111,7 +112,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
                             ToastUtil.showToast(ct, "数据返回错误");
                             return;
                         }
-                        mapList = JsonUtils.parseListKeyMaps("taskMsg", message);
+                        taskList = JsonUtils.parseListKeyMaps("taskMsg", message);
+                        addTaskDate("status", taskList);
                         updateUI();
                     } catch (JSONException e) {
                         e.printStackTrace();
@@ -125,7 +127,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
                             ToastUtil.showToast(ct, "数据返回错误");
                             return;
                         }
-                        mapList = JsonUtils.parseListKeyMaps("scheduleMsg", message);
+                        scheduleList = JsonUtils.parseListKeyMaps("scheduleMsg", message);
+                        addTaskDate("status", scheduleList);
                         updateUI();
                     } catch (JSONException e) {
                         e.printStackTrace();
@@ -146,12 +149,30 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
                     } catch (JSONException e) {
                         e.printStackTrace();
                     }
-
                     break;
             }
         }
     };
 
+    private void addTaskDate(String status, List<Map<String, Object>> list) {
+        if (set == null)
+            set = new HashSet();
+        for (Map<String, Object> en : list) {
+            if (en.get(status) == null || "null".equals(en.get(status) + "") || "FINISHED".equals(en.get(status).toString().trim())) {
+                if (en.get("enddate") != null && !"null".equals(en.get("enddate"))) {
+                    String timeStr = (String) en.get("enddate");
+                    long time = TimeUtils.f_str_2_long(timeStr);
+                    Calendar c = Calendar.getInstance();
+                    c.setTimeInMillis(time);
+                    set.add(c.get(Calendar.DAY_OF_MONTH));
+                }
+            }
+        }
+        if (set != null && set.size() > 0) {
+            picker.setTaskDay(set);
+        }
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -159,6 +180,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
         ViewUtils.inject(this);
         initView();
     }
+
     private void initView() {
         baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
         rootScrollView.requestDisallowInterceptTouchEvent(false);
@@ -174,7 +196,10 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
     }
 
     private void initData() {
-//        loadNetData()
+        //先下拉三个列表数据
+        loadNetData(whatTask);
+        loadNetData(whatVisit);
+        loadNetData(whatSchedule);
     }
 
     //获取网络数据
@@ -183,7 +208,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
         //获取网络数据
         String url = baseUrl + "mobile/crm/getVisitPlan.action";
         String date = TimeUtils.long2str(System.currentTimeMillis(), "yyyyMM");
-        Log.i("gongpengming", date);
         switch (what) {
             case whatVisit:
                 url = baseUrl + "mobile/crm/getVisitPlan.action";
@@ -208,6 +232,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
         final Map<String, Object> param = new HashMap<>();
         param.put("emcode", CommonUtil.getSharedPreferences(this, "erp_username"));
         param.put("date", date);
+        if (what == whatTask)
+            param.put("status", 1);
         param.put("page", pager);
         param.put("pageSize", 10);
         param.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
@@ -219,7 +245,23 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
     private void updateUI() {
         if (adapter == null)
             adapter = new MyListViewAdapter();
-        adapter.setData(mapList);
+        List<Map<String, Object>> mapList = null;
+        switch (typeWhat) {
+            case whatSchedule:
+                if (scheduleList != null)
+                    mapList = scheduleList;
+                break;
+            case whatTask:
+                if (taskList != null)
+                    mapList = taskList;
+                break;
+            case whatVisit:
+                if (visitList != null)
+                    mapList = visitList;
+                break;
+        }
+        if (mapList != null)
+            adapter.setData(mapList);
     }
 
     private void updateUI(int i, int completenum, int complrate, int notcomplnum) {
@@ -275,22 +317,25 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
                     case 0:
                         break;
                     case 1:
-                        if (mapList != null)
-                            mapList.clear();
+                        typeWhat = whatTask;
+                        if (taskList == null) {//如果前一次请求失败
+                            loadNetData(whatTask);
+                        }
                         updateUI();
-                        loadNetData(whatTask);
                         break;
                     case 2:
-                        if (mapList != null)
-                            mapList.clear();
+                        typeWhat = whatSchedule;
+                        if (scheduleList == null) {
+                            loadNetData(whatSchedule);
+                        }
                         updateUI();
-                        loadNetData(whatSchedule);
                         break;
                     case 3:
-                        if (mapList != null)
-                            mapList.clear();
+                        typeWhat = whatVisit;
+                        if (visitList == null) {
+                            loadNetData(whatVisit);
+                        }
                         updateUI();
-                        loadNetData(whatVisit);
                         break;
                 }
                 break;
@@ -347,6 +392,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
         }
     }
 
+    private PopupMenu poAddMenu;
+
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     private void popAdd(View view) {
         //点击添加按钮
@@ -456,7 +503,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
                 name = (String) mapList.get(postin).get("taskname");
                 addr = "结束时间:" + mapList.get(postin).get("enddate");
                 object = (String) mapList.get(postin).get("handler");
-                Log.i("gongpengming", mapList.get(postin).get("status") + "");
                 if (mapList.get(postin).get("status") == null || "null".equals(mapList.get(postin).get("status") + ""))
                     status = "未完成";
                 else
@@ -486,7 +532,4 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
         }
     }
 
-    enum Mode{
-
-    }
 }

+ 9 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OutSigninOKActivity.java

@@ -16,6 +16,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.OutSigninBean;
 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.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
@@ -63,7 +64,12 @@ public class OutSigninOKActivity extends BaseActivity {
         exit_btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                doSignin();
+                CodeUtil.getInstance().getCode(ct, "mobile_outsign", new CodeUtil.OnCodeLinstener() {
+                    @Override
+                    public void callBack(String code) {
+                        doSignin(code);
+                    }
+                });
             }
         });
     }
@@ -98,12 +104,13 @@ public class OutSigninOKActivity extends BaseActivity {
         }
     };
 
-    private void doSignin() {
+    private void doSignin(String code) {
         progressDialog.show();
         //获取网络数据
         String url = baseUrl + "mobile/oa/saveOutSign.action";
         final Map<String, Object> param = new HashMap<>();
         OutSigninBean bean = new OutSigninBean();
+        bean.setMo_code(code);
         bean.setMo_address(addr_tv.getText().toString().trim());
         bean.setMo_mancode(CommonUtil.getSharedPreferences(this, "erp_username"));
         bean.setMo_man(MyApplication.getInstance().mLoginUser.getNickName());

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

@@ -32,6 +32,7 @@ import java.util.List;
  * by gongpm 16\07\05
  */
 public class WorkLogsActivity extends BaseActivity {
+    private static final int PAGER_SIZE = 10;
     private WorkLogsActivity ct;
     private SuperSwipeRefreshLayout root_view;
     private ListView context_rv;
@@ -197,7 +198,7 @@ public class WorkLogsActivity extends BaseActivity {
         if (!TextUtils.isEmpty(messageId)) {
             params.put("messageId", messageId);
         }
-        params.put("pageSize", "10");
+        params.put("pageSize", PAGER_SIZE);
         ViewUtil.httpSendRequest(this, mConfig.MSG_LIST, params, handler, null, LOAD_WHAT, null, null, "get");
     }
 

+ 14 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -32,6 +33,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.AlarmaActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SigninActivity;
 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.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
@@ -331,17 +333,18 @@ public class SigninFragment extends EasyFragment {
         return locationStr;
     }
 
-    private void doSignin() {
+    private void doSignin(String code) {
         //获取网络数据
         String url = baseUrl + "mobile/saveCardLog.action";
         final Map<String, Object> param = new HashMap<>();
         SigninBean bean = new SigninBean();
+        bean.setCl_code(code);
         bean.setCl_address(office_addr.getText().toString());
         bean.setCl_distance(300);
         bean.setCl_emcode(CommonUtil.getSharedPreferences(ct, "erp_username"));
-        bean.setCl_emname(MyApplication.getInstance().mLoginUser.getNickName());
         bean.setCl_time(TimeUtils.f_long_2_str(System.currentTimeMillis()));
         bean.setCl_location(getLocation());
+        bean.setCl_emname(MyApplication.getInstance().mLoginUser.getNickName());
         bean.setCl_phone(MyApplication.getInstance().mLoginUser.getTelephone());
         String formStore = FlexJsonUtil.toJson(bean);
         String caller = "CardLog";
@@ -372,7 +375,8 @@ public class SigninFragment extends EasyFragment {
                 MyApplication.getInstance().getBdLocationHelper().getLongitude());
         String str = BaiduMapUtil.getInstence().getDistance(lalat, location);
         unoffice_mm.setText("距离考勤地点:" + str + "米");
-        signinAble();
+        //TODO 判断是否可以点击,先关闭
+//        signinAble();
     }
 
     private void setListener() {
@@ -393,7 +397,13 @@ public class SigninFragment extends EasyFragment {
         signin_btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                doSignin();
+                CodeUtil.getInstance().getCode(ct, "CardLog", new CodeUtil.OnCodeLinstener() {
+                    @Override
+                    public void callBack(String code) {
+                        doSignin(code);
+                    }
+                });
+
             }
         });
         findViewById(R.id.addr_rl).setOnClickListener(new View.OnClickListener() {

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

@@ -0,0 +1,78 @@
+package com.xzjmyk.pm.activity.ui.erp.util;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * 多数用到了code  抽取出来使用
+ * Created by gongpm on 2016/8/5.
+ */
+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;
+            Log.i("gongpengming", message);
+            if (msg.what == 0x11) {
+                JSONObject json = JSON.parseObject(message);
+                code = json.getString("code");
+                Log.i("gongpengming", "message=" + code);
+                if (linstener != null) {
+                    linstener.callBack(code);
+                    return;
+                }
+            }
+            //容错
+            if (linstener != null) {
+                linstener.callBack(code);
+            }
+        }
+    };
+
+    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 getCode(Context context, String titleName, OnCodeLinstener linstener) {
+        this.linstener = linstener;
+        getCodeByNet(context, titleName);
+    }
+
+    public interface OnCodeLinstener {
+        void callBack(String code);
+    }
+}

+ 7 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/view/CalendarView.java

@@ -13,6 +13,7 @@ import android.view.View;
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Set;
 
 /**
  * 日历控件 功能:获得点选的日期区间
@@ -33,7 +34,7 @@ public class CalendarView extends View implements View.OnTouchListener {
     private int curStartIndex, curEndIndex; // 当前显示的日历起始的索引
     private boolean completed = false; // 为false表示只选择了开始日期,true表示结束日期也选择了
     private boolean isSelectMore = false;
-    private int[] taskDay;
+    private Set<Integer> taskDay;
     //给控件设置监听事件
     private OnItemClickListener onItemClickListener;
 
@@ -58,11 +59,13 @@ public class CalendarView extends View implements View.OnTouchListener {
         setOnTouchListener(this);
     }
 
-    public void setTaskDay(int[] taskDay) {
+    public void setTaskDay(Set<Integer> taskDay) {
         this.taskDay = taskDay;
+        Log.i("gongpengming", taskDay.size() + "大小");
+        invalidate();
     }
 
-    public int[] getTaskDay() {
+    public Set<Integer> getTaskDay() {
         return taskDay;
     }
 
@@ -124,7 +127,7 @@ public class CalendarView extends View implements View.OnTouchListener {
             } else if (isNextMonth(i)) {//是下个月日期
                 color = surface.borderColor;
             } else {//是这个月日期
-                if (taskDay != null && taskDay.length > 0) {//如果有的日期又任务
+                if (taskDay != null && taskDay.size() > 0) {//如果有的日期又任务
                     for (int j : taskDay) {
                         if (j == date[i]) {//当前日期为由任务日期
                             drawTask(canvas, i, color);