Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('C:/CompanyProject/applicationsignname[20150409]')
+            storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

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

@@ -175,12 +175,13 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                         tv.setText(str);
                     }
                 } else {
-                    start = TimeUtils.f_long_2_str(System.currentTimeMillis());
-                    if (str.compareTo(start) < 0) {
-                        ToastUtil.showToast(ct, "开始时间不能小于当前时间");
-                    } else {
-                        tv.setText(str);
-                    }
+                    tv.setText(str);
+//                    start = TimeUtils.f_long_2_str(System.currentTimeMillis());
+//                    if (str.compareTo(start) < 0) {
+//                        ToastUtil.showToast(ct, "开始时间不能小于当前时间");
+//                    } else {
+//
+//                    }
                 }
             }
         });

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

@@ -88,6 +88,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     private int tag = 1;
     private ArrayList<OABean> meBeans = null;
     private ArrayList<OABean> otherBeans = null;
+    private List<OABean> showOtherBeans = null;
     private MyListViewAdapter adapter;
     private EmptyLayout mEmptyLayout;
 
@@ -102,7 +103,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                     if (jsonObject.isEmpty())
                         return;
                     loadSuccess(jsonObject);
-                    setTop();
                     break;
             }
         }
@@ -240,7 +240,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 return;
             }
             List<OABean> chche = new ArrayList<>();
-            String name = entity.getName().trim();
+            String name = "," + entity.getName().trim() + ",";
+            Log.i("gongpengming", name);
             if (name == null) return;
             String nameStr;
             for (OABean e : otherBeans) {
@@ -253,12 +254,15 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 } else if (e.getRecordman() != null) {//拜访
                     if (e.getRecordman() == null || e.getRecordman().length() <= 0) continue;
                     nameStr = "," + e.getRecordman().trim() + ",";
+                    Log.i("gongpengming", nameStr);
                     if (getResult(nameStr, name)) {//是该下属任务日程
+                        Log.i("gongpengming", "是的");
                         chche.add(e);
                     }
                 }
             }
             setTaskDay(chche);
+            showOtherBeans = chche;
             adapter.setBeans(chche);
         }
         if (requestCode == 0x20 && 0x20 == resultCode) {
@@ -378,12 +382,20 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                     Intent intent = null;
                     switch (position) {
                         case 0:
-                            intent = new Intent(ct, TaskAddActivity.class);
-                            intent.putExtra("type", 0);
+                            if (!(getIntent() == null || getIntent().getIntExtra("type", 0) != 1)) {
+                                intent = new Intent(ct, VisitReportPlanActivity.class);
+                            } else {
+                                intent = new Intent(ct, TaskAddActivity.class);
+                                intent.putExtra("type", 0);
+                            }
                             break;
                         case 1:
-                            intent = new Intent(ct, TaskAddActivity.class);
-                            intent.putExtra("type", 1);
+                            if (!(getIntent() == null || getIntent().getIntExtra("type", 0) != 1)) {
+                                intent = new Intent(ct, VisitReportAddActivity.class);
+                            } else {
+                                intent = new Intent(ct, TaskAddActivity.class);
+                                intent.putExtra("type", 1);
+                            }
                             break;
                         case 2:
                             intent = new Intent(ct, VisitReportPlanActivity.class);
@@ -455,16 +467,13 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 String chche = TimeUtils.long2str(System.currentTimeMillis(), "yyyy-MM") + "-" + (downDate < 10 ? "0" : "") + downDate;
                 date_tv.setText(chche + "  " + TimeUtils.getWeek(chche));
                 Calendar c = Calendar.getInstance();
-                int ok = 0;
-                int noOk = 0;
                 List<OABean> beans = new ArrayList<>();
-                try {// meBeans : otherBeans 可能为空
-//                    for (OABean e : (tag == 1 ? meBeans : otherBeans)) {
+                try {
                     List<OABean> b;
                     if (tag == 1) {
                         b = meBeans == null ? new ArrayList<OABean>() : meBeans;
                     } else {
-                        b = otherBeans == null ? new ArrayList<OABean>() : otherBeans;
+                        b = showOtherBeans == null ? (otherBeans == null ? new ArrayList<OABean>() : otherBeans) : showOtherBeans;
                     }
                     for (OABean e : b) {
                         if (e.getStartdate() == null) continue;
@@ -472,28 +481,17 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                         int day = c.get(Calendar.DAY_OF_MONTH);
                         if (day == downDate) {//选择那天的任务
                             beans.add(e);
-                            if ("已完成".equals(e.getStatus()) || "已拜访".equals(e.getStatus())) {
-                                ok += 1;
-                            } else {
-                                noOk += 1;
-                            }
                         }
                     }
                 } catch (NullPointerException e) {
                     e.printStackTrace();
                 } finally {
                     adapter.setBeans(beans);
-                    setTop();
                 }
             }
         });
     }
 
-    private void setTop() {
-//        rootScrollView.smoothScrollTo(0, 20);
-//        rootScrollView.scrollTo(0, 0);
-    }
-
     private void setPoithNum(List<OABean> beans) {
         int ok = 0, noOk = 0;
         if (!ListUtils.isEmpty(beans)) {
@@ -519,7 +517,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
      */
     private void chaneTAG(boolean isMy) {
         if (isMy) {
-            if (!my_client_log.getText().toString().trim().equals("下属工作日志")) {
+            showOtherBeans = null;
+            if (!my_client_log.getText().toString().trim().equals("下属工作日历")) {
                 my_client_log.setText("下属工作日历");
             }
             tag = 1;
@@ -540,7 +539,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 setTaskDay(otherBeans);
             }
         }
-        setTop();
     }
 
     //列表适配器
@@ -560,6 +558,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
             if (beans == null) return null;
             if (getIntent() == null || getIntent().getIntExtra("type", 0) != 1) {
                 chche = beans;
+
             } else {//crm
                 //只显示拜访
                 for (OABean e : beans)

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

@@ -81,7 +81,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
 
     //变量
     private BaseActivity ct;
-    private boolean isInCompany = false;//当前员工是否配置公司信息
     private double companyX;//当前公司位置经度
     private double companyY;//当前公司位置纬度
     private int companyDistance = -1;//当前规定距离
@@ -109,7 +108,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     JSONObject jsonObject = JSON.parseObject(message);//返回对象
                     if (jsonObject.containsKey("success") && jsonObject.getBoolean("success")) {//返回正常
                         if (jsonObject.containsKey("comaddressset") ? jsonObject.getBoolean("comaddressset") : false) {//如果有分配公司
-                            isInCompany = true;
                             companyDistance = Integer.parseInt(jsonObject.containsKey("distance") ? jsonObject.getString("distance") : "0");
                             companyX = Double.parseDouble(jsonObject.containsKey("longitude") ? jsonObject.getString("longitude") : "0");
                             companyY = Double.parseDouble(jsonObject.containsKey("latitude") ? jsonObject.getString("latitude") : "0");
@@ -439,36 +437,18 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             bindClass(beans, object.getJSONObject("Class2"));
         if (object.containsKey("Class1"))
             bindClass(beans, object.getJSONObject("Class1"));
-//        switch (num) {
-//            case 3:
-//                b = new Bean();//上班
-//                b.startTime = object.containsKey("wd_ondutythree") ? object.getString("wd_ondutythree") : "08:30";
-//                b.startSignin = object.containsKey("wd_onbeg3") ? object.getString("wd_onbeg3") : "07:00";
-//                b.endTime = object.containsKey("wd_offdutythree") ? object.getString("wd_offdutythree") : "11:30";
-//                b.endSignnin = object.containsKey("wd_offend3") ? object.getString("wd_offend3") : "12:00";
-//                beans.add(0, b);
-//            case 2:
-//                b = new Bean();
-//                b.startTime = object.containsKey("wd_ondutytwo") ? object.getString("wd_ondutytwo") : "--:--";
-//                b.startSignin = object.containsKey("wd_onbeg2") ? object.getString("wd_onbeg2") : "07:00";
-//                b.endTime = object.containsKey("wd_offdutytwo") ? object.getString("wd_offdutytwo") : "--:--";
-//                b.endSignnin = object.containsKey("wd_offend2") ? object.getString("wd_offend2") : "07:00";
-//                beans.add(0, b);
-//            case 1:
-//                b = new Bean();
-//                b.startTime = object.containsKey("wd_ondutyone") ? object.getString("wd_ondutyone") : "--:--";
-//                b.startSignin = object.containsKey("wd_onbeg1") ? object.getString("wd_onbeg1") : "07:00";
-//                b.endTime = object.containsKey("wd_offdutyone") ? object.getString("wd_offdutyone") : "--:--";
-//                b.endSignnin = object.containsKey("wd_offend1") ? object.getString("wd_offend1") : "07:00";
-//                beans.add(0, b);
-//                break;
-//        }//添加上班签到时间完成
         setDataForAdapter(beans);
     }
 
     //处理数据，获取到用户签到列表
     public void setDataByLogs(JSONArray array) {
         ArrayList<Bean> beans = getDataByAdapter();
+        if (array.size() <= 0) {
+            for (int i = 0; i < beans.size(); i++)
+                beans.get(i).getSigninList().clear();
+            setDataForAdapter(beans);
+            return;
+        }
         String[] logTime = new String[array.size()];
         for (int i = 0; i < array.size(); i++) {//获取打卡记录中的打卡时间
             logTime[i] = clearDay(array.getJSONObject(i).containsKey("cl_time") ? (array.getJSONObject(i).getString("cl_time") == null ? " " : array.getJSONObject(i).getString("cl_time")) : " ");