提交类型 修复bug

提交内容  修改登陆取到获取报表接口的url

WeiChat/build.gradle

@@ -180,7 +180,7 @@ dependencies {
     compile project(':appbooking')
     compile project(':appmusic')
     compile project(':apputils')
-//    compile project(':faceplatform-ui')
+    compile project(':faceplatform-ui')
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile 'com.android.support:support-v4:26.+'
 }

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

@@ -16,6 +16,8 @@ import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
 
 import com.alibaba.fastjson.JSON;
+import com.common.data.Blowfish;
+import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
@@ -25,7 +27,6 @@ import com.core.utils.FlexJsonUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshWebView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.common.data.Blowfish;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import org.apache.http.util.EncodingUtils;
@@ -64,6 +65,9 @@ public class WebViewLoadActivity extends BaseActivity {
                         String master = bundle.getString("master");
                         String name = bundle.getString("name");
                         String masterId = bundle.getString("masterId");
+                        //添加获取报表地址
+                        String extrajaSperurl = JSONUtil.getText(result,"EN_EXTRAJASPERURL");
+                        CommonUtil.setSharedPreferences(ct, "extrajaSperurl", extrajaSperurl);
                         CommonUtil.setSharedPreferences(WebViewLoadActivity.this, "sessionId", sessionId);
                         CommonUtil.setSharedPreferences(WebViewLoadActivity.this, "erp_username", erpaccount);
                         CommonUtil.setSharedPreferences(WebViewLoadActivity.this, "erp_baseurl", url);

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

@@ -174,13 +174,17 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
 //                    }
                     break;
                 case 3://切换账套登录
-                    Map<String, Object> results = FlexJsonUtil.fromJson(msg
-                            .getData().getString("result"));
+                    String message = msg.getData().getString("result");
+                    Map<String, Object> results = FlexJsonUtil.fromJson(message);
                     if ((Boolean) results.get("success")) {
                         showToact("账套切换成功！");
                         String sessionId = results.get("sessionId").toString();
                         String master = msg.getData().getString("master");
                         String master_ch = msg.getData().getString("master_ch");
+                        //添加获取报表地址
+                        String extrajaSperurl = JSONUtil.getText(message,"EN_EXTRAJASPERURL");
+                        CommonUtil.setSharedPreferences(ct, "extrajaSperurl", extrajaSperurl);
+                        LogUtil.i("extrajaSperurl=" + extrajaSperurl);
                         CommonUtil.setSharedPreferences(ct, "erp_uu", String.valueOf(results.get("uu")));
                         CommonUtil.setSharedPreferences(ct, "sessionId", sessionId);
                         CommonUtil.setSharedPreferences(ct, "erp_master", master);

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

@@ -464,9 +464,11 @@ public class ViewUtil {
                 enuu = "";
             }
             CommonUtil.setSharedPreferences(ct, "erp_uu", enuu);
-            LogUtil.d("ERPLOGIN", "erp_uu1:" + enuu);
-            LogUtil.d("ERPLOGIN", "erp_uu2:" + CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_uu"));
             CommonUtil.setSharedPreferences(ct, "erp_masterId", erpMasterId);
+            //添加获取报表地址
+            String extrajaSperurl = JSONUtil.getText(result,"EN_EXTRAJASPERURL");
+            LogUtil.i("gong","login extrajaSperurl="+extrajaSperurl);
+            CommonUtil.setSharedPreferences(ct, "extrajaSperurl", extrajaSperurl);
             CommonUtil.setSharedPreferences(ct, "erp_login", true);
             CommonUtil.setSharedPreferences(ct, "erp_emname", String.valueOf(dataMap.get("emname")));
         }
@@ -1106,21 +1108,16 @@ public class ViewUtil {
     public static void LoginERPTask(Context ct, final Handler handler, final int what) {
         final String url = CommonUtil.getAppBaseUrl(ct) + "mobile/login.action";
         String master = CommonUtil.getSharedPreferences(ct, "erp_master");
-        String phone = CommonUtil.getSharedPreferences(ct, "user_phone");
-        String password = CommonUtil.getSharedPreferences(ct, "user_password");
         String accountToken = CommonUtil.getSharedPreferences(ct, Constants.CACHE.ACCOUNT_CENTER_TOKEN);
         final Map<String, String> params = new HashMap<String, String>();
 
         params.put("token", accountToken);
-//        params.put("username", phone);
-//        params.put("password", password);
         params.put("master", master);
         ThreadPool.getThreadPool().addTask(new Runnable() {
             @Override
             public void run() {
                 boolean isNetHas = NetUtils.isNetWorkConnected(MyApplication.getInstance());
                 if (isNetHas) {
-                    /** @注释：处理网络请求返回结果 */
                     String result = getDataFromServer(url, params, "post");
                     if (result != null) {
                         if (JSONUtil.validate(result)) {

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -113,6 +113,18 @@ public class CommonUtil {
         return baseUrl;
     }
 
+    //获取报表的根路径
+    public static String getReportUrl(Context ct) {
+        if (ct == null) {
+            return "";
+        }
+        String baseUrl = getSharedPreferences(ct, "extrajaSperurl");
+        if (TextUtils.isEmpty(baseUrl)) {
+            baseUrl = getAppBaseUrl(ct);
+        }
+        return baseUrl;
+    }
+
     /**
      * 账户中心token
      *

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

@@ -21,6 +21,7 @@ import android.widget.ProgressBar;
 
 import com.alibaba.fastjson.JSON;
 import com.common.data.Blowfish;
+import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.base.SupportToolBarActivity;
@@ -65,6 +66,9 @@ public class AppWebViewActivity extends SupportToolBarActivity {
                         String master = bundle.getString("master");
                         String name = bundle.getString("name");
                         String masterId = bundle.getString("masterId");
+                        //添加获取报表地址
+                        String extrajaSperurl = JSONUtil.getText(result,"EN_EXTRAJASPERURL");
+                        CommonUtil.setSharedPreferences(ct, "extrajaSperurl", extrajaSperurl);
                         CommonUtil.setSharedPreferences(ct, "sessionId", sessionId);
                         CommonUtil.setSharedPreferences(ct, "erp_username", erpaccount);
                         CommonUtil.setSharedPreferences(ct, "erp_baseurl", url);

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

@@ -192,11 +192,11 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
         }
 
         try {
-            replace = CommonUtil.getIP(URI.create(CommonUtil.getAppBaseUrl(this))).toString() + "/";
+            replace = CommonUtil.getIP(URI.create(CommonUtil.getReportUrl(this))).toString() + "/";
 //            replace = "http://print.ubtob.com/";
         } catch (Exception e) {
             try {
-                String appBaseUrl = CommonUtil.getAppBaseUrl(this);
+                String appBaseUrl = CommonUtil.getReportUrl(this);
                 replace = appBaseUrl.substring(0, appBaseUrl.length() - 1);
                 replace = replace.substring(0, replace.lastIndexOf("/") + 1);
             } catch (Exception exception) {