Commit 4ef5920b authored by shiyl's avatar shiyl

将发布优惠券加载地址改成本地,并开启接口加密

parent 4e923f98
...@@ -8,7 +8,6 @@ import com.yidian.common.HawkConfig ...@@ -8,7 +8,6 @@ import com.yidian.common.HawkConfig
import com.yidian.common.XRouterPathConstants import com.yidian.common.XRouterPathConstants
import com.yidian.common.extensions.initTitleBar import com.yidian.common.extensions.initTitleBar
import com.yidian.common.mvvm.BaseMvvmActivity import com.yidian.common.mvvm.BaseMvvmActivity
import com.yidian.common.utils.ToastUtils
import com.yidian.shenghuoquan.commodity.R import com.yidian.shenghuoquan.commodity.R
import com.yidian.shenghuoquan.commodity.databinding.CommodityActivityPublishCouponsBinding import com.yidian.shenghuoquan.commodity.databinding.CommodityActivityPublishCouponsBinding
import com.yidian.xarc.xbrid.XBridManager import com.yidian.xarc.xbrid.XBridManager
...@@ -47,18 +46,17 @@ class PublishCouponsActivity : BaseMvvmActivity<CommodityActivityPublishCouponsB ...@@ -47,18 +46,17 @@ class PublishCouponsActivity : BaseMvvmActivity<CommodityActivityPublishCouponsB
webView = XBridManager.getWebView(this, "testidenfier", binding.couponWebView) webView = XBridManager.getWebView(this, "testidenfier", binding.couponWebView)
val lifeAccountId = Hawk.get(HawkConfig.LifeAccountId, "") val lifeAccountId = Hawk.get(HawkConfig.LifeAccountId, "")
val webUrl = if (couponId.isNotBlank()) { val webUrl = if (couponId.isNotBlank()) {
"xbrid_coupon_publish?coupon_id=$couponId&life_account_id=$lifeAccountId" "?coupon_id=$couponId&life_account_id=$lifeAccountId"
} else { } else {
"xbrid_coupon_publish?life_account_id=$lifeAccountId" "?life_account_id=$lifeAccountId"
} }
// webView.loadUrl(webUrl) webView.loadUrl("xbrid_coupon_publish$webUrl")
// Timber.e("请求地址: $webUrl") Timber.e("请求地址: xbrid_coupon_publish$webUrl")
webView.loadUrl("http://10.60.102.66:8080")
webView.webChromeClient = object : WebChromeClient() { webView.webChromeClient = object : WebChromeClient() {
override fun onProgressChanged(view: WebView?, newProgress: Int) { override fun onProgressChanged(view: WebView?, newProgress: Int) {
super.onProgressChanged(view, newProgress) super.onProgressChanged(view, newProgress)
if (newProgress == 100) { if (newProgress == 100) {
ToastUtils.showShortSafe("发布优惠券页面加载完成") Timber.e("发布优惠券页面加载完成")
} }
} }
} }
......
...@@ -35,7 +35,7 @@ android { ...@@ -35,7 +35,7 @@ android {
} }
buildTypes { buildTypes {
debug { debug {
applicationIdSuffix ".debug" // applicationIdSuffix ".debug"
buildConfigField("String", "API_URL", rootProject.ext.buildParams.debug.API_URL) buildConfigField("String", "API_URL", rootProject.ext.buildParams.debug.API_URL)
buildConfigField("String", "PROVIDER_NAME", '\"' + rootProject.ext.android.applicationId + ".debug.fileprovider" + '\"') buildConfigField("String", "PROVIDER_NAME", '\"' + rootProject.ext.android.applicationId + ".debug.fileprovider" + '\"')
manifestPlaceholders = [ manifestPlaceholders = [
......
...@@ -161,6 +161,7 @@ class YdSubwayApplication : YdBaseApplication() { ...@@ -161,6 +161,7 @@ class YdSubwayApplication : YdBaseApplication() {
private fun initXBridManager() { private fun initXBridManager() {
XBridManager.init( XBridManager.init(
XBridApp(applicationContext) { XBridApp(applicationContext) {
online = true // 线上、线下
assetRoot = "www"//对应assets目录下存放xbrid资源对应的目录名 assetRoot = "www"//对应assets目录下存放xbrid资源对应的目录名
appId = applicationContext.packageName //当前应用包名 appId = applicationContext.packageName //当前应用包名
platformId = 16 //需要去平台申请 platformId = 16 //需要去平台申请
......
...@@ -5,7 +5,7 @@ ext { ...@@ -5,7 +5,7 @@ ext {
versionCode : 100, versionCode : 100,
versionName : "1.0.0", versionName : "1.0.0",
serviceVersion : '"000100"', // 上线前需要和服务端确认并更新 serviceVersion : '"000100"', // 上线前需要和服务端确认并更新
isEncrypt : 'false', // 上线时改成true开启加密 isEncrypt : 'true', // 上线时改成true开启加密
isEncryptDebugKey : 'true', // 上线前需要使用正式加密key 置为false isEncryptDebugKey : 'true', // 上线前需要使用正式加密key 置为false
isUmengRelease : 'false', // 上线时改成true,使用上线版本的友盟配置 isUmengRelease : 'false', // 上线时改成true,使用上线版本的友盟配置
isApplication : false, isApplication : false,
......
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