修改合并冲突

CommonLib/Common/build.gradle

@@ -19,7 +19,7 @@ android {
         versionCode rootProject.ext.android.versionCode
         versionName rootProject.ext.android.versionName
         buildConfigField("boolean", "IS_ENCRYPT_DEBUG_KEY", rootProject.ext.android.isEncryptDebugKey)
-        buildConfigField("boolean", "IS_APP_UPGRADE_ONLINE", rootProject.ext.android.isAppUpgradeOnline)
+        buildConfigField("boolean", "IS_UPGRADE_ONLINE", rootProject.ext.android.isUpgradeOnline)
         buildConfigField("String", "SERVICE_VERSION", rootProject.ext.android.serviceVersion)
         buildConfigField("boolean", "IS_ENCRYPT", rootProject.ext.android.isEncrypt)
         buildConfigField("boolean", "IS_UMENG_RELEASE", rootProject.ext.android.isUmengRelease)

CommonLib/Common/src/main/java/com/yidian/common/BaseInitConfig.kt

 package com.yidian.common
 
 import android.content.Context
-import android.util.Log
 import com.scwang.smart.refresh.footer.ClassicsFooter
 import com.scwang.smart.refresh.header.ClassicsHeader
 import com.scwang.smart.refresh.layout.SmartRefreshLayout
@@ -21,6 +20,7 @@ import com.yidian.yac.ftdevicefinger.core.FtDeviceFingerManager
 import com.yidian.yac.pm.appupdate.PmUpdateApp
 import com.yidian.yac.pm.appupdate.YDAppUpdateManager
 import org.json.JSONObject
+import timber.log.Timber
 
 
 /**
@@ -47,12 +47,20 @@ object BaseInitConfig {
     }
   }
 
+  /**
+   * 初始化XBrid
+   *
+   * 注意：
+   * 1.如果有多个xbrid资源时，请分别进行注册，区分assetRoot名称，否则打包后出现文件丢失加载失败
+   * 2.更新assert文件后不生效，可以卸载重新安装
+   */
   private fun initXBridManager(context: Context) {
     XBridManager.init(
       XBridApp(context) {
-        assetRoot = "www"//对应assets目录下存放xbrid资源对应的目录名
-        appId = "com.yidian.subway"//当前应用包名
-        platformId = 16 //需要去平台申请
+        online = BuildConfig.IS_UPGRADE_ONLINE // 线上、线下
+        assetRoot = "www/src"//对应assets目录下存放xbrid资源对应的目录名
+        appId = context.packageName //当前应用包名
+        platformId = AppConfig.TowerProXBridUpgradePlatformId //需要去平台申请
         appVersion = AppConfig.cv//当前应用版本号
         deviceFinger = FtDeviceFingerManager.getDeviceFinger()//设备指纹
         androidChannel = AppConfig.distribution//对应渠道名
@@ -67,17 +75,21 @@ object BaseInitConfig {
         response: Response // 业务方需要借助 response 来回应服务调用结果
       ) {
         val data = request.params as JSONObject
-        Log.e("zhb-yd", "服务名:" + request.name)
-        Log.e("zhb-yd", "JS传递参数：$data")
+        // JS调用Native传递的数据
+        Timber.tag("xbrid").e("服务名:%s", request.name)
+        Timber.tag("xbrid").e("JS传递参数:%s", data)
 
         val action = data.optString("action")
         val params = data.optJSONObject("params")
         val options = data.optJSONObject("options")
 
+        // 发送JS传递的数据到Service,并监听服务返回的结果回传JS
         ZapTicket(request.name).withAction(action).withServiceParams(params).withServiceOptions(options).withIdentifier(identifier)
           .onResult { result ->
-            response.result(result.code, result.result!!, "")
+            Timber.tag("xbrid").e("回传JS的结果码： ${result.code}   +  结果信息： ${result.result}")
+            response.result(result.code, result.result ?: "", "")
           }.onLost { result ->
+            Timber.tag("xbrid").e("回传JS的错误码： ${result.code}   +  错误信息： ${result.mesg}")
             response.result(result.code, "", result.mesg)
           }.ship()
       }
@@ -108,8 +120,8 @@ object BaseInitConfig {
     val logger = XLogger("appUpgrade")
     logger.debugOn(BuildConfig.DEBUG)
     YDAppUpdateManager.init(PmUpdateApp(context) {
-      online = BuildConfig.IS_APP_UPGRADE_ONLINE // 线上true、线下false
-      platformId = AppConfig.TowerProPlatformId // 平台Id
+      online = BuildConfig.IS_UPGRADE_ONLINE // 线上true、线下false
+      platformId = AppConfig.TowerProAppUpgradePlatformId // 平台Id
       platform = AppConfig.TowerProPlatform // ios/Android
       appId = context.packageName // 应用包名
       appVersion = AppConfig.cv // 客户端版本号

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/app/NewsContentApplication.kt

 package com.yidian.shenghuoquan.newscontent.app
 
 import android.content.Intent
-import android.util.Log
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.XRouterPathConstants.Companion.CHOOSE_CAREER
 import com.yidian.common.XRouterPathConstants.Companion.CHOOSE_STORE_ACTIVITY
@@ -33,7 +32,6 @@ import com.yidian.common.XRouterPathConstants.Companion.STORE_MANAGEMENT
 import com.yidian.common.XRouterPathConstants.Companion.SUPPORT
 import com.yidian.common.XRouterPathConstants.Companion.SYSTEM_SETTING
 import com.yidian.common.YdBaseApplication
-import com.yidian.news.util.DensityUtil
 import com.yidian.news.util.ProcessUtil
 import com.yidian.nightmode.util.NightModeUtil
 import com.yidian.shenghuoquan.newscontent.personnel.ui.*