报表打印地址获取逻辑修改

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

@@ -66,7 +66,9 @@ public class WebViewLoadActivity extends BaseActivity {
                         String name = bundle.getString("name");
                         String masterId = bundle.getString("masterId");
                         //添加获取报表地址
-                        String extrajaSperurl = JSONUtil.getText(result,"EN_EXTRAJASPERURL");
+                        String en_admin = JSONUtil.getText(result, "EN_ADMIN");
+                        String extrajaSperurl = JSONUtil.getText(result,
+                                "jasper".equals(en_admin) ? "EN_URL" : "EN_EXTRAJASPERURL");
                         CommonUtil.setSharedPreferences(ct, "extrajaSperurl", extrajaSperurl);
                         CommonUtil.setSharedPreferences(WebViewLoadActivity.this, "sessionId", sessionId);
                         CommonUtil.setSharedPreferences(WebViewLoadActivity.this, "erp_username", erpaccount);
@@ -120,7 +122,7 @@ public class WebViewLoadActivity extends BaseActivity {
         title = "";// 动态改变文字显示
         title = intent.getStringExtra("p");
         if (title != null) {
-          setTitle(title);
+            setTitle(title);
         }
         if ("UAS".equals(title)) {
             setTitle("UAS管理系统");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -187,7 +187,9 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
                         String master = msg.getData().getString("master");
                         String master_ch = msg.getData().getString("master_ch");
                         //添加获取报表地址
-                        String extrajaSperurl = JSONUtil.getText(message, "EN_EXTRAJASPERURL");
+                        String en_admin = JSONUtil.getText(message, "EN_ADMIN");
+                        String extrajaSperurl = JSONUtil.getText(message,
+                                "jasper".equals(en_admin) ? "EN_URL" : "EN_EXTRAJASPERURL");
                         CommonUtil.setSharedPreferences(ct, "extrajaSperurl", extrajaSperurl);
                         LogUtil.i("extrajaSperurl=" + extrajaSperurl);
                         CommonUtil.setSharedPreferences(ct, "erp_uu", String.valueOf(results.get("uu")));

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -467,7 +467,9 @@ public class ViewUtil {
             CommonUtil.setSharedPreferences(ct, "erp_uu", enuu);
             CommonUtil.setSharedPreferences(ct, "erp_masterId", erpMasterId);
             //添加获取报表地址
-            String extrajaSperurl = JSONUtil.getText(result,"EN_EXTRAJASPERURL");
+            String en_admin = JSONUtil.getText(result, "EN_ADMIN");
+            String extrajaSperurl = JSONUtil.getText(result,
+                    "jasper".equals(en_admin) ? "EN_URL" : "EN_EXTRAJASPERURL");
             LogUtil.i("gong","login extrajaSperurl="+extrajaSperurl);
             CommonUtil.setSharedPreferences(ct, "extrajaSperurl", extrajaSperurl);
             CommonUtil.setSharedPreferences(ct, "erp_login", true);

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/AppWebViewActivity.java

@@ -67,7 +67,9 @@ public class AppWebViewActivity extends SupportToolBarActivity {
                         String name = bundle.getString("name");
                         String masterId = bundle.getString("masterId");
                         //添加获取报表地址
-                        String extrajaSperurl = JSONUtil.getText(result,"EN_EXTRAJASPERURL");
+                        String en_admin = JSONUtil.getText(result, "EN_ADMIN");
+                        String extrajaSperurl = JSONUtil.getText(result,
+                                "jasper".equals(en_admin) ? "EN_URL" : "EN_EXTRAJASPERURL");
                         CommonUtil.setSharedPreferences(ct, "extrajaSperurl", extrajaSperurl);
                         CommonUtil.setSharedPreferences(ct, "sessionId", sessionId);
                         CommonUtil.setSharedPreferences(ct, "erp_username", erpaccount);

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/activity/PDFDownloadActivity.java

@@ -203,7 +203,6 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
 
             }
         }
-        Log.d("pdfurl", replace == null ? "" : replace);
 
         mStateTextView = (TextView) findViewById(R.id.pdf_download_state_tv);
         mRemainTextView = (TextView) findViewById(R.id.pdf_download_remain_tv);
@@ -281,6 +280,7 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
         } catch (IOException e) {
             e.printStackTrace();
         }
+        Log.d("pdfurl", downloadUrl == null ? "" : downloadUrl);
         mDownloader = new ProgressDownloader(downloadUrl, file, PDFDownloadActivity.this);
         mDownloader.download(0L);
     }