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

# Conflicts:
#	WeiChat/version.properties

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

@@ -29,9 +29,17 @@ public class OAModel {
     private String address;//
     private String recorder;//录入人
     private String status;
+    private String  kind;
     private String handler;
     private String json;
 
+   public boolean isAllDay(){
+       return kind==null?false:(kind.equals("全天"));
+   }
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
     public boolean isMe() {
         return isMe;
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/OAHttpUtil.java

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.util.oa;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
@@ -70,13 +71,16 @@ public class OAHttpUtil {
             //录入时间作为选择时间，如果没有录入，使用实际到达时间或是预计到达时间或开始时间
             model.setRecorddate(getTimeMillis(o, "recorddate", "vr_recorddate", "vr_date", "mpd_arrivedate", "startdate", "mpd_actdate"));
             model.setTitle(JSONUtil.getText(o, "mpd_company", "name", "vr_cuname", "taskname", "custname"));
-            model.setRemark(JSONUtil.getText(o, "mpd_remark", "vr_nichestep","vr_detail", "detail", "description"));
+            model.setRemark(JSONUtil.getText(o, "mpd_remark", "vr_nichestep", "vr_detail", "detail", "description"));
             model.setAddress(JSONUtil.getText(o, "vr_cuaddress", "mpd_address", "address"));
             model.setRecorder(JSONUtil.getText(o, "vr_emname", "recorder", "mp_recorder"));
             //外勤计划的实行人就是录入人
             model.setHandler(JSONUtil.getText(o, "handler", "visitman", "vr_emname", "doman"));
             model.setStatus(JSONUtil.getText(o, "mpd_status", "status"));
             model.setJson(o.toString());
+            if (type == OAModel.OA_TYPE_MISSION) {
+                model.setKind(JSONUtil.getText(o, "mpd_kind"));
+            }
             if (canShow(model))
                 models.add(model);
         }
@@ -122,12 +126,25 @@ public class OAHttpUtil {
 
     public boolean isMissionOk(OAModel e) {
         if (!e.isMission()) return false;
+        //当天以前的内容
         if (e.isTadayBefore() && e.getStartdate() > 0 && e.getEnddate() > 0 && e.getStartdate() != e.getEnddate()) {
             return true;
         } else {
             String status = e.getStatus();
-            if ("签退".equals(status)) return true;
-            else return false;
+            if ("签退".equals(status)) {
+                if (e.isAllDay()) {
+                    long five = DateFormatUtil.str2Long(DateFormatUtil.long2Str("yyyy-MM-dd") + " 17:00:00", "yyyy-MM-dd HH:mm:ss");
+                    if (five < System.currentTimeMillis()) {
+                        return true;
+                    } else {
+                        return false;
+                    }
+                } else {
+                    return true;
+                }
+            } else {
+                return false;
+            }
         }
     }
 }

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Jan 04 16:14:02 CST 2018
-debugName=372
+#Thu Jan 04 15:21:03 CST 2018
+debugName=368
 versionName=624
-debugCode=372
+debugCode=368
 versionCode=163

app_core/common/src/main/assets/work_menu.json

@@ -257,15 +257,6 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "str_company_salary",
-        "menuIcon": "company_salary",
-        "menuActivity": "com.modular.appme.CheckWagesActivity",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
       }
     ]
   },

app_core/common/src/main/java/com/core/utils/time/wheel/OASigninPicker.java

@@ -9,6 +9,9 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.common.data.DateFormatUtil;
+import com.core.utils.CommonUtil;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -42,7 +45,7 @@ public class OASigninPicker extends WheelPicker {
     public OASigninPicker(Activity activity) {
         super(activity);
         textSize = 16;//年月日时分，比较宽，设置字体小一点才能显示完整
-        for (int i = 2015; i <= 2017; i++) {
+        for (int i = CommonUtil.getNumByString(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy")) - 2; i <= CommonUtil.getNumByString(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy")); i++) {
             years.add(String.valueOf(i));
         }
         for (int i = 1; i <= 12; i++) {

app_core/common/src/main/java/com/core/widget/view/selectcalendar/OACalendarView.java

@@ -19,14 +19,15 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 /**
+ * update 2018-1-4 更新添加可以选择过去的时间过去时间不可点击，变灰等
+ * setCanClickHistory//是否需要向过去的时间变灰，当设置为ture时候默认不可以点击，默认值为flase
+ * setNeedHintHistory//是否可以点击过去的日期，默认为true
  * Created by pengminggong on 2016/9/20.
  */
 public class OACalendarView extends View implements View.OnTouchListener {
     //日期记录
     private Date curDate; // 当前日历显示的月
-    private Date today; // 今天的日期
     private Date downDate; // 手指按下状态时临时日期
     //索引
     private int todayIndex; // 今天的索引
@@ -50,7 +51,7 @@ public class OACalendarView extends View implements View.OnTouchListener {
     public OACalendarView(Context context, AttributeSet attrs) {
         super(context, attrs);
         surface = new Surface();
-        curDate = today = new Date();
+        curDate =  new Date();
         calendar = Calendar.getInstance();
         calendar.setTime(curDate);
         todayIndex = calendar.get(Calendar.DAY_OF_MONTH);
@@ -72,9 +73,20 @@ public class OACalendarView extends View implements View.OnTouchListener {
         setOnTouchListener(this);
     }
 
+    private boolean needHintHistory=false;
+    private boolean canClickHistory=true;
+
+    public void setCanClickHistory(boolean canClickHistory) {
+        this.canClickHistory = canClickHistory;
+    }
+
+    public void setNeedHintHistory(boolean needHintHistory) {
+        this.needHintHistory = needHintHistory;
+        this.canClickHistory = !needHintHistory;
+    }
 
     private void setCalendar(Date d) {
-        curDate = today = d;
+        curDate =d;
         calendar.setTime(curDate);
         calendar.set(Calendar.DAY_OF_MONTH, 1);//设置为当月第一天
         startIndex = calendar.get(Calendar.DAY_OF_WEEK) - 1;//获取第一天在当周的星期几，返回多1，所以减1
@@ -188,7 +200,7 @@ public class OACalendarView extends View implements View.OnTouchListener {
 
     //绘画点击的内容
     private void drawSelect(Canvas canvas) {
-        if (downIndex >= startIndex && downIndex <= endIndex) {
+        if (downIndex >= startIndex && downIndex <= endIndex && canClickHistory) {
             //圆的最中心
             float cellY = surface.weekHeight + surface.cellHeight * (downIndex / 7) + surface.cellHeight / 2;
             float cellX = surface.cellWidth * (downIndex % 7) + surface.cellWidth / 2;
@@ -229,6 +241,8 @@ public class OACalendarView extends View implements View.OnTouchListener {
             }
             if (downIndex == i) {
                 surface.datePaint.setColor(surface.selectColor);
+            } else if (isHistory(i)) {
+                surface.datePaint.setColor(surface.hineDateColor);
             }
             float dayTextX = surface.cellWidth * (i % surface.weekText.length) +
                     (surface.cellWidth - surface.datePaint.measureText(chche)) / 2f;
@@ -270,6 +284,22 @@ public class OACalendarView extends View implements View.OnTouchListener {
             return false;
         return true;
     }
+
+    public boolean isHistory(int index) {
+        if (needHintHistory) {
+            calendar.setTime(curDate);
+            int month = calendar.get(Calendar.MONTH);
+            int year = calendar.get(Calendar.YEAR);
+            calendar.set(Calendar.DAY_OF_MONTH, date[index]);
+            Calendar c = Calendar.getInstance();
+            if (year == c.get(Calendar.YEAR) && month == c.get(Calendar.MONTH) && todayIndex == index) {
+                return false;
+            }
+            return calendar.compareTo(c) < 0;
+        } else {
+            return false;
+        }
+    }
     /*end 判断*/
 
     /**
@@ -302,7 +332,9 @@ public class OACalendarView extends View implements View.OnTouchListener {
         int indexX = (int) Math.floor(x / surface.cellWidth);
         int indexY = (int) Math.floor((y - surface.weekHeight) / surface.cellHeight);
         downIndex = indexY * 7 + indexX;
-        if (downIndex < startIndex || downIndex > endIndex) return false;//当点击的是非本月的日期时候
+        if (downIndex < startIndex || downIndex > endIndex || !canClickHistory)
+            return false;//当点击的是非本月的日期时候
+
         calendar.setTime(curDate);
         calendar.set(Calendar.DAY_OF_MONTH, date[downIndex]);
         downDate = calendar.getTime();
@@ -328,10 +360,10 @@ public class OACalendarView extends View implements View.OnTouchListener {
 
     /*设置月份*/
     public void setCurDate(Date date) {
-        LogUtil.d("Test",""+ DateFormatUtil.getStrDate4Date(date,"yyyy-MM-dd"));
+        LogUtil.d("Test", "" + DateFormatUtil.getStrDate4Date(date, "yyyy-MM-dd"));
         curDate = date;
         calendar.setTime(curDate);
-        int curMoth=calendar.get(Calendar.DAY_OF_MONTH);
+        int curMoth = calendar.get(Calendar.DAY_OF_MONTH);
         calendar.set(Calendar.DAY_OF_MONTH, 1);
         startIndex = calendar.get(Calendar.DAY_OF_WEEK) - 1;//获取第一天在当周的星期几，返回多1，所以减1
         maxDay = calendar.getActualMaximum(Calendar.DATE);//获取当月有多少天
@@ -341,11 +373,11 @@ public class OACalendarView extends View implements View.OnTouchListener {
         for (int i = startIndex, j = 1; i < this.date.length; i++, j++) {
             this.date[i] = j;
         }
-        
+
 //        if (isThisMonth()) {
 //            downIndex = todayIndex;
 //        } else {
-            this.downIndex = Math.min(startIndex + curMoth - 1, this.date.length - 1);
+        this.downIndex = Math.min(startIndex + curMoth - 1, this.date.length - 1);
 //        }
         surface.init();
         invalidate();

app_core/common/src/main/res/layout/input_error_msg.xml

@@ -28,7 +28,7 @@
             android:layout_width="match_parent"
             android:layout_height="150dp"
             android:background="@null"
-            android:maxLines="3"
+            android:maxLines="5"
             android:maxLength="100"
             android:hint="请输入你的问题"
             android:textColor="@color/text_main"
@@ -66,9 +66,9 @@
             android:textSize="@dimen/text_main"
             android:layout_weight="1"
             android:layout_alignParentBottom="true"
-            android:layout_marginBottom="30dp"
+            android:layout_marginBottom="10dp"
             android:layout_marginLeft="20dp"
             android:layout_marginRight="20dp"
-            android:layout_marginTop="30dp"
+            android:layout_marginTop="10dp"
             /></LinearLayout>
 </LinearLayout>

app_modular/appme/src/main/java/com/uas/appme/settings/activity/CheckWagesActivity.java

@@ -180,6 +180,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
 
         mTel.setText(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"user_phone"));
         master = CommonUtil.getSharedPreferences(ct, "erp_master");
+//        master = "uas_dev";
         emcode = CommonUtil.getEmcode();
 //        emcode = "U0747";
 

app_modular/appme/src/main/java/com/uas/appme/settings/activity/FeedbackActivity.java

@@ -792,6 +792,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
         params.addBodyParameter("type", "common");
         params.addBodyParameter("img", file == null ? new File(path) : file);
         String url = CommonUtil.getAppBaseUrl(ct) + "mobile/uploadEmployeeAttach.action";
+        Log.i("urlparams",url);
         final HttpUtils http = new HttpUtils();
         http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
             @Override

app_modular/appme/src/main/java/com/uas/appme/settings/activity/FindWagePWActivity.java

@@ -151,6 +151,7 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
                 .add("phone",mPhoneEt.getText().toString())
                 .add("em_uu", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
                 .add("master",CommonUtil.getSharedPreferences(ct, "erp_master"))
+//                .add("master","uas_dev")
                 .header("Cookie","JSESSIONID="+CommonUtil.getSharedPreferences(BaseConfig.getContext(), "sessionId"))
                 .method(Method.POST)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {

app_modular/appme/src/main/java/com/uas/appme/settings/activity/WagesDetailsActivity.java

@@ -184,6 +184,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 emcode = CommonUtil.getEmcode();
 //        emcode = "U0747";
         master = CommonUtil.getSharedPreferences(ct, "erp_master");
+//        master = "uas_dev";
         getSupportActionBar().setTitle("工资查询");
 
         mWagesLv = (MyListView) findViewById(R.id.wages_lv);
@@ -367,7 +368,8 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         params.addBodyParameter("result","true");
         params.addQueryStringParameter("master", master);
         params.addBodyParameter("msg","");
-        if (needSignature != 1)
+        Log.i("urlparams",plainpath);
+        if (needSignature == 1)
             params.addBodyParameter("img",new File(plainpath));
         final HttpUtils http = new HttpUtils();
         Log.i("urlparams",url+params+"");

app_modular/appme/src/main/java/com/uas/appme/settings/adapter/WagesDetailsAdapter.java

@@ -1,6 +1,7 @@
 package com.uas.appme.settings.adapter;
 
 import android.content.Context;
+import android.text.TextPaint;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -54,6 +55,12 @@ public class WagesDetailsAdapter extends BaseAdapter {
         } else {
             wHolder = (WagesHolder) convertView.getTag();
         }
+        TextPaint tp = wHolder.value .getPaint();
+        if(position == modeList.size() - 1){
+            tp.setFakeBoldText(true);
+        }else {
+            tp.setFakeBoldText(false);
+        }
         wHolder.key.setText(modeList.get(position).getKey()+"");
         wHolder.value.setText(modeList.get(position).getValue()+"");
         return convertView;

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/ApprovaPresenter.java

@@ -848,11 +848,8 @@ public class ApprovaPresenter implements OnHttpResultListener {
                 String findTionName = JSONUtil.getText(config, "DG_FINDFUNCTIONNAME");
                 if (!StringUtil.isEmpty(findTionName)) {
                     int hhitem = findTionName.indexOf('|');
-                    Log.i("gongpengming","findTionName="+findTionName);
                     String gCaller = findTionName.substring(0, hhitem);
-                    Log.i("gongpengming","gCaller="+gCaller);
                     String coreKey = findTionName.substring(hhitem+1, findTionName.length());
-                    Log.i("coreKey","coreKey="+coreKey);
                     approval.setgCaller(gCaller);
                     approval.setCoreKey(coreKey);
                 }
@@ -872,7 +869,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
             } else {
                 newValues = values;
             }
-            if (approval.isDftypeEQ("MF") || (record.title.contains("公章用印申请流程") && "附件".equals(caption))) {
+            if (approval.isDftypeEQ("FF") || (record.title.contains("公章用印申请流程") && "附件".equals(caption))) {
                 if (isMain) {
                     final String fb_attach = newValues;
                     OAHttpHelper.getInstance().post(new Runnable() {

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/MessagePresenter.java

@@ -543,20 +543,34 @@ public class MessagePresenter implements OnHttpResultListener {
             showsubsNum(0, "", "");
             return;
         }
-        List<SubscriptionMessage> messages = null;
         int num = 0;
+        String title = "";
+        String sub = "";
         if (object.containsKey("data")) {
-            messages = JSON.parseArray(object.getJSONArray("data").toJSONString(), SubscriptionMessage.class);
-            if (ListUtils.isEmpty(messages)) {
-                showsubsNum(0, "", "");
-                return;
-            }
-            for (SubscriptionMessage e : messages) {
-                if (e.getSTATUS_() == 0)
-                    num += 1;
+            //TODO 未验证修改
+            JSONArray array = JSONUtil.getJSONArray(object, "data");
+            if (!ListUtils.isEmpty(array)){
+                for (int i = 0; i < array.size(); i++) {
+                    if (JSONUtil.getInt(array.getJSONObject(i), "STATUS_") == 0) {
+                        num += 1;
+                    }
+                }
+                title=JSONUtil.getText(array.getJSONObject(0),"TITLE_");
+                long time=JSONUtil.getLong(array.getJSONObject(0),"CREATEDATE_");
+                sub= TimeUtils.getFriendlyTimeDesc(ct, (int) (time / 1000));
             }
+//            messages = JSON.parseArray(object.getJSONArray("data").toJSONString(), SubscriptionMessage.class);
+//            if (ListUtils.isEmpty(messages)) {
+//                showsubsNum(0, "", "");
+//                return;
+//            }
+//            for (SubscriptionMessage e : messages) {
+//                if (e.getSTATUS_() == 0) {
+//                    num += 1;
+//                }
+//            }
         }
-        showsubsNum(num, messages.get(0).getTITLE_(), messages.get(0).getCREATEDATE_());
+        showsubsNum(num,title,sub);
     }
 
     private void showsubsNum(int num, String title, String time) {

app_modular/apputils/src/main/java/com/modular/apputils/utils/SwitchUtil.java

@@ -1,6 +1,8 @@
 package com.modular.apputils.utils;
 
 
+import com.common.config.BaseConfig;
+
 /**
  * Created by Bitlike on 2017/11/22.
  */

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/adapter/CycleCountAdapter.java

@@ -56,7 +56,7 @@ public class CycleCountAdapter extends BaseAdapter {
         }
         List<CycleCount.Data> datas = null;
         if (model.isExpand()) {
-            holder.expandImg.setImageResource(R.drawable.ic_menu_retract);
+            holder.expandImg.setImageResource(R.drawable.ic_menu_spread);
             datas = model.getDatas();
         } else {
             holder.expandImg.setImageResource(R.drawable.ic_menu_retract);

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/PlatWDdetailyActivity.java

@@ -136,6 +136,7 @@ public class PlatWDdetailyActivity extends BaseActivity {
         approval_flowlv = (MyListView) findViewById(R.id.work_daily_detail_approval_flow_lv);
         unsubmit_iv = (ImageView) findViewById(R.id.work_daily_unsubmit_iv);
         resubmit_ll = (LinearLayout) findViewById(R.id.common_docui_resubmit_ll);
+        resanddel_ll = (LinearLayout) findViewById(R.id.item_common_docui_res_and_del_ll);
         delete_ll = (LinearLayout) findViewById(R.id.common_docui_delete_ll);
         resubmit_tv = (TextView) findViewById(R.id.common_docui_resubmit_tv);
         hide_above_af = findViewById(R.id.hide_above_af);