update HTTP框架初始化迁移到BGeneralBusiness组件

Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/app/BGeneralBusinessApplication.kt

 package com.yidian.shenghuoquan.bgeneralbusiness.app
 
+import com.yidian.bcommon.BuildConfig
 import com.yidian.bcommon.app.YdBaseApplication
+import com.yidian.bcommon.constant.RunConfig
+import com.yidian.bcommon.http.ApiSaveCookiesInterceptor
+import com.yidian.bcommon.http.ApiSetCookiesInterceptor
+import com.yidian.bcommon.sdk.ClientType
+import com.yidian.bcommon.sdk.JudgeClientUtils
 import com.yidian.bcommon.services.ZapServiceNameConstants
+import com.yidian.framework.mobile.xdiamond.SecretUtil
+import com.yidian.http.ServiceFactory
 import com.yidian.news.util.ProcessUtil
 import com.yidian.shenghuoquan.bgeneralbusiness.service.EncryptService
 import com.yidian.shenghuoquan.bgeneralbusiness.service.GeneralAbilityService
@@ -16,6 +24,7 @@ class BGeneralBusinessApplication : YdBaseApplication() {
     super.onCreate()
     if (ProcessUtil.isMainProcess(this)) {
       initService()
+      initHttp()
     }
   }
 
@@ -24,4 +33,18 @@ class BGeneralBusinessApplication : YdBaseApplication() {
     Zap.addService(ZapServiceNameConstants.GeneralAbilityService, GeneralAbilityService())
     Zap.addService(ZapServiceNameConstants.EncryptService, EncryptService())
   }
+
+  /**
+   * 初始化Http框架
+   */
+  private fun initHttp() {
+    ServiceFactory.getInstance().init(true, RunConfig.API_URL, 10, 10)
+    if (JudgeClientUtils.judgeClient(packageName) == ClientType.MERCHANT_B) {
+      // 添加cookie拦截器
+      ServiceFactory.getInstance().addInterceptor(ApiSaveCookiesInterceptor())
+      ServiceFactory.getInstance().addInterceptor(ApiSetCookiesInterceptor())
+    }
+    // 初始化磐石SDK
+    SecretUtil.init(RunConfig.IS_ENCRYPT_DEBUG_KEY, BuildConfig.DEBUG)
+  }
 }

Components/BRoot/src/main/java/com/yidian/shenghuoquan/broot/BaseInitConfig.kt

@@ -5,19 +5,16 @@ import com.scwang.smart.refresh.footer.ClassicsFooter
 import com.scwang.smart.refresh.header.ClassicsHeader
 import com.scwang.smart.refresh.layout.SmartRefreshLayout
 import com.scwang.smart.refresh.layout.constant.SpinnerStyle
-import com.yidian.bcommon.constant.AppConfig
 import com.yidian.bcommon.BuildConfig
+import com.yidian.bcommon.constant.AppConfig
 import com.yidian.bcommon.constant.GlobalConstants
 import com.yidian.bcommon.constant.RunConfig
-import com.yidian.bcommon.http.ApiSaveCookiesInterceptor
-import com.yidian.bcommon.http.ApiSetCookiesInterceptor
 import com.yidian.bcommon.utils.UMConfigUtils
 import com.yidian.framework.mobile.insight.config.ServerUrlConfig
 import com.yidian.framework.mobile.insight.config.XDiamondProvide
 import com.yidian.framework.mobile.insight.manage.XInsight
 import com.yidian.framework.mobile.insight.manage.XInsightConfig
 import com.yidian.framework.mobile.xdiamond.SecretUtil
-import com.yidian.http.ServiceFactory
 import com.yidian.news.util.ProcessUtil
 import com.yidian.xarc.xbase.utils.XLogger
 import com.yidian.xarc.xbrid.*
@@ -47,7 +44,6 @@ object BaseInitConfig {
     // 初始化友盟
     UMConfigUtils.init(context)
     if (ProcessUtil.isMainProcess(context)) {
-      initHttp()
       FtDeviceFingerManager.init(context)
       initXBridManager(context)
       // 初始化App升级
@@ -59,19 +55,6 @@ object BaseInitConfig {
     }
   }
 
-  private fun initHttp() {
-//        val header = HashMap<String, String>()
-//        header["Content-Type"] = "application/json"
-//        header["charset"] = "UTF-8"
-//        ServiceFactory.getInstance().addInterceptor(HttpInterceptor(header))
-//        ServiceFactory.getInstance().init(true, URLs.BASE_URL, 10, 10)
-    ServiceFactory.getInstance().init(true, RunConfig.API_URL, 10, 10)
-    ServiceFactory.getInstance().addInterceptor(ApiSaveCookiesInterceptor())
-    ServiceFactory.getInstance().addInterceptor(ApiSetCookiesInterceptor())
-    // 初始化磐石SDK
-    SecretUtil.init(RunConfig.IS_ENCRYPT_DEBUG_KEY, BuildConfig.DEBUG)
-  }
-
   /**
    * 初始化XBrid
    *