@A before

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

@@ -191,6 +191,9 @@ public class TaskActivity extends BaseActivity implements OnClickListener {
     private void doClassifyAllList(List<AllProcess> allList) {
         if (mCurrentPage == 1) {
             if (!ListUtils.isEmpty(real_List)) real_List.clear();
+            if (!ListUtils.isEmpty(waitList)) waitList.clear();
+            if (!ListUtils.isEmpty(doneList)) doneList.clear();
+            if (!ListUtils.isEmpty(isendList)) isendList.clear();
             ToastMessage(getString(R.string.common_refresh_finish));
         } else {
             ToastMessage(getString(R.string.common_up_finish));
@@ -353,9 +356,9 @@ public class TaskActivity extends BaseActivity implements OnClickListener {
         listview_main.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
-                if (!ListUtils.isEmpty(waitList)) waitList.clear();
-                if (!ListUtils.isEmpty(doneList)) doneList.clear();
-                if (!ListUtils.isEmpty(isendList)) isendList.clear();
+//                if (!ListUtils.isEmpty(waitList)) waitList.clear();
+//                if (!ListUtils.isEmpty(doneList)) doneList.clear();
+//                if (!ListUtils.isEmpty(isendList)) isendList.clear();
                 mCurrentPage = 1;
                 sendResquestForServerAll(2, mCurrentPage);
             }

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

@@ -137,7 +137,7 @@ public class FlihtsDateSelectActivity extends BaseActivity implements DatePicker
 
     private void daDateUpdate(List<FlightsModel> models, String date,int position) {
         String url = Constants.getAppBaseUrl(getApplicationContext())+"/mobile/updateEmpWorkDate.action";
-//        String url = "https://192.168.253.252:8080/ERP/"+"mobile/updateEmpWorkDate.action";
+//        String url = "http://192.168.253.252:8080/ERP/"+"mobile/updateEmpWorkDate.action";
         Map<String,Object> param = new HashMap<>();
         param.put("deptcodes", models.get(position).getHrorgsModel().getEmployeecode());
         param.put("emcodes",models.get(position).getEmployeesModel().getEmployeecode() == null ? "":

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/http/DepositNoticeUtil.java

@@ -133,13 +133,11 @@ public class DepositNoticeUtil {
                 LogUtil.i("distance == -1f");
                 continue;
             }
-            LogUtil.prinlnLongMsg("startTime,current_T",model.getAb_starttime()+","+TimeUtils.f_long_2_str(System.currentTimeMillis()));
             if (model.getAb_starttime().compareTo(TimeUtils.f_long_2_str(System.currentTimeMillis())) > 0){
-
                 setNoticeTime(model.getAb_starttime(), latLng, distance);
-
-                LogUtil.prinlnLongMsg("startTime,current_T",model.getAb_starttime()+","+TimeUtils.f_long_2_str(System.currentTimeMillis()));
             }
+            LogUtil.prinlnLongMsg("startTime,current_T",model.getAb_starttime()+","+TimeUtils.f_long_2_str(System.currentTimeMillis()));
+
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/view/VpDemoActivity.java

@@ -0,0 +1,9 @@
+package com.xzjmyk.pm.newpedo.view;
+
+/**
+ * Created by FANGlh on 2017/7/28.
+ * function:
+ */
+
+public class VpDemoActivity  {
+}

WeiChat/src/main/res/layout/activity_approval.xml

@@ -134,6 +134,7 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/contentRV"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:layout_marginLeft="10dp"/>
     </RelativeLayout>
 </RelativeLayout>