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

WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java

@@ -116,7 +116,7 @@ public class BdLocationHelper {
         @Override
         public void onReceiveLocation(BDLocation location) {
             try {
-                if (System.currentTimeMillis() - oldTime < 5000) return;//防止过度
+                if (System.currentTimeMillis() - oldTime < 50000) return;//防止过度
                 if (locationEntity == null)
                     locationEntity = new LocationEntity();
                 locationEntity.clear();
@@ -218,9 +218,10 @@ public class BdLocationHelper {
         return locationEntity == null ? "" : locationEntity.getDistrict();
     }
 
-    public  boolean locationOk(){
+    public boolean locationOk() {
         return locationEntity == null ? false : locationEntity.isLocationOk();
     }
+
     public boolean isLocationUpdate() {
         return true;
     }

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

@@ -184,7 +184,11 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 if (CommonUtil.isNetWorkConnected(ct)) {
                     String start = tv_date_start.getText().toString().trim();
                     String end = tv_date_end.getText().toString().trim();
-                    if (!StringUtils.isEmpty(start) && !StringUtils.isEmpty(end) && start.compareTo(end) < 0) {
+                    if (StringUtils.isEmpty(start)) {
+                        Crouton.makeText(ct, "开始时间不能为空");
+                    } else if (StringUtils.isEmpty(end)) {
+                        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) {

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

@@ -73,7 +73,6 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
     private void loadLog(ArrayList<WorkModel> models, long time) {
         if (iWorkView != null)
             iWorkView.showLoading();
-
         String date = TimeUtils.s_long_2_str(time);
         //获取网络数据
         Map<String, Object> param = new HashMap<>();

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/wheel/OASigninPicker.java

@@ -30,7 +30,6 @@ public class OASigninPicker extends WheelPicker {
     private ArrayList<String> days = new ArrayList<String>();
     private String yearLabel = "年", monthLabel = "月", dayLabel = "日";
     private int selectedYearIndex = 0, selectedMonthIndex = 0, selectedDayIndex = 0;
-    private String hourLabel = "时", minuteLabel = "分";
     private OnDateTimePickListener onDateTimePickListener;
     private int year, month, day = 0;
 
@@ -42,7 +41,7 @@ public class OASigninPicker extends WheelPicker {
     public OASigninPicker(Activity activity) {
         super(activity);
         textSize = 16;//年月日时分，比较宽，设置字体小一点才能显示完整
-        for (int i = 2010; i <= 2016; i++) {
+        for (int i = 2011; i <= 2017; i++) {
             years.add(String.valueOf(i));
         }
         for (int i = 1; i <= 12; i++) {
@@ -245,8 +244,6 @@ public class OASigninPicker extends WheelPicker {
         this.yearLabel = yearLabel;
         this.monthLabel = monthLabel;
         this.dayLabel = dayLabel;
-        this.hourLabel = hourLabel;
-        this.minuteLabel = minuteLabel;
     }