合并draft 与developer分支

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

@@ -17,6 +17,7 @@ import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
 import com.core.app.Constants;
 import com.core.utils.CommonUtil;
+import com.core.widget.DrawableCenterTextView;
 import com.core.widget.view.MyGridView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -27,7 +28,6 @@ import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.adapter.DataInquiryMen
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.DataInquiryGirdItemBean;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.GridMenuDataInquiryBean;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.view.DrawableCenterTextView;
 
 import org.json.JSONArray;
 import org.json.JSONException;

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

@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
 import com.core.app.Constants;
 import com.core.utils.CommonUtil;
+import com.core.widget.DrawableCenterTextView;
 import com.core.widget.view.MyGridView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -29,7 +30,6 @@ import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.adapter.ReportStatisti
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.DataInquiryGirdItemBean;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.GridMenuReportStatisticsBean;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.view.DrawableCenterTextView;
 
 import org.json.JSONArray;
 import org.json.JSONException;

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

@@ -6,7 +6,7 @@
               android:background="@color/bg_underlying"
               android:orientation="vertical">
 
-    <com.xzjmyk.pm.activity.view.DrawableCenterTextView
+    <com.core.widget.DrawableCenterTextView
         android:id="@+id/data_inquiry_menu_search_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"