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

# Conflicts:
#	WeiChat/build.gradle

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

@@ -1163,6 +1163,9 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                  id=data.getIntExtra("id",0);
                 String startDate=data.getStringExtra("startDate");
                 String endDate=data.getStringExtra("endDate");
+
+                startDate=startDate+":00";
+                endDate=endDate+":0";
                 String field=data.getStringExtra("field");
                 LogUtil.d("id=" +id);
                 LogUtil.d("groupId=" + model.getGroupId());
@@ -1201,8 +1204,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 va_alltimes=i+1;
                             }
                         }
-                        mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alldays - 1).setValue(startDate);
-                        mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alltimes - 1).setValue(endDate);
+                        mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alltimes - 1).setValue(startDate);
+                        mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alldays - 1).setValue(endDate);
                     }
                     if ("fpd_date1".equals(field)||"fpd_date2".equals(field)){
                         List<Data>  tempLists= mAdapter.getmListData().get(model.getGroupId()).getDatas();

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

@@ -30,6 +30,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 
 import java.text.DecimalFormat;
@@ -77,7 +78,7 @@ public class LocationSearchActivity extends BaseActivity {
     private BdLocationHelper locationHelper;
     private int pageNum = 0;
     private LocationAdapter adapter;
-
+    private EmptyLayout mEmptyLayout;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         initStyle();
@@ -149,8 +150,12 @@ public class LocationSearchActivity extends BaseActivity {
     }
 
     private void initView() {
-        View view = LayoutInflater.from(this).inflate(R.layout.empty_locayion, null);
-        listview.setEmptyView(view);
+
+        mEmptyLayout = new EmptyLayout(this,listview.getRefreshableView());
+        mEmptyLayout.setShowLoadingButton(false);
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
+        mEmptyLayout.setEmptyViewRes(R.layout.empty_locayion);
         search_rl.setVerticalGravity(search ? View.VISIBLE : View.GONE);
         BaiduMapUtil.getInstence().setMapViewPoint(bmapView, true);
         adapter = new LocationAdapter();
@@ -214,6 +219,7 @@ public class LocationSearchActivity extends BaseActivity {
                     chche.add(e);
             }
             if (ListUtils.isEmpty(chche)) {//如果数据为空，就获取输入的地址对应的数据
+                mEmptyLayout.showEmpty();
                 if (type == 2) {
                     loadDataByCity();
                 } else adapter.setListData(null);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/attendance/AutoErpSigninUitl.java

@@ -108,9 +108,9 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
         if (model.getStatus() == 2) remark = "自动外勤签退";
         else remark = "自动外勤签到";
         formStore.put("mo_remark", remark);//备注
-        String location = MyApplication.getInstance().getBdLocationHelper().getName();
+        String location = model.getCompanyName();
         if (StringUtils.isEmpty(location))
-            location = model.getCompanyName();
+            location = MyApplication.getInstance().getBdLocationHelper().getName();
         formStore.put("mo_company", location);
 //        param.put("mpd_status", "签退");//
         param.put("caller", "Mobile_outsign");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/Subscription2Activity.java

@@ -310,7 +310,7 @@ public class Subscription2Activity extends BaseActivity {
         if (isRef)
             reckonData();
         else if (start == 0) {
-            adapter.notifyDataSetChanged();
+            updataAdapter();
         } else
             adapter.notifyItemRangeInserted(start, end);
     }

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

@@ -54,7 +54,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="3dp"
-                    android:text="开始时间"/>
+                    android:text="结束时间"/>
 
                 <TextView
                     android:id="@+id/v_date_end"