Commit 5686b29e by sikang

bug fix

parent e4645e83
...@@ -25,10 +25,11 @@ public class WebActivity extends BaseActivity { ...@@ -25,10 +25,11 @@ public class WebActivity extends BaseActivity {
.build().start(); .build().start();
} }
public static void startContract(Context context, String title, String contractNo) { public static void startContract(Context context, String title, String contractNo, String companyName) {
new ActivityJumper.Builder(context, WebActivity.class) new ActivityJumper.Builder(context, WebActivity.class)
.put("title", title) .put("title", title)
.put("url", "contract") .put("url", "contract")
.put("companyName", companyName)
.put("contractNo", contractNo) .put("contractNo", contractNo)
.build().start(); .build().start();
} }
...@@ -99,7 +100,8 @@ public class WebActivity extends BaseActivity { ...@@ -99,7 +100,8 @@ public class WebActivity extends BaseActivity {
if ("getContract".equals(action)) { if ("getContract".equals(action)) {
refreshLayout.finishRefresh(); refreshLayout.finishRefresh();
EventCenterBean contactBean = (EventCenterBean) result; EventCenterBean contactBean = (EventCenterBean) result;
webView.loadDataWithBaseURL(null, contactBean.getContent(), "text/html", "utf-8", null); String html = contactBean.getContent().replace("${companyName}", getIntent().getStringExtra("companyName"));
webView.loadDataWithBaseURL(null, html, "text/html", "utf-8", null);
} }
} }
} }
...@@ -13,6 +13,7 @@ import android.util.Log; ...@@ -13,6 +13,7 @@ import android.util.Log;
import com.facebook.FacebookSdk; import com.facebook.FacebookSdk;
import com.facebook.accountkit.internal.AccountKitController; import com.facebook.accountkit.internal.AccountKitController;
import com.facebook.accountkit.internal.Initializer; import com.facebook.accountkit.internal.Initializer;
import com.facebook.libfbref.FbDeepLink;
import java.lang.reflect.Field; import java.lang.reflect.Field;
...@@ -55,6 +56,7 @@ public abstract class BaseApplication extends MultiDexApplication { ...@@ -55,6 +56,7 @@ public abstract class BaseApplication extends MultiDexApplication {
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
FbDeepLink.getFbReferrer();
// if (!TextUtils.isEmpty(LibConfig.BUGLY_APPID)) { // if (!TextUtils.isEmpty(LibConfig.BUGLY_APPID)) {
// CrashReport.initCrashReport(getApplicationContext(), LibConfig.BUGLY_APPID, false); // CrashReport.initCrashReport(getApplicationContext(), LibConfig.BUGLY_APPID, false);
// } // }
......
...@@ -102,6 +102,15 @@ public class LatestLoanAppBean implements Parcelable { ...@@ -102,6 +102,15 @@ public class LatestLoanAppBean implements Parcelable {
private long couponId; private long couponId;
private String contractNo; private String contractNo;
private String serviceMobile = ""; private String serviceMobile = "";
private String companyName;
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getServiceMobile() { public String getServiceMobile() {
return serviceMobile; return serviceMobile;
......
...@@ -41,6 +41,7 @@ public class FirebaseHeaderInterceptor implements Interceptor { ...@@ -41,6 +41,7 @@ public class FirebaseHeaderInterceptor implements Interceptor {
String referrer = FbDeepLink.getFbReferrer(); String referrer = FbDeepLink.getFbReferrer();
builder.addHeader("X-REFERRER", TextUtils.isEmpty(referrer) ? PreferencesManager.get().getInstallReferrer() : referrer) builder.addHeader("X-REFERRER", TextUtils.isEmpty(referrer) ? PreferencesManager.get().getInstallReferrer() : referrer)
.addHeader("X-REFERRER-SDK", TextUtils.isEmpty(referrer) ? PreferencesManager.get().getInstallReferrerFromSDK() : referrer) .addHeader("X-REFERRER-SDK", TextUtils.isEmpty(referrer) ? PreferencesManager.get().getInstallReferrerFromSDK() : referrer)
.addHeader("X-REFERRER-DEEPLINK", TextUtils.isEmpty(referrer) ? "" : referrer)
.addHeader("X-ANDROID-ID", AppInfoUtils.getAndroidID(LibConfig.getContext())); .addHeader("X-ANDROID-ID", AppInfoUtils.getAndroidID(LibConfig.getContext()));
if (PreferencesManager.get().getCustomerInfo() != null) { if (PreferencesManager.get().getCustomerInfo() != null) {
......
...@@ -50,7 +50,7 @@ public class Gateway { ...@@ -50,7 +50,7 @@ public class Gateway {
String permissions = BuildConfig.NEED_CONTACT ? "12356" : "2356"; String permissions = BuildConfig.NEED_CONTACT ? "12356" : "2356";
return gatewayInfo.privacy.get(0) + "?name=" + return gatewayInfo.privacy.get(0) + "?name=" +
LibConfig.APP_NAME.replace(" ", "%20") + LibConfig.APP_NAME.replace(" ", "%20") +
"&list=" + permissions; "&list=" + permissions + "&serviceMobile="+LibConfig.HOTLINE;
} }
...@@ -106,7 +106,8 @@ public class Gateway { ...@@ -106,7 +106,8 @@ public class Gateway {
} }
public static String getRestUrl() { public static String getRestUrl() {
return gatewayInfo.rest.get(0); return "http://149.129.216.37:9904";
// return gatewayInfo.rest.get(0);
} }
} }
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<network-security-config> <network-security-config>
<base-config cleartextTrafficPermitted="false" /> <base-config cleartextTrafficPermitted="true" />
</network-security-config> </network-security-config>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment