备份

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

@@ -45,7 +45,11 @@ public class DataInquiryActivity extends BaseActivity {
         mDataInquiryMenuListAdapter = new DataInquiryMenuListAdapter(this, mGridMenuDataInquiryBeans);
         mMenuListView.setAdapter(mDataInquiryMenuListAdapter);
 
-        getMenuData();
+        if (!CommonUtil.isNetWorkConnected(this)) {
+            ToastMessage(getString(R.string.networks_out));
+        } else {
+            getMenuData();
+        }
     }
 
     private void getMenuData() {

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

@@ -195,19 +195,24 @@ public class ReportQueryCriteriaActivity extends BaseActivity implements View.On
     }
 
     private void initDatas() {
-        if (mReportInfo != null) {
-            progressDialog.show();
-            String url = Constants.getAppBaseUrl(this) + "mobile/qry/reportCondition.action";
-            Map<String, Object> params = new HashMap<>();
-            params.put("caller", mReportInfo.getCaller());
-            params.put("title", mReportInfo.getTitle());
-            LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-            ViewUtil.httpSendRequest(this, url, params, mHandler, headers, GET_OPTION_DATA, null, null, "post");
+        if (!CommonUtil.isNetWorkConnected(this)) {
+            ToastMessage(getString(R.string.networks_out));
         } else {
-            ToastMessage("方案信息获取失败！");
+            if (mReportInfo != null) {
+                progressDialog.show();
+                String url = Constants.getAppBaseUrl(this) + "mobile/qry/reportCondition.action";
+                Map<String, Object> params = new HashMap<>();
+                params.put("caller", mReportInfo.getCaller());
+                params.put("title", mReportInfo.getTitle());
+                LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+                headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+                ViewUtil.httpSendRequest(this, url, params, mHandler, headers, GET_OPTION_DATA, null, null, "post");
+            } else {
+                ToastMessage("方案信息获取失败！");
+            }
         }
 
+
     }
 
     @Override

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

@@ -48,7 +48,11 @@ public class ReportStatisticsActivity extends BaseActivity {
         mReportStatisticsMenuListAdapter = new ReportStatisticsMenuListAdapter(this, mGridMenuReportStatisticsBeans);
         mMenuListView.setAdapter(mReportStatisticsMenuListAdapter);
 
-        getMenuData();
+        if (!CommonUtil.isNetWorkConnected(this)) {
+            ToastMessage(getString(R.string.networks_out));
+        } else {
+            getMenuData();
+        }
     }
 
     private void getMenuData() {

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

@@ -300,6 +300,7 @@ public class Constants {
         if (ct == null) return "";
         String baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
         return baseUrl;
+//        return "http://192.168.253.58:8080/ERP/";
     }
 
     public static String IM_BASE_URL = "http://113.105.74.140:8092/";

settings.gradle

@@ -1,5 +1,5 @@
 //主工程
-include ':WeiChat', 'message', ':android-pdf-viewer'
+include ':WeiChat', 'message'
 
 //核心模块
 include ':network'
@@ -19,6 +19,7 @@ include ':library-viewpager-indicator'
 include ':materialdialogs'
 include ':MPAndroidChart'
 include ':pullToRefershLibraryMy'
+include ':android-pdf-viewer'
 
 //核心模块
 project(':network').projectDir = new File('app_core/network')
@@ -38,3 +39,4 @@ project(':materialdialogs').projectDir = new File('app_third/materialdialogs')
 project(':MPAndroidChart').projectDir = new File('app_third/MPAndroidChart')
 project(':libfloatingactionbutton').projectDir = new File('app_third/libfloatingactionbutton')
 project(':library-swipemenu_lv').projectDir = new File('app_third/library-swipemenu_lv')
+project(':android-pdf-viewer').projectDir = new File('app_third/android-pdf-viewer')