2016/09/06 -修改内容

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

@@ -26,8 +26,11 @@ import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 import com.xzjmyk.pm.activity.view.wheel.OptionPicker;
 
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -69,7 +72,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         ViewUtils.inject(this);
         type = getIntent().getIntExtra("type", 0);
         code = getIntent().getStringExtra("data");
-        form=getIntent().getStringExtra("from");
+        form = getIntent().getStringExtra("from");
         isBusiness = getIntent().getBooleanExtra("business", false);
         if (type == 0) {
             getSupportActionBar().setTitle("新增任务");
@@ -116,7 +119,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.btn_save:
-                if (tv_name.testValidity() && 
+                if (tv_name.testValidity() &&
                         tv_executive.testValidity()
                         && tv_date.testValidity()
                         && tv_priority.testValidity()
@@ -131,6 +134,35 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         return true;
     }
 
+    private void showDateDialog(final FormEditText tv) {
+        DateTimePicker picker = new DateTimePicker(this, DateTimePicker.HOUR_OF_DAY);
+        picker.setRange(2000, 2030);
+        picker.setSelectedItem(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH) + 1,
+                Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY),
+                Calendar.getInstance().get(Calendar.MINUTE));
+        picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
+            @Override
+            public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
+                String time = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00";
+                switch (tv.getId()) {
+                    case R.id.tv_date_select:
+                        tv_date_start.setText(time);
+                        break;
+                    case R.id.tv_visit_enddate:
+                        if (time.compareTo(tv_date_start.getText().toString()) < 0) {
+                            Crouton.makeText(ct, "结束时间不能小于开始时间");
+                        } else {
+                            tv_date.setText(time);
+                        }
+                        break;
+                }
+            }
+        });
+        picker.show();
+    }
+
     public void showDialog(final FormEditText tv, final boolean b) {
         final DateTimePickerDialog dialog = new DateTimePickerDialog(this, System.currentTimeMillis());
         dialog.setOnDateTimeSetListener(new DateTimePickerDialog.OnDateTimeSetListener() {
@@ -212,8 +244,8 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                     "\"handstatuscode\":\"" + "UNFINISHED" + "\",\n";
         }//BusinessDetailInfo
         String formStore;
-        if (form.equals("BusinessDetailInfo")){
-             formStore = "{\n" +
+        if (form.equals("BusinessDetailInfo")) {
+            formStore = "{\n" +
                     "\"taskcode\":\"" + tv_code + "\",\n" +//编号
                     "\"name\":\"" + tv_name.getText().toString() + "\",\n" +//名称
                     "\"resourcename\":\"" +//执行人
@@ -222,9 +254,9 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                     "\"enddate\":\"" +//结束时间
                     tv_date.getText().toString() +
                     "\",\n" +
-                     "\"class\":\"" +//商机详情进来
-                      "bstask" +
-                     "\",\n" +
+                    "\"class\":\"" +//商机详情进来
+                    "bstask" +
+                    "\",\n" +
                     "\"startdate\":\"" +//结束时间
                     tv_date_start.getText().toString() +
                     "\",\n" +
@@ -243,8 +275,8 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                     tv_content.getText().toString() +
                     "\",\n" + (isBusiness ? strs : "") +
                     "}";
-        }else{
-           formStore = "{\n" +
+        } else {
+            formStore = "{\n" +
                     "\"taskcode\":\"" + tv_code + "\",\n" +//编号
                     "\"name\":\"" + tv_name.getText().toString() + "\",\n" +//名称
                     "\"resourcename\":\"" +//执行人
@@ -272,7 +304,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                     "\",\n" + (isBusiness ? strs : "") +
                     "}";
         }
-   
+
         String url = Constants.getAppBaseUrl(ct) + "plm/task/addbilltask.action";
         Map<String, Object> params = new HashMap<>();
         params.put("formStore", formStore);
@@ -328,12 +360,14 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.tv_date_start:
-                showDialog(tv_date_start, true);
+//                showDialog(tv_date_start, true);
+                showDateDialog(tv_date_start);
 //                showDateDialog((FormEditText) v.findViewById(R.id.tv_date_start));
                 break;
             case R.id.tv_date:
                 if (tv_date_start.getText() != null && tv_date_start.getText().toString().length() > 0) {
-                    showDialog(tv_date, false);
+//                    showDialog(tv_date, false);
+                    showDateDialog(tv_date);
                 } else {
                     ToastUtil.showToast(ct, "请先填写开始日期");
                 }

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

@@ -6,7 +6,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -29,9 +28,11 @@ import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
 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.view.crouton.Crouton;
+import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -72,7 +73,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                         if (ma_code != null)
                             signinAble(JSON.parseObject(message).getInteger("id"));
                     } else {
-                        ToastUtil.showToast(ct, "获取id错误");
+                        Crouton.makeText(ct, "获取id错误");
                     }
                     break;
                 case whatSignin:
@@ -80,7 +81,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                     if (json.getBoolean("success") != null && json.getBoolean("success")) {
                         // 创建会议成功  开始日程
                         if (create_ric_sv.isChecked()) {
-                            ToastUtil.showToast(ct, "添加会议成功，正在为会议成员创建日程");
+                            Crouton.makeText(ct, "添加会议成功，正在为会议成员创建日程");
                             CodeUtil.getInstance().getCode(ct, "ProjectTask", new CodeUtil.OnCodeLinstener() {
                                 @Override
                                 public void callBack(String code) {
@@ -88,7 +89,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                                 }
                             });
                         } else {
-                            ToastUtil.showToast(ct, "添加会议成功!");
+                            Crouton.makeText(ct, "添加会议成功!");
                             endOfActivity();
                         }
 //                        CreateRoomUtil.getInstance().createRoom(ct, entities, name_et.getText().toString() + "会议群", "创建为了提醒会议成员", new CreateRoomUtil.OnCreateRoomListener() {
@@ -107,19 +108,19 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
 //                        createRoom(name_et.getText().toString() + "会议群", "创建为了提醒会议成员");
                     } else {
                         progressDialog.dismiss();
-                        ToastUtil.showToast(ct, "内部错误,请稍后再试或联系工作人员");
+                        Crouton.makeText(ct, "内部错误,请稍后再试或联系工作人员");
                     }
                     break;
                 case whatAdd:
                     break;
                 case 0x15://添加会议日程
                     progressDialog.dismiss();
-                    ToastUtil.showToast(ct, "为与会人员添加日程成功");
+                    Crouton.makeText(ct, "为与会人员添加日程成功");
                     endOfActivity();
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
-                    ToastUtil.showToast(ct, message == null ? "" : message);
+                    Crouton.makeText(ct, message == null ? "" : message);
                     break;
             }
         }
@@ -172,13 +173,15 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.start_rl://开始时间
-                showDialog(start_tv);
+//                showDialog(start_tv);
+                showDateDialog(start_tv);
                 break;
             case R.id.end_rl://结束时间
                 if (start_tv.getText() == null || start_tv.getText().length() <= 0) {
-                    ToastUtil.showToast(ct, "请先填写开始时间");
+                    Crouton.makeText(ct, "请先填写开始时间");
                 } else {
-                    showDialog(end_tv);
+                    showDateDialog(end_tv);
+//                    showDialog(end_tv);
                 }
                 break;
             case R.id.bt_save:
@@ -223,31 +226,31 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
     //判断是否可以进行创建
     private void signinAble(int id) {
         if (StringUtils.isEmpty(name_et.getText().toString())) {
-            ToastUtil.showToast(this, "会议名为空或格式不正确");
+            Crouton.makeText(this, "会议名为空或格式不正确");
             return;
         }
         if (StringUtils.isEmpty(start_tv.getText().toString())) {
-            ToastUtil.showToast(this, "开始时间为空或格式不正确");
+            Crouton.makeText(this, "开始时间为空或格式不正确");
             return;
         }
         if (StringUtils.isEmpty(end_tv.getText().toString())) {
-            ToastUtil.showToast(this, "结束时间为空或格式不正确");
+            Crouton.makeText(this, "结束时间为空或格式不正确");
             return;
         }
         if (StringUtils.isEmpty(location_et.getText().toString())) {
-            ToastUtil.showToast(this, "地点为空或格式不正确");
+            Crouton.makeText(this, "地点为空或格式不正确");
             return;
         }
         if (StringUtils.isEmpty(user_tv.getText().toString())) {
-            ToastUtil.showToast(this, "会议管理员为空或格式不正确");
+            Crouton.makeText(this, "会议管理员为空或格式不正确");
             return;
         }
         if (entities == null || entities.size() <= 0) {
-            ToastUtil.showToast(this, "参会人员不符要求");
+            Crouton.makeText(this, "参会人员不符要求");
             return;
         }
         if (start_tv.getText().toString().compareTo(end_tv.getText().toString()) > 0) {
-            ToastUtil.showToast(this, "开始时间不能大于结束时间");
+            Crouton.makeText(this, "开始时间不能大于结束时间");
             return;
         }
         StringBuilder builder = new StringBuilder();
@@ -264,6 +267,35 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         doSignin(builder.toString(), builderId.toString(), id);
     }
 
+    private void showDateDialog(final TextView tv) {
+        DateTimePicker picker = new DateTimePicker(this, DateTimePicker.HOUR_OF_DAY);
+        picker.setRange(2000, 2030);
+        picker.setSelectedItem(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH) + 1,
+                Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY),
+                Calendar.getInstance().get(Calendar.MINUTE));
+        picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
+            @Override
+            public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
+                String time = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00";
+                switch (tv.getId()) {
+                    case R.id.start_tv:
+                        start_tv.setText(time);
+                        break;
+                    case R.id.end_tv:
+                        if (time.compareTo(start_tv.getText().toString()) < 0) {
+                            Crouton.makeText(ct, "结束时间不能小于开始时间");
+                        } else {
+                            end_tv.setText(time);
+                        }
+                        break;
+                }
+            }
+        });
+        picker.show();
+    }
+
     public void showDialog(final TextView tv) {
         DateTimePickerDialog dialog = new DateTimePickerDialog(this, System.currentTimeMillis());
         dialog.setOnDateTimeSetListener(new DateTimePickerDialog.OnDateTimeSetListener() {
@@ -359,7 +391,6 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                 "}";
         String url = Constants.getAppBaseUrl(ct) + "plm/task/addbilltask.action";
         Map<String, Object> params = new HashMap<>();
-        Log.i("gongpengming", formStore);
         params.put("formStore", formStore);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));

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

@@ -6,6 +6,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
+import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
@@ -19,6 +20,10 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.regex.Matcher;
@@ -36,7 +41,6 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
     private AlarmaActivity ct;
 
     private static String ALARMA_CLICK = "ALARMA_CLICK";//判断是否选中
-
     public static String KEY_ALAR_ACTION = "KEY_ALAR_ACTION";//发送上班
     public static String KEY_UALAR_ACTION = "KEY_UALAR_ACTION";//发送下班提醒
     public static String KEY_ALAR_TIME = "KEY_ALAR_TIME";
@@ -51,6 +55,9 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         initView();
     }
 
+
+
+
     private void initView() {
         //初始化界面显示时间
         tv_alar.setOnClickListener(this);
@@ -159,27 +166,25 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         //操作：发送一个广播，广播接收后Toast提示定时操作完成
         Intent intent = new Intent(AlarmaActivity.this, AlarmReceiver.class);
         String actionArg;
-        if (isAlar)
-            actionArg = KEY_ALAR_ACTION;
-        else
-            actionArg = KEY_UALAR_ACTION;
+        actionArg = KEY_ALAR_ACTION;
         intent.setAction(actionArg);
         CommonUtil.setSharedPreferences(this, "ALARMA_ACTION", actionArg);
         AlarmManager alarm = (AlarmManager) getSystemService(ALARM_SERVICE);
+
         Calendar c = Calendar.getInstance();
         c.setTimeInMillis(System.currentTimeMillis());
         alarm.set(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), getPendingIntent(intent));
     }
 
     private PendingIntent getPendingIntent(Intent intent) {
-        return PendingIntent.getBroadcast(AlarmaActivity.this, 0, intent, 0);
+        return PendingIntent.getBroadcast(AlarmaActivity.this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
     }
 
     //清空提醒
     private void unArmmanager() {
         Intent intent = new Intent(AlarmaActivity.this, AlarmReceiver.class);
         intent.setAction(CommonUtil.getSharedPreferences(this, "ALARMA_ACTION"));
-        PendingIntent pi = PendingIntent.getBroadcast(this, 0, intent, 0);
+        PendingIntent pi = PendingIntent.getBroadcast(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         AlarmManager alarm = (AlarmManager) getSystemService(ALARM_SERVICE);
         alarm.cancel(pi);
     }
@@ -190,7 +195,6 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
          下班时间设置，弹出款：延迟1分钟，延迟2分钟，延迟5分钟，延迟10分钟，延迟20分钟，延迟30分钟
          */
         final String[] str = new String[6];
-
         if (isU) {
             str[0] = "提前1分钟";
             str[1] = "提前2分钟";

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

@@ -189,10 +189,10 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         //设置开始和结束时间的显示
         name_tv.setText(entity.getMa_theme() == null ? "" : entity.getMa_theme());
         long startLongTime = TimeUtils.f_str_2_long(entity.getMa_starttime());
+        long endLongTime = TimeUtils.f_str_2_long(entity.getMa_endtime());
         oa_meeting_start.setText(TimeUtils.long2str(startLongTime, "MM月dd"));
+        oa_meeting_end.setText(TimeUtils.long2str(endLongTime, "MM月dd"));
         oa_meeting_start_date.setText(TimeUtils.long2str(startLongTime, "HH:mm"));
-        long endLongTime = TimeUtils.f_str_2_long(entity.getMa_endtime());
-        oa_meeting_end.setText(TimeUtils.long2str(startLongTime, "MM月dd"));
         oa_meeting_end_date.setText(TimeUtils.long2str(endLongTime, "HH:mm"));
         if (entity.getMa_recorder() != null && !MyApplication.getInstance().mLoginUser.getNickName().equals(entity.getMa_recorder()) || "已结束".equals(status_tv.getText().toString().trim())) {
             end_meet_tv.setVisibility(View.GONE);

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

@@ -287,7 +287,7 @@ public class MeetingActivity extends BaseActivity {
             viewholder.oa_meeting_status_tv.setText(entities.get(i).getMa_stage());
             long startLong = TimeUtils.f_str_2_long(entity.getMa_starttime());
             long endLong = TimeUtils.f_str_2_long(entity.getMa_endtime());
-            viewholder.oa_meeting_start.setText(TimeUtils.long2str(endLong, "MM月dd日"));
+            viewholder.oa_meeting_start.setText(TimeUtils.long2str(startLong, "MM月dd日"));
             viewholder.oa_meeting_end.setText(TimeUtils.long2str(endLong, "MM月dd日"));
             viewholder.oa_meeting_start_date.setText(TimeUtils.long2str(startLong, "HH:mm"));
             viewholder.oa_meeting_end_date.setText(TimeUtils.long2str(endLong, "HH:mm"));

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

@@ -104,6 +104,9 @@ public class UserSelectActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_meet_select);
         ViewUtils.inject(this);
+        isSingle = getIntent().getBooleanExtra("single", false);
+        //是否获取网络数据
+        isNet = getIntent().getBooleanExtra("net", false);
         initView();
         init();
     }
@@ -211,9 +214,7 @@ public class UserSelectActivity extends BaseActivity {
     }
 
     private void init() {
-        isSingle = getIntent().getBooleanExtra("single", false);
-        //是否获取网络数据
-        isNet = getIntent().getBooleanExtra("net", false);
+
         if (isNet) {
             getDataByNet();
         } else {

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

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -64,11 +65,16 @@ public class SigninAdapter extends RecyclerView.Adapter<SigninAdapter.ViewHoler>
                 end = "";
         if (!ListUtils.isEmpty(b.getSigninList()) && b.getSigninList().size() > 0) {
             holder.signin.setText(b.getSigninList().get(0));//填充时间
+            if (b.getSigninList().get(0).compareTo(b.getStartSignin()) > 0 && b.getSigninList().get(0).compareTo(getNext90(b.getStartTime(), true)) < 0) {
+            } else {
+                holder.signin.setText("");
+            }
             start = getTag(b.getStartTime(), b.getStartSignin(), getNext90(b.getStartTime(), true), b.getSigninList().get(0), true);
             if (b.getSigninList().size() != 1) {
                 String signin = b.getSigninList().get(b.getSigninList().size() - 1);
-                if (signin.compareTo(b.getEndTime()) > 0 && signin.compareTo(b.getEndSignnin()) < 0)
+                if (signin.compareTo(getNext90(b.getEndTime(), false)) > 0 && signin.compareTo(b.getEndSignnin()) < 0) {
                     holder.signin2.setText(b.getSigninList().get(b.getSigninList().size() - 1));//填充时间
+                }
                 end = getTag(b.getEndTime(), getNext90(b.getEndTime(), false), b.getEndSignnin(), b.getSigninList().get(b.getSigninList().size() - 1), false);
             }
         } else {
@@ -85,12 +91,8 @@ public class SigninAdapter extends RecyclerView.Adapter<SigninAdapter.ViewHoler>
         if (StringUtils.isEmpty(end) || "-1".equals(end)) {//当前时间还没有到达下班时间
             holder.tag2.setVisibility(View.GONE);
         } else {
-            if (StringUtils.isEmpty(holder.tag2.getText().toString()))
-                holder.tag2.setVisibility(View.GONE);
-            else {
-                holder.tag2.setText(end);
-                holder.tag2.setVisibility(View.VISIBLE);
-            }
+            holder.tag2.setText(end);
+            holder.tag2.setVisibility(View.VISIBLE);
         }
     }
 
@@ -111,9 +113,9 @@ public class SigninAdapter extends RecyclerView.Adapter<SigninAdapter.ViewHoler>
      */
     private String getTag(String workTime, String startSignin, String endSignin, String proit, boolean isU) {
         String tag = "";
-        if (proit.compareTo(workTime) < 0 && proit.compareTo(startSignin) > 0 || (isU && time.compareTo(workTime) < 0)) { //判断正常签到 在startSignin到workTime之间
+        if (proit.compareTo(workTime) < 0 && proit.compareTo(startSignin) > 0) { //判断正常签到 在startSignin到workTime之间
             tag = isU ? "-1" : "早退";
-        } else if (proit.compareTo(workTime) > 0 && proit.compareTo(endSignin) < 0 || (!isU && time.compareTo(workTime) < 0)) { //判断迟到签到 在workTime到endSignin
+        } else if (proit.compareTo(workTime) > 0 && proit.compareTo(endSignin) < 0) { //判断迟到签到 在workTime到endSignin
             tag = isU ? "迟到" : "-1";
         } else if (isU && proit.compareTo(endSignin) > 0) {//当签到时间大于endSignin，为缺勤
             tag = "缺勤";

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

@@ -11,6 +11,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
 import android.text.Spanned;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -38,6 +39,10 @@ import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -131,6 +136,15 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     else
                         Crouton.makeText(ct, "签到失败");
                     break;
+                case 0x19:
+                    final long id = msg.getData().getLong("time");
+                    CodeUtil.getInstance().getCode(ct, "CardLog", new CodeUtil.OnCodeLinstener() {
+                        @Override
+                        public void callBack(String code) {
+                            doSignin(code, id);
+                        }
+                    });
+                    break;
                 default:
                     break;
             }
@@ -178,12 +192,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             case R.id.signin_btn:
                 //TODO 判断是否可以签到
                 if (isPlay()) {
-                    CodeUtil.getInstance().getCode(ct, "CardLog", new CodeUtil.OnCodeLinstener() {
-                        @Override
-                        public void callBack(String code) {
-                            doSignin(code);
-                        }
-                    });
+                    getTimeByNet();
                 }
                 break;
             case R.id.title:
@@ -207,6 +216,30 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         listener();
     }
 
+    private void getTimeByNet() {
+        new Thread() {
+            @Override
+            public void run() {
+                try {
+                    URL url = new URL("http://www.bjtime.cn");
+                    URLConnection uc = url.openConnection();
+                    uc.connect();
+                    long id = uc.getDate();
+                    Log.i("gongpengming", TimeUtils.f_long_2_str(id));
+                    Message message = handler.obtainMessage();
+                    message.what = 0x19;
+                    message.getData().putLong("time", id);
+                    message.getData().putString("result", "result");
+                    handler.sendMessage(message);
+                } catch (MalformedURLException e) {
+                    e.printStackTrace();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }.start();
+    }
+
     private void listener() {
         seting.setOnClickListener(this);
         back.setOnClickListener(this);
@@ -303,7 +336,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                 beans.get(i).getSigninList().add(time);
             }
         }
-        Crouton.makeText(ct, "签到成功,请重试或联系管理员！！");
+        Crouton.makeText(ct, "签到成功！");
         setDataForAdapter(beans);
     }
 
@@ -472,7 +505,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
     }
 
     //签到
-    private void doSignin(String code) {
+    private void doSignin(String code, long id) {
         signin_btn.setFocusable(false);
         String url = "mobile/saveCardLog.action";
         final Map<String, Object> param = new HashMap<>();
@@ -481,7 +514,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         bean.setCl_address(office_addr.getText().toString());
         bean.setCl_distance(distance);
         bean.setCl_emcode(CommonUtil.getSharedPreferences(ct, "erp_username"));
-        bean.setCl_time(TimeUtils.f_long_2_str(System.currentTimeMillis()));
+        bean.setCl_time(TimeUtils.f_long_2_str(id));
         bean.setCl_location(office_addr.getText() == null ? "" : office_addr.getText().toString());
         bean.setCl_emname(MyApplication.getInstance().mLoginUser.getNickName());
         bean.setCl_phone(MyApplication.getInstance().mLoginUser.getTelephone());

libpsectionlistview/build.gradle

@@ -3,6 +3,7 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 22
     buildToolsVersion "22.0.1"
+    resourcePrefix "swipemenulistview"
 
     defaultConfig {
         minSdkVersion 8
@@ -20,5 +21,76 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:support-v4:22.1.1'
+}
+
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
+
+version = "1.3.0"
+
+def siteUrl = 'https://github.com/baoyongzhang/SwipeMenuListView'
+def gitUrl = 'https://github.com/baoyongzhang/SwipeMenuListView.git'
+group = "com.baoyz.swipemenulistview"
+install {
+    repositories.mavenInstaller {
+        pom {
+            project {
+                packaging 'aar'
+                // Add your description here
+                name 'SwipeMenuListView' 	//项目描述
+                url siteUrl
+                // Set your license
+                licenses {
+                    license {
+                        name 'The MIT License (MIT)'
+                        url 'http://baoyz.com/licenses/LICENSE.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id 'baoyongzhang'		//填写的一些基本信息
+                        name 'baoyongzhang'
+                        email 'baoyz94@gmail.com'
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+                }
+            }
+        }
+    }
+}
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+task javadoc(type: Javadoc) {
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+    configurations = ['archives']
+    pkg {
+        repo = "maven"
+        name = "SwipeMenuListView"	//发布到JCenter上的项目名字
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = ["MIT"]
+        publish = true
+    }
 }