H5调用的网络服务迁移到BGeneralBusiness

CommonLib/BCommon/src/main/assets/supplierconfig.json

-{
-  "supplier": {
-    "vivo": {
-      "appid": ""
-    },
-    "xiaomi": {
-      "appid": ""
-    },
-    "huawei": {
-      "appid": ""
-    },
-    "oppo": {
-      "appid": ""
-    }
-  }
-}

CommonLib/BCommon/src/main/java/com/yidian/bcommon/ParcelizeMap.kt

-package com.yidian.bcommon
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-class ParcelizeMap(var map: Map<String, String?>?): Parcelable

CommonLib/BCommon/src/main/java/com/yidian/bcommon/YdBaseApplication.kt → CommonLib/BCommon/src/main/java/com/yidian/bcommon/app/YdBaseApplication.kt

-package com.yidian.bcommon
+package com.yidian.bcommon.app
 
 import android.app.Activity
 import android.app.Application

CommonLib/BCommon/src/main/java/com/yidian/bcommon/AppConfig.kt → CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/AppConfig.kt

-package com.yidian.bcommon
+package com.yidian.bcommon.constant
 
+import com.yidian.bcommon.BuildConfig
+
+
+/**
+ * 应用的配置信息
+ */
 class AppConfig {
   companion object {
     // 是否开启加密
@@ -63,8 +69,10 @@ class AppConfig {
 
     // 用户协议
     const val userProtocol = "https://www.appgc.cn/plugins/privacy/content?type=mp&appId=1080334&ver=210601"
+
     // 隐私政策
     const val privacyPolicyStatement = "https://www.appgc.cn/plugins/privacy/content?type=privacy&appId=1080334&ver=210601"
+
     // 我的钱包 - 常见问题
     const val commonProblem = "https://www.appgc.cn/plugins/privacy/content?type=privacy&appId=1080334&ver=210601"
 

CommonLib/BCommon/src/main/java/com/yidian/bcommon/HawkConfig.kt → CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/HawkConfig.kt

-package com.yidian.bcommon
+package com.yidian.bcommon.constant
 
 class HawkConfig {
     companion object{

CommonLib/BCommon/src/main/java/com/yidian/bcommon/XBirdPageConstants.kt → CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/XBirdPageConstants.kt

-package com.yidian.bcommon
+package com.yidian.bcommon.constant
 
 
 /**
@@ -10,7 +10,7 @@ class XBirdPageConstants {
     // webView加载的页面url
     const val PAGE_URL = "page_url"
     // 商品  -  发布商品地址，需要和config.json中的name一致
-    const val COMMODITY_PUBLISH_COMMODITY = "xbrid_coupon_publish"
+    const val COMMODITY_PUBLISH_COMMODITY = "xbrid_b_coupon_publish"
   }
 }
 

CommonLib/BCommon/src/main/java/com/yidian/bcommon/XEventConfig.kt → CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/XEventConfig.kt

-package com.yidian.bcommon
+package com.yidian.bcommon.constant
 
 class XEventConfig {
   companion object {

CommonLib/BCommon/src/main/java/com/yidian/bcommon/XRouterPathConstants.kt → CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/XRouterPathConstants.kt

-package com.yidian.bcommon
+package com.yidian.bcommon.constant
 
 /**
  * Describe:生活圈项目如果名称和之前的有重复的，就在后面加上"_LIFE_CIRCLE"

CommonLib/BCommon/src/main/java/com/yidian/bcommon/http/ApiSaveCookiesInterceptor.kt

 package com.yidian.bcommon.http
 
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.HawkConfig
+import com.yidian.bcommon.constant.HawkConfig
 import okhttp3.Interceptor
 import okhttp3.Response
 

CommonLib/BCommon/src/main/java/com/yidian/bcommon/http/CommonDataSource.kt

 package com.yidian.bcommon.http
 
 import com.google.gson.reflect.TypeToken
-import com.yidian.bcommon.AppConfig
+import com.yidian.bcommon.constant.AppConfig
 import com.yidian.bcommon.BuildConfig
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.http.bean.CommitFeedbackBean
 import com.yidian.bcommon.http.bean.GetCommonConfigBean
 import com.yidian.bcommon.http.bean.GetKSYunObjectIdBean

CommonLib/BCommon/src/main/java/com/yidian/bcommon/http/HttpParamsUtils.kt

@@ -2,8 +2,8 @@ package com.yidian.bcommon.http
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.yidian.bcommon.AppConfig
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.constant.AppConfig
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.utils.NetWorkUtils
 import com.yidian.framework.mobile.xdiamond.SecretUtil
 import com.yidian.utils.LogUtil

CommonLib/BCommon/src/main/java/com/yidian/bcommon/http/HttpResultObserver.kt

 package com.yidian.bcommon.http
 
 import com.google.gson.JsonParseException
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.utils.ToastUtil
 import io.reactivex.rxjava3.core.Observer
 import io.reactivex.rxjava3.disposables.Disposable

CommonLib/BCommon/src/main/java/com/yidian/bcommon/http/HttpResultSubscriber.kt

@@ -2,8 +2,8 @@ package com.yidian.bcommon.http
 
 import android.annotation.SuppressLint
 import com.google.gson.JsonParseException
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.constant.ResultCode
 import com.yidian.utils.ToastUtil
 import com.yidian.xpage.XPageManager

CommonLib/BCommon/src/main/java/com/yidian/bcommon/http/URLs.kt

@@ -3,8 +3,6 @@ package com.yidian.bcommon.http
 
 class URLs {
   companion object {
-    const val userInfo = "/user/user/info"
-
     // 生活圈B端
     const val getShopList = "/shop/shop/get_shop_list"
     // 编辑门店

CommonLib/BCommon/src/main/java/com/yidian/bcommon/services/ImageService.kt

@@ -11,7 +11,7 @@ import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.listener.OnResultCallbackListener
 import com.luck.picture.lib.manager.PictureCacheManager
 import com.yidian.bcommon.bean.*
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.utils.GlideEngine
 import com.yidian.framework.mobile.insight.manage.XInsight
 import com.yidian.framework.mobile.insight.storage.ImageUploadListener

CommonLib/BCommon/src/main/java/com/yidian/bcommon/services/ReadMe.md

-### 所有公共服务接口放在该目录下
\ No newline at end of file

CommonLib/BCommon/src/main/java/com/yidian/bcommon/utils/DisplayUtils.java

@@ -19,7 +19,7 @@ import android.view.animation.Animation;
 
 import androidx.annotation.NonNull;
 
-import com.yidian.bcommon.YdBaseApplication;
+import com.yidian.bcommon.app.YdBaseApplication;
 
 
 /**

CommonLib/BCommon/src/main/java/com/yidian/bcommon/utils/KS3Core.kt

@@ -11,7 +11,7 @@ import com.ksyun.ks3.services.Ks3ClientConfiguration
 import com.ksyun.ks3.services.handler.PutObjectACLResponseHandler
 import com.ksyun.ks3.services.handler.PutObjectResponseHandler
 import com.ksyun.ks3.services.request.PutObjectRequest
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.http.CommonDataSource
 import com.yidian.bcommon.http.bean.GetKSYunObjectIdBean
 import com.yidian.bcommon.http.callback.IGetKSYunObjectIdCallback

CommonLib/BCommon/src/main/java/com/yidian/bcommon/utils/ToastUtils.java

@@ -8,7 +8,7 @@ import android.widget.Toast;
 
 import androidx.annotation.StringRes;
 
-import com.yidian.bcommon.YdBaseApplication;
+import com.yidian.bcommon.app.YdBaseApplication;
 
 
 /**

CommonLib/BCommon/src/main/java/com/yidian/bcommon/utils/ToolsUtil.kt

@@ -9,20 +9,11 @@ import android.util.DisplayMetrics
 import android.util.Log
 import android.util.TypedValue
 import android.widget.Toast
-import com.google.gson.Gson
-import com.google.gson.JsonObject
-import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.AppConfig
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.AppConfig
 import com.yidian.bcommon.services.XEventService
 import com.yidian.utils.MD5Util
-import com.yidian.xarc.xbrid.XBridManager
-import com.yidian.xarc.xbrid.XWebView
 import com.yidian.xarc.xevent.XBaseEvent
-import com.yidian.xpage.XPageManager
 import com.yidian.yac.ftdevicefinger.core.FtDeviceFingerManager
-import org.json.JSONObject
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.FileOutputStream

CommonLib/BCommon/src/main/java/com/yidian/bcommon/utils/UMConfigUtils.kt

@@ -2,21 +2,12 @@ package com.yidian.bcommon.utils
 
 import android.content.Context
 import android.os.Bundle
-import android.util.Log
-import android.widget.Toast
-import com.orhanobut.hawk.Hawk
 import com.umeng.analytics.MobclickAgent
 import com.umeng.commonsdk.UMConfigure
-import com.umeng.message.IUmengRegisterCallback
-import com.umeng.message.PushAgent
-import com.umeng.message.UmengMessageHandler
-import com.umeng.message.UmengNotificationClickHandler
 import com.umeng.message.entity.UMessage
-import com.umeng.socialize.PlatformConfig
-import com.yidian.bcommon.AppConfig
+import com.yidian.bcommon.constant.AppConfig
 import com.yidian.bcommon.BuildConfig
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.xpage.XPageManager
 
 

CommonLib/BCommon/src/main/java/com/yidian/bcommon/webview/PublicWebViewActivity.kt

@@ -10,6 +10,9 @@ import com.yidian.bcommon.databinding.ActivityPublicWebViewBinding
 import com.yidian.bcommon.extensions.initTitleBar
 import com.yidian.bcommon.mvvm.BaseMvvmActivity
 
+/**
+ * 公共的WebView
+ */
 class PublicWebViewActivity : BaseMvvmActivity<ActivityPublicWebViewBinding, PublicWebViewModel>() {
 
   override val layoutId: Int = R.layout.activity_public_web_view

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

+package com.yidian.shenghuoquan.bgeneralbusiness.app
+
+import com.yidian.bcommon.app.YdBaseApplication
+import com.yidian.news.util.ProcessUtil
+import com.yidian.shenghuoquan.bgeneralbusiness.http.BNAHttpReqService
+import com.yidian.yac.core.core.YacModuleSpec
+import com.yidian.yac.core.zap.Zap
+
+@YacModuleSpec
+class BGeneralBusinessApplication : YdBaseApplication() {
+
+  override fun onCreate() {
+    super.onCreate()
+    if (ProcessUtil.isMainProcess(this)) {
+      initService()
+    }
+  }
+
+  private fun initService() {
+    Zap.addService(BNAHttpReqService.SERVICE_NAME, BNAHttpReqService())
+  }
+}

CommonLib/BCommon/src/main/java/com/yidian/bcommon/services/http/MBHttpReqService.kt → Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/http/BNAHttpReqService.kt

-package com.yidian.bcommon.services.http
+package com.yidian.shenghuoquan.bgeneralbusiness.http
 
 import com.google.gson.Gson
 import com.yidian.bcommon.BuildConfig
 import com.yidian.bcommon.http.HttpResult
-import com.yidian.bcommon.services.http.callback.IMBRequestCallBack
+import com.yidian.shenghuoquan.bgeneralbusiness.http.callback.IBNARequestCallBack
 import com.yidian.xarc.xrouter.ResultResolver
 import com.yidian.yac.core.zap.ZapService
 import org.json.JSONObject
@@ -12,10 +12,10 @@ import org.json.JSONObject
 /**
  * 网络请求服务类
  */
-class MBHttpReqService : ZapService() {
+class BNAHttpReqService : ZapService() {
 
   companion object {
-    const val SERVICE_NAME: String = "NAHttpReq"
+    const val SERVICE_NAME: String = "BNAHttpReq"
   }
 
   private lateinit var resolver: ResultResolver
@@ -38,10 +38,10 @@ class MBHttpReqService : ZapService() {
       //发起请求
       when (method) {
         "GET", "get" -> {
-          MBRemoteDataSource.launchGetRequest(iMBRequestCallBackImpl, paramsMap, url)
+          BNARemoteDataSource.launchGetRequest(iMBRequestCallBackImpl, paramsMap, url)
         }
         "POST", "post" -> {
-          MBRemoteDataSource.launchPostRequest(iMBRequestCallBackImpl, paramsMap, url)
+          BNARemoteDataSource.launchPostRequest(iMBRequestCallBackImpl, paramsMap, url)
         }
         else -> {
           resolver.fail(-1000, "request error", "不支持的请求方式")
@@ -73,7 +73,7 @@ class MBHttpReqService : ZapService() {
     return hashMap
   }
 
-  private val iMBRequestCallBackImpl = object : IMBRequestCallBack {
+  private val iMBRequestCallBackImpl = object : IBNARequestCallBack {
 
     override fun getRequestSuccess(response: Any?) {
       val params = Gson().toJson(response)

CommonLib/BCommon/src/main/java/com/yidian/bcommon/services/http/MBRemoteDataSource.kt → Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/http/BNARemoteDataSource.kt

-package com.yidian.bcommon.services.http
+package com.yidian.shenghuoquan.bgeneralbusiness.http
 
 import com.yidian.bcommon.http.HttpParamsUtils
 import com.yidian.bcommon.http.HttpResult
 import com.yidian.bcommon.http.HttpResultSubscriber
 import com.yidian.bcommon.http.TransformUtil
-import com.yidian.bcommon.services.http.callback.IMBRequestCallBack
+import com.yidian.shenghuoquan.bgeneralbusiness.http.callback.IBNARequestCallBack
 import com.yidian.http.ServiceFactory
 
-object MBRemoteDataSource {
+object BNARemoteDataSource {
 
   /**
    * 发起get请求
    */
-  fun launchGetRequest(apiCallback: IMBRequestCallBack, requestParams: HashMap<String, String?>, url: String) {
+  fun launchGetRequest(apiCallback: IBNARequestCallBack, requestParams: HashMap<String, String?>, url: String) {
     val timeStamp = System.currentTimeMillis()
     val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
     val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
-    ServiceFactory.getInstance().createService(MBService::class.java)
+    ServiceFactory.getInstance().createService(BNAService::class.java)
       .mbGetRequest(url, publicParamsMap, privateParamsMap)
       .compose(TransformUtil.defaultSchedulers())
       .subscribe(object : HttpResultSubscriber<Any?>() {
@@ -33,11 +33,11 @@ object MBRemoteDataSource {
   /**
    * 发起post请求
    */
-  fun launchPostRequest(apiCallback: IMBRequestCallBack, requestParams: HashMap<String, String?>, url: String) {
+  fun launchPostRequest(apiCallback: IBNARequestCallBack, requestParams: HashMap<String, String?>, url: String) {
     val timeStamp = System.currentTimeMillis()
     val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
     val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
-    ServiceFactory.getInstance().createService(MBService::class.java)
+    ServiceFactory.getInstance().createService(BNAService::class.java)
       .mbPostRequest(url, publicParamsMap, privateParamsMap)
       .compose(TransformUtil.defaultSchedulers())
       .subscribe(object : HttpResultSubscriber<Any?>() {

CommonLib/BCommon/src/main/java/com/yidian/bcommon/services/http/MBService.kt → Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/http/BNAService.kt

-package com.yidian.bcommon.services.http
+package com.yidian.shenghuoquan.bgeneralbusiness.http
 
 import com.yidian.bcommon.http.HttpResult
 import io.reactivex.rxjava3.core.Observable
@@ -7,7 +7,7 @@ import retrofit2.http.*
 /**
  * H5网络请求服务协议的请求
  */
-interface MBService {
+interface BNAService {
 
   /**
    * get请求

CommonLib/BCommon/src/main/java/com/yidian/bcommon/services/http/callback/IMBRequestCallBack.kt → Components/BGeneralBusiness/src/main/java/com/yidian/shenghuoquan/bgeneralbusiness/http/callback/IBNARequestCallBack.kt

-package com.yidian.bcommon.services.http.callback
+package com.yidian.shenghuoquan.bgeneralbusiness.http.callback
 
 import com.yidian.bcommon.http.HttpResult
 
-interface IMBRequestCallBack {
+interface IBNARequestCallBack {
   fun getRequestSuccess(response: Any?)
   fun getRequestFailure(response: HttpResult<Any?>?)
 }

Components/BGoods/src/main/java/com/yidian/shenghuoquan/bgoods/app/ClassMapUtil.kt

 package com.yidian.shenghuoquan.bgoods.app
 
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.shenghuoquan.bgoods.ui.coupon.ChooseCategoryActivity
 import com.yidian.shenghuoquan.bgoods.ui.coupon.CommodityManagementActivity
 

Components/BGoods/src/main/java/com/yidian/shenghuoquan/bgoods/app/CommodityApplication.kt

 package com.yidian.shenghuoquan.bgoods.app
 
 import android.content.Intent
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.news.util.ProcessUtil
 import com.yidian.shenghuoquan.bgoods.service.GoodsPublishService
 import com.yidian.shenghuoquan.bgoods.service.SelectCategoryService

Components/BGoods/src/main/java/com/yidian/shenghuoquan/bgoods/service/GoodsPublishService.kt

 package com.yidian.shenghuoquan.bgoods.service
 
-import com.yidian.bcommon.XEventConfig
+import com.yidian.bcommon.constant.XEventConfig
 import com.yidian.xarc.xevent.XBaseEvent
 import com.yidian.xarc.xevent.XEventManager
 import com.yidian.xarc.xrouter.ResultResolver

Components/BGoods/src/main/java/com/yidian/shenghuoquan/bgoods/service/SelectCategoryService.kt

 package com.yidian.shenghuoquan.bgoods.service
 
 import com.google.gson.Gson
-import com.yidian.bcommon.XEventConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XEventConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.shenghuoquan.bgoods.dto.SelectCategoryDto
 import com.yidian.shenghuoquan.bgoods.ui.coupon.ChooseCategoryActivity
 import com.yidian.xarc.xevent.XBaseEvent

Components/BGoods/src/main/java/com/yidian/shenghuoquan/bgoods/ui/coupon/CategorySearchActivity.kt

@@ -3,7 +3,7 @@ package com.yidian.shenghuoquan.bgoods.ui.coupon
 import android.view.KeyEvent
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
-import com.yidian.bcommon.XEventConfig
+import com.yidian.bcommon.constant.XEventConfig
 import com.yidian.bcommon.extensions.initTitleBar
 import com.yidian.bcommon.mvvm.BaseMvvmActivity
 import com.yidian.shenghuoquan.bgoods.R

Components/BGoods/src/main/java/com/yidian/shenghuoquan/bgoods/ui/coupon/ChooseCategoryActivity.kt

@@ -2,8 +2,8 @@ package com.yidian.shenghuoquan.bgoods.ui.coupon
 
 import android.content.Intent
 import androidx.activity.viewModels
-import com.yidian.bcommon.XEventConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XEventConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.extensions.initTitleBar
 import com.yidian.bcommon.mvvm.BaseMvvmActivity
 import com.yidian.shenghuoquan.bgoods.R

Components/BGoods/src/main/java/com/yidian/shenghuoquan/bgoods/ui/coupon/CommodityManagementActivity.kt

@@ -7,10 +7,10 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XBirdPageConstants
-import com.yidian.bcommon.XEventConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.HawkConfig
+import com.yidian.bcommon.constant.XBirdPageConstants
+import com.yidian.bcommon.constant.XEventConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.mvvm.BaseMvvmActivity
 import com.yidian.shenghuoquan.bgoods.R
 import com.yidian.shenghuoquan.bgoods.databinding.CommodityActivityCommodityManagementBinding

Components/BGoods/src/main/java/com/yidian/shenghuoquan/bgoods/ui/coupon/viewmodel/CommodityListItemViewModel.kt

@@ -2,9 +2,9 @@ package com.yidian.shenghuoquan.bgoods.ui.coupon.viewmodel
 
 import androidx.lifecycle.MutableLiveData
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XBirdPageConstants
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.HawkConfig
+import com.yidian.bcommon.constant.XBirdPageConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.mvvm.BaseViewModel
 import com.yidian.shenghuoquan.bgoods.dto.Goods
 import com.yidian.shenghuoquan.bgoods.http.CouponDataSource
@@ -68,7 +68,9 @@ class CommodityListItemViewModel : BaseViewModel(), ICommodityOperationCallback
     val pageUrl = XBirdPageConstants.COMMODITY_PUBLISH_COMMODITY +
       "?life_account_id=${Hawk.get(HawkConfig.LifeAccountId, "")}" +
       "&coupon_id=${item.goodsSpuId}"
-    XPageManager.push(XRouterPathConstants.COMMON_WEB_VIEW_ACTIVITY, hashMapOf(Pair(XBirdPageConstants.PAGE_URL, pageUrl)))
+    XPageManager.push(
+        XRouterPathConstants.COMMON_WEB_VIEW_ACTIVITY, hashMapOf(Pair(
+            XBirdPageConstants.PAGE_URL, pageUrl)))
   }
 
   /**
@@ -77,7 +79,8 @@ class CommodityListItemViewModel : BaseViewModel(), ICommodityOperationCallback
   fun requestCommodityOnline(commodityId: String) {
     CouponDataSource.commodityOnline(
       this,
-      hashMapOf(Pair(PARAMS_COMMODITY_ID, commodityId), Pair(PARAMS_LIFE_ACCOUNT_ID, Hawk.get(HawkConfig.LifeAccountId, "")))
+      hashMapOf(Pair(PARAMS_COMMODITY_ID, commodityId), Pair(PARAMS_LIFE_ACCOUNT_ID, Hawk.get(
+          HawkConfig.LifeAccountId, "")))
     )
   }
 
@@ -87,7 +90,8 @@ class CommodityListItemViewModel : BaseViewModel(), ICommodityOperationCallback
   fun requestCommodityOffline(commodityId: String) {
     CouponDataSource.commodityOffline(
       this,
-      hashMapOf(Pair(PARAMS_COMMODITY_ID, commodityId), Pair(PARAMS_LIFE_ACCOUNT_ID, Hawk.get(HawkConfig.LifeAccountId, "")))
+      hashMapOf(Pair(PARAMS_COMMODITY_ID, commodityId), Pair(PARAMS_LIFE_ACCOUNT_ID, Hawk.get(
+          HawkConfig.LifeAccountId, "")))
     )
   }
 

Components/BGoods/src/main/java/com/yidian/shenghuoquan/bgoods/ui/coupon/viewmodel/CommodityListViewModel.kt

@@ -2,7 +2,7 @@ package com.yidian.shenghuoquan.bgoods.ui.coupon.viewmodel
 
 import androidx.lifecycle.MutableLiveData
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.HawkConfig
+import com.yidian.bcommon.constant.HawkConfig
 import com.yidian.bcommon.mvvm.BaseViewModel
 import com.yidian.shenghuoquan.bgoods.dto.CommodityManagementListDto
 import com.yidian.shenghuoquan.bgoods.dto.CommodityStatus

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

@@ -5,7 +5,7 @@ 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.AppConfig
+import com.yidian.bcommon.constant.AppConfig
 import com.yidian.bcommon.BuildConfig
 import com.yidian.bcommon.utils.UMConfigUtils
 import com.yidian.framework.mobile.insight.config.ServerUrlConfig

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

 package com.yidian.shenghuoquan.broot.app
 
 import android.content.Intent
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.news.util.ProcessUtil
 import com.yidian.xpage.XPageManager
 import com.yidian.xpage.node.XPageHandler

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

 package com.yidian.shenghuoquan.broot.app
 
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.shenghuoquan.broot.ui.FlashActivity
 
 

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

@@ -10,8 +10,12 @@ import android.view.View
 import android.widget.TextView
 import com.orhanobut.hawk.Hawk
 import com.yidian.bcommon.*
-import com.yidian.bcommon.XRouterPathConstants.Companion.FLASH
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.FLASH
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.base.BaseActivity
+import com.yidian.bcommon.constant.AppConfig
+import com.yidian.bcommon.constant.HawkConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.services.AppUpgradeService
 import com.yidian.bcommon.services.ZapServiceActionConstants
 import com.yidian.bcommon.services.ZapServiceNameConstants

Components/BSetting/src/main/java/com/yidian/shenghuoquan/bsetting/app/ClassMapUtil.kt

 package com.yidian.shenghuoquan.bsetting.app
 
-import com.yidian.bcommon.XRouterPathConstants
-
 
 /**
  * 注册XPageNode工具类

Components/BSetting/src/main/java/com/yidian/shenghuoquan/bsetting/app/CommodityApplication.kt

 package com.yidian.shenghuoquan.bsetting.app
 
-import android.content.Intent
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.YdBaseApplication
-import com.yidian.news.util.ProcessUtil
-import com.yidian.xpage.XPageManager
-import com.yidian.xpage.node.XPageHandler
-import com.yidian.xpage.node.XPageNode
-import com.yidian.xpage.node.XPageNodePageType
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.yac.core.core.YacModuleSpec
-import com.yidian.yac.core.zap.Zap
 
 @YacModuleSpec
 class CommodityApplication : YdBaseApplication() {

Components/BXBridBusiness/src/main/java/com/yidian/shenghuoquan/bxbirdbusiness/app/ClassMapUtil.kt

 package com.yidian.shenghuoquan.bxbirdbusiness.app
 
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.shenghuoquan.bxbirdbusiness.ui.CommonWebViewActivity
 
 

Components/BXBridBusiness/src/main/java/com/yidian/shenghuoquan/bxbirdbusiness/app/XBirdBusinessApplication.kt

 package com.yidian.shenghuoquan.bxbirdbusiness.app
 
 import android.content.Intent
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.news.util.ProcessUtil
 import com.yidian.xpage.XPageManager
 import com.yidian.xpage.node.XPageHandler

Components/BXBridBusiness/src/main/java/com/yidian/shenghuoquan/bxbirdbusiness/ui/CommonWebViewActivity.kt

@@ -3,8 +3,8 @@ package com.yidian.shenghuoquan.bxbirdbusiness.ui
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import androidx.activity.viewModels
-import com.yidian.bcommon.XBirdPageConstants
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XBirdPageConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.extensions.initTitleBar
 import com.yidian.bcommon.mvvm.BaseMvvmActivity
 import com.yidian.bcommon.utils.ToastUtils

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

 package com.yidian.shenghuoquan.newscontent.app
 
 import android.content.Intent
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.XRouterPathConstants.Companion.CHOOSE_CAREER
-import com.yidian.bcommon.XRouterPathConstants.Companion.CHOOSE_STORE_ACTIVITY
-import com.yidian.bcommon.XRouterPathConstants.Companion.ID_CARD_TEST
-import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_AUTH
-import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_AUTH_INFO
-import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_CREATE
-import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_CREATE_COMPLETE
-import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_AUTH
-import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE
-import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_CERTIFICATION
-import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_IDENTITY
-import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_INFO
-import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_MODIFY_NAME
-import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH
-import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE
-import com.yidian.bcommon.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
-import com.yidian.bcommon.XRouterPathConstants.Companion.MERCHANT_CENTER
-import com.yidian.bcommon.XRouterPathConstants.Companion.NEWS_CONTENT
-import com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_ADD_STAFF
-import com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_MANAGER_CHANGE
-import com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_MANAGER_INFO
-import com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_MY_STAFF
-import com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_STAFF_INFO
-import com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_STAFF_MANAGE
-import com.yidian.bcommon.XRouterPathConstants.Companion.PROTOCOL
-import com.yidian.bcommon.XRouterPathConstants.Companion.STORE_MANAGEMENT
-import com.yidian.bcommon.XRouterPathConstants.Companion.SUPPORT
-import com.yidian.bcommon.XRouterPathConstants.Companion.SYSTEM_SETTING
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.CHOOSE_CAREER
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.CHOOSE_STORE_ACTIVITY
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.ID_CARD_TEST
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_AUTH
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_AUTH_INFO
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_CREATE
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_CREATE_COMPLETE
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_AUTH
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_CERTIFICATION
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_IDENTITY
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_INFO
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_MODIFY_NAME
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.MERCHANT_CENTER
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.NEWS_CONTENT
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_ADD_STAFF
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_MANAGER_CHANGE
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_MANAGER_INFO
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_MY_STAFF
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_STAFF_INFO
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_STAFF_MANAGE
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PROTOCOL
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.STORE_MANAGEMENT
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.SUPPORT
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.SYSTEM_SETTING
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.services.ZapServiceNameConstants
 import com.yidian.news.util.ProcessUtil
 import com.yidian.nightmode.util.NightModeUtil

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/ApiService.kt

 package com.yidian.shenghuoquan.newscontent.http
 
 import com.google.gson.reflect.TypeToken
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.bean.LifeAccountItemBean
 import com.yidian.bcommon.http.HttpParamsUtils
 import com.yidian.bcommon.http.HttpResult

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/adapter/MyStaffListAdapter.kt

@@ -3,10 +3,9 @@ package com.yidian.shenghuoquan.newscontent.personnel.adapter
 import android.widget.TextView
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.personnel.bean.AccountUser
-import com.yidian.utils.ToastUtil
 import com.yidian.xpage.XPageManager
 
 /**

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/AddStaffActivity.kt

@@ -2,8 +2,8 @@ package com.yidian.shenghuoquan.newscontent.personnel.ui
 
 import android.os.Bundle
 import androidx.core.content.ContextCompat
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_ADD_STAFF
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_ADD_STAFF
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.clickAntiShake
 import com.yidian.bcommon.widget.EditTextInputCallback

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/ManagerChangeActivity.kt

@@ -10,9 +10,9 @@ import android.text.style.ClickableSpan
 import android.text.style.ForegroundColorSpan
 import android.view.View
 import androidx.core.content.ContextCompat
-import com.yidian.bcommon.AppConfig
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_MANAGER_CHANGE
+import com.yidian.bcommon.constant.AppConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_MANAGER_CHANGE
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.clickAntiShake
 import com.yidian.bcommon.extensions.initTitleBar

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/ManagerInfoActivity.kt

@@ -3,8 +3,8 @@ package com.yidian.shenghuoquan.newscontent.personnel.ui
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.content.ContextCompat
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_MANAGER_INFO
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_MANAGER_INFO
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.clickAntiShake
 import com.yidian.shenghuoquan.newscontent.R

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/MyStaffActivity.kt

@@ -2,8 +2,8 @@ package com.yidian.shenghuoquan.newscontent.personnel.ui
 
 import android.os.Bundle
 import androidx.core.content.ContextCompat
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_MY_STAFF
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_MY_STAFF
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.clickAntiShake
 import com.yidian.bcommon.extensions.initTitleBar

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/StaffInfoActivity.kt

@@ -3,8 +3,8 @@ package com.yidian.shenghuoquan.newscontent.personnel.ui
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.content.ContextCompat
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_STAFF_INFO
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_STAFF_INFO
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.clickAntiShake
 import com.yidian.shenghuoquan.newscontent.R

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/StaffManageActivity.kt

@@ -3,10 +3,8 @@ package com.yidian.shenghuoquan.newscontent.personnel.ui
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.content.ContextCompat
-import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.XRouterPathConstants.Companion.PERSONAL_STAFF_MANAGE
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PERSONAL_STAFF_MANAGE
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.clickAntiShake
 import com.yidian.shenghuoquan.newscontent.R

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/service/CommentService.kt

 package com.yidian.shenghuoquan.newscontent.service
 
-import com.yidian.bcommon.XEventConfig.Companion.GO_TO_COMMENT_DETAIL
-import com.yidian.bcommon.XEventConfig.Companion.REPLY_COMMENT
-import com.yidian.bcommon.XEventConfig.Companion.REPLY_DETAIL_COMMENT
-import com.yidian.bcommon.XEventConfig.Companion.UPDATE_COMMENT
-import com.yidian.bcommon.XEventConfig.Companion.UPDATE_LIKE
+import com.yidian.bcommon.constant.XEventConfig.Companion.GO_TO_COMMENT_DETAIL
+import com.yidian.bcommon.constant.XEventConfig.Companion.REPLY_COMMENT
+import com.yidian.bcommon.constant.XEventConfig.Companion.REPLY_DETAIL_COMMENT
+import com.yidian.bcommon.constant.XEventConfig.Companion.UPDATE_COMMENT
+import com.yidian.bcommon.constant.XEventConfig.Companion.UPDATE_LIKE
 import com.yidian.bcommon.utils.ToolsUtil
 import com.yidian.xarc.xrouter.ResultResolver
 import com.yidian.yac.core.zap.ZapService

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/service/DeepLinkService.kt

 package com.yidian.shenghuoquan.newscontent.service
 
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.shenghuoquan.newscontent.ui.NewsContentActivity
 import com.yidian.xarc.xrouter.ResultResolver
 import com.yidian.xpage.XPageManager

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/service/LifeNumberListService.kt

 package com.yidian.shenghuoquan.newscontent.service
 
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.bean.LifeAccountItemBean
 import com.yidian.bcommon.services.AppUpgradeService
 import com.yidian.bcommon.services.ZapServiceActionConstants

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/service/RequestService.kt

@@ -2,7 +2,7 @@ package com.yidian.shenghuoquan.newscontent.service
 
 import android.graphics.Bitmap
 import com.google.gson.Gson
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.http.HttpResult
 import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.http.httpbean.IUploadFileCallback
@@ -17,7 +17,6 @@ import id.zelory.compressor.constraint.resolution
 import id.zelory.compressor.constraint.size
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.json.JSONObject
 import java.io.File

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/service/SelectStoreService.kt

 package com.yidian.shenghuoquan.newscontent.service
 
 import com.google.gson.Gson
-import com.yidian.bcommon.XEventConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XEventConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.shenghuoquan.newscontent.ui.store.ChooseStoreActivity
 import com.yidian.xarc.xevent.XBaseEvent
 import com.yidian.xarc.xevent.XEventManager

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/service/UniversalService.kt

@@ -5,10 +5,10 @@ import android.widget.Toast
 import androidx.core.app.NotificationManagerCompat
 import com.google.gson.Gson
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.AppConfig
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XEventConfig
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.constant.AppConfig
+import com.yidian.bcommon.constant.HawkConfig
+import com.yidian.bcommon.constant.XEventConfig
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.services.XEventService
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.bean.IUpdateDialogCallback

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/CommentWebFragment.kt

@@ -8,8 +8,8 @@ import android.webkit.WebChromeClient
 import android.webkit.WebView
 import androidx.core.os.bundleOf
 import com.google.gson.Gson
-import com.yidian.bcommon.XEventConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XEventConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseFragment
 import com.yidian.bcommon.http.HttpResult
 import com.yidian.shenghuoquan.newscontent.bean.ContentDetailBean

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/DeepLinkActivity.kt

@@ -5,7 +5,7 @@ import android.util.Log
 import android.view.View
 import android.view.Window
 import androidx.appcompat.app.AppCompatActivity
-import com.yidian.bcommon.XRouterPathConstants.Companion.FLASH
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.FLASH
 import com.yidian.xpage.XPageManager
 
 class DeepLinkActivity: AppCompatActivity() {

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/LifeAccountEnterpriseCertificationActivity.kt

@@ -12,7 +12,7 @@ import android.os.FileUtils
 import android.provider.MediaStore
 import android.util.Log
 import androidx.core.content.FileProvider
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.constant.GlobalConstants
 import com.yidian.bcommon.utils.YdFileUtils

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/LoginLifeCircleActivity.kt

@@ -4,10 +4,10 @@ import android.os.Bundle
 import android.view.View
 import androidx.core.content.ContextCompat
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.AppConfig
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
+import com.yidian.bcommon.constant.AppConfig
+import com.yidian.bcommon.constant.HawkConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.hide
 import com.yidian.bcommon.extensions.show

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/NewsContentActivity.kt

@@ -3,8 +3,8 @@ package com.yidian.shenghuoquan.newscontent.ui
 import android.content.Intent
 import android.os.Bundle
 import com.umeng.socialize.UMShareAPI
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.XRouterPathConstants.Companion.NEWS_CONTENT
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.NEWS_CONTENT
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityNewsContentBinding

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/ProductSupportActivity.kt

@@ -11,8 +11,8 @@ import android.webkit.WebChromeClient
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XRouterPathConstants.Companion.SUPPORT
+import com.yidian.bcommon.constant.HawkConfig
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.SUPPORT
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.initTitleBar
 import com.yidian.shenghuoquan.newscontent.R

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/ProtocolActivity.kt

 package com.yidian.shenghuoquan.newscontent.ui
 
 import android.os.Bundle
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.XRouterPathConstants.Companion.PROTOCOL
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.PROTOCOL
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.initTitleBar
 import com.yidian.bcommon.utils.ToastUtils

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/alive/AliveTestActivity.kt

@@ -6,7 +6,7 @@ import android.widget.Toast
 import com.megvii.meglive_sdk.listener.DetectCallback
 import com.megvii.meglive_sdk.listener.PreCallback
 import com.megvii.meglive_sdk.manager.MegLiveManager
-import com.yidian.bcommon.AppConfig
+import com.yidian.bcommon.constant.AppConfig
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.http.HttpResult
 import com.yidian.bcommon.utils.ToolsUtil

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/ChooseCareerActivity.kt

@@ -2,8 +2,8 @@ package com.yidian.shenghuoquan.newscontent.ui.auth
 
 import android.os.Bundle
 import com.google.gson.Gson
-import com.yidian.bcommon.XEventConfig
-import com.yidian.bcommon.XRouterPathConstants.Companion.CHOOSE_CAREER
+import com.yidian.bcommon.constant.XEventConfig
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.CHOOSE_CAREER
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.initTitleBar
 import com.yidian.bcommon.services.XEventService
@@ -13,9 +13,7 @@ import com.yidian.shenghuoquan.newscontent.adapter.SecondCareerListAdapter
 import com.yidian.shenghuoquan.newscontent.bean.CareerListBean
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityChooseCareerBinding
 import com.yidian.shenghuoquan.newscontent.utils.JsonUtils
-import com.yidian.utils.ToastUtil
 import com.yidian.xarc.xevent.XBaseEvent
-import com.yidian.xarc.xevent.XEventManager
 import com.yidian.xpage.XPageManager
 
 

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountAuthActivity.kt

@@ -3,7 +3,7 @@ package com.yidian.shenghuoquan.newscontent.ui.auth
 import android.os.Bundle
 import android.view.View
 import androidx.core.view.isVisible
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountAuthBinding

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountCreateActivity.kt

@@ -6,9 +6,9 @@ import android.text.Editable
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.XRouterPathConstants.Companion.LIFE_ACCOUNT_CREATE
+import com.yidian.bcommon.constant.HawkConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.LIFE_ACCOUNT_CREATE
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.bean.ICreateLifeAccountCallback

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountCreateCompleteActivity.kt

@@ -3,8 +3,8 @@ package com.yidian.shenghuoquan.newscontent.ui.auth
 import android.os.Bundle
 import android.view.View
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.HawkConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountCreateCompleteBinding

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountEnterpriseAuthActivity.kt

@@ -3,7 +3,7 @@ package com.yidian.shenghuoquan.newscontent.ui.auth
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.adapter.BottomSelectAdapter

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountEnterpriseAuthCompleteActivity.kt

@@ -2,7 +2,7 @@ package com.yidian.shenghuoquan.newscontent.ui.auth
 
 import android.os.Bundle
 import android.view.View
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountEnterpriseAuthCompleteBinding

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountIdentityActivity.kt

@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.cardutils.adapter.OnItemClickListener
 import com.yidian.shenghuoquan.newscontent.adapter.LifeAccountIdentityAdapter

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountPersonalAuthActivity.kt

@@ -4,9 +4,9 @@ import android.os.Bundle
 import android.view.View
 import android.widget.CompoundButton
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XEventConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.HawkConfig
+import com.yidian.bcommon.constant.XEventConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountPersonalAuthBinding

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountPersonalAuthCompleteActivity.kt

@@ -2,7 +2,7 @@ package com.yidian.shenghuoquan.newscontent.ui.auth
 
 import android.os.Bundle
 import android.view.View
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountPersonalAuthCompleteBinding

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/LifeAccountModifyNameActivity.kt

 package com.yidian.shenghuoquan.newscontent.ui.center
 
 import android.os.Bundle
-import com.yidian.bcommon.XEventConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XEventConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.bean.ICreateLifeAccountCallback

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantAuthInfoActivity.kt

@@ -3,8 +3,8 @@ package com.yidian.shenghuoquan.newscontent.ui.center
 import android.os.Bundle
 import androidx.core.view.isVisible
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.HawkConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.constant.Constant
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityMerchantAuthInfoBinding

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantAuthManagementActivity.kt

@@ -2,7 +2,7 @@ package com.yidian.shenghuoquan.newscontent.ui.center
 
 import android.app.Activity
 import android.os.Bundle
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.shenghuoquan.newscontent.constant.Constant
 import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.http.callback.IAuthMerchantCheckCallback

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt

@@ -8,10 +8,10 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.scwang.smart.refresh.layout.api.RefreshLayout
 import com.scwang.smart.refresh.layout.listener.OnRefreshListener
-import com.yidian.bcommon.AppConfig
-import com.yidian.bcommon.XBirdPageConstants
-import com.yidian.bcommon.XEventConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.AppConfig
+import com.yidian.bcommon.constant.XBirdPageConstants
+import com.yidian.bcommon.constant.XEventConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.http.CommonDataSource
 import com.yidian.bcommon.http.bean.GetCommonConfigBean

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantInfoActivity.kt

@@ -2,8 +2,8 @@ package com.yidian.shenghuoquan.newscontent.ui.center
 
 import android.os.Bundle
 import androidx.core.view.isVisible
-import com.yidian.bcommon.XEventConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XEventConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.constant.Constant

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/dialog/ProtocolDialog.kt

@@ -16,10 +16,10 @@ import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.AppConfig.Companion.privacyPolicyStatement
-import com.yidian.bcommon.AppConfig.Companion.userProtocol
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.AppConfig.Companion.privacyPolicyStatement
+import com.yidian.bcommon.constant.AppConfig.Companion.userProtocol
+import com.yidian.bcommon.constant.HawkConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.nightmode.widget.YdTextView
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.ui.ProtocolActivity

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/dialog/ProtocolHintDialog.kt

@@ -16,9 +16,9 @@ import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.AppConfig.Companion.privacyPolicyStatement
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.AppConfig.Companion.privacyPolicyStatement
+import com.yidian.bcommon.constant.HawkConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.nightmode.widget.YdTextView
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.ui.ProtocolActivity

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/dialog/ShareDialog.kt

@@ -17,7 +17,7 @@ import com.umeng.socialize.UMShareListener
 import com.umeng.socialize.bean.SHARE_MEDIA
 import com.umeng.socialize.media.UMImage
 import com.umeng.socialize.media.UMWeb
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.cardutils.adapter.OnItemClickListener
 import com.yidian.bcommon.utils.CheckApkExistUtil
 import com.yidian.nightmode.widget.YdRecyclerView

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/dialog/ShareImageDialog.kt

@@ -16,7 +16,7 @@ import com.umeng.socialize.ShareAction
 import com.umeng.socialize.UMShareListener
 import com.umeng.socialize.bean.SHARE_MEDIA
 import com.umeng.socialize.media.UMImage
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.cardutils.adapter.OnItemClickListener
 import com.yidian.bcommon.utils.CheckApkExistUtil
 import com.yidian.nightmode.widget.YdRecyclerView

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/dialog/SharePosterDialog.kt

@@ -15,7 +15,7 @@ import com.umeng.socialize.ShareAction
 import com.umeng.socialize.UMShareListener
 import com.umeng.socialize.bean.SHARE_MEDIA
 import com.umeng.socialize.media.UMImage
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.cardutils.adapter.OnItemClickListener
 import com.yidian.bcommon.utils.CheckApkExistUtil
 import com.yidian.bcommon.utils.YdFileUtils

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/setting/FeedbackViewModel.kt

@@ -2,9 +2,9 @@ package com.yidian.shenghuoquan.newscontent.ui.setting
 
 import androidx.lifecycle.MutableLiveData
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.AppConfig
+import com.yidian.bcommon.constant.AppConfig
 import com.yidian.bcommon.BuildConfig
-import com.yidian.bcommon.HawkConfig
+import com.yidian.bcommon.constant.HawkConfig
 import com.yidian.bcommon.http.CommonDataSource
 import com.yidian.bcommon.http.bean.CommitFeedbackBean
 import com.yidian.bcommon.http.callback.ICommitFeedbackCallback

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/setting/SystemSettingActivity.kt

@@ -6,10 +6,10 @@ import android.text.Html
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.AppConfig
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.XRouterPathConstants.Companion.SYSTEM_SETTING
+import com.yidian.bcommon.constant.AppConfig
+import com.yidian.bcommon.constant.HawkConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.SYSTEM_SETTING
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.clickAntiShake
 import com.yidian.bcommon.extensions.initTitleBar

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/store/ChooseStoreActivity.kt

@@ -3,8 +3,8 @@ package com.yidian.shenghuoquan.newscontent.ui.store
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.content.ContextCompat
-import com.yidian.bcommon.XEventConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XEventConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.clickAntiShake
 import com.yidian.bcommon.extensions.hide

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/store/StoreManagementActivity.kt

@@ -3,7 +3,7 @@ package com.yidian.shenghuoquan.newscontent.ui.store
 import android.content.Intent
 import android.os.Bundle
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.yidian.bcommon.XRouterPathConstants.Companion.STORE_MANAGEMENT
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.STORE_MANAGEMENT
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.hide
 import com.yidian.bcommon.extensions.show

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/utils/AccountUtil.kt

@@ -3,7 +3,7 @@ package com.yidian.shenghuoquan.newscontent.utils
 import android.text.TextUtils
 import com.google.gson.Gson
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.HawkConfig
+import com.yidian.bcommon.constant.HawkConfig
 import com.yidian.bcommon.utils.EncryptUtil
 import com.yidian.framework.mobile.xdiamond.SecretUtil
 import com.yidian.shenghuoquan.newscontent.bean.TokenBean

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/utils/KS3Core.kt

@@ -11,7 +11,7 @@ import com.ksyun.ks3.services.Ks3ClientConfiguration
 import com.ksyun.ks3.services.handler.PutObjectACLResponseHandler
 import com.ksyun.ks3.services.handler.PutObjectResponseHandler
 import com.ksyun.ks3.services.request.PutObjectRequest
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.http.httpbean.GetKSYunObjectIdBean
 import com.yidian.shenghuoquan.newscontent.http.httpbean.IGetKSYunObjectIdCallback

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/utils/StorageUtil.kt

 package com.yidian.shenghuoquan.newscontent.utils
 
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.HawkConfig
+import com.yidian.bcommon.constant.HawkConfig
 
 /**
  * author: yinjiacheng

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/wallet/ui/MyWalletActivity.kt

 package com.yidian.shenghuoquan.newscontent.wallet.ui
 
 import android.os.Bundle
-import com.yidian.bcommon.AppConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.AppConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.clickAntiShake
 import com.yidian.bcommon.extensions.hide

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/wallet/ui/TransactionDetailsActivity.kt

@@ -2,7 +2,7 @@ package com.yidian.shenghuoquan.newscontent.wallet.ui
 
 import android.content.Intent
 import android.os.Bundle
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.initTitleBar
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityTransactionDetailsBinding

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/wallet/ui/TransactionListActivity.kt

 package com.yidian.shenghuoquan.newscontent.wallet.ui
 
 import android.os.Bundle
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.initTitleBar
 import com.yidian.shenghuoquan.newscontent.R

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/wallet/ui/VerifyIdentityActivity.kt

@@ -3,8 +3,8 @@ package com.yidian.shenghuoquan.newscontent.wallet.ui
 import android.annotation.SuppressLint
 import android.os.Bundle
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.HawkConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.HawkConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.clickAntiShake
 import com.yidian.bcommon.extensions.initTitleBar

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/wallet/ui/WeChatAuthActivity.kt

@@ -6,8 +6,8 @@ import android.widget.Toast
 import androidx.core.content.ContextCompat
 import com.umeng.socialize.UMShareAPI
 import com.umeng.socialize.bean.SHARE_MEDIA
-import com.yidian.bcommon.XRouterPathConstants
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.clickAntiShake
 import com.yidian.bcommon.extensions.initTitleBar

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/wallet/ui/WithdrawActivity.kt

 package com.yidian.shenghuoquan.newscontent.wallet.ui
 
 import android.os.Bundle
-import android.text.TextWatcher
 import androidx.core.content.ContextCompat
-import androidx.core.widget.addTextChangedListener
-import com.yidian.bcommon.AppConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.clickAntiShake
 import com.yidian.bcommon.extensions.hide
@@ -13,9 +10,7 @@ import com.yidian.bcommon.extensions.initTitleBar
 import com.yidian.bcommon.extensions.show
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityWithdrawBinding
-import com.yidian.shenghuoquan.newscontent.ui.ProtocolActivity
 import com.yidian.shenghuoquan.newscontent.utils.TextWatcherAdapter
-import com.yidian.xpage.XPageManager
 import java.lang.Exception
 
 /**

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/widget/MerchantAssetView.kt

@@ -4,10 +4,8 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.yidian.bcommon.XRouterPathConstants
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ViewMerchantAssetBinding
-import com.yidian.xpage.XPageManager
 
 /**
  * author: yinjiacheng

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/widget/PrivacyAgreementView.kt

@@ -5,8 +5,8 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.CompoundButton
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.yidian.bcommon.AppConfig
-import com.yidian.bcommon.XRouterPathConstants
+import com.yidian.bcommon.constant.AppConfig
+import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ViewPrivacyAgreementBinding
 import com.yidian.shenghuoquan.newscontent.ui.ProtocolActivity

app/src/main/java/com/shenghuoquan/business/BusinessApplication.kt

@@ -5,14 +5,13 @@ import android.content.Context
 import android.content.res.Configuration
 import android.os.Bundle
 import com.orhanobut.hawk.Hawk
-import com.yidian.bcommon.YdBaseApplication
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.http.ApiSaveCookiesInterceptor
 import com.yidian.bcommon.http.ApiSetCookiesInterceptor
 import com.yidian.bcommon.services.AppUpgradeService
 import com.yidian.bcommon.services.ImageService
 import com.yidian.bcommon.services.XEventService
 import com.yidian.bcommon.services.XPageService
-import com.yidian.bcommon.services.http.MBHttpReqService
 import com.yidian.bcommon.utils.UMConfigUtils
 import com.yidian.commonutil.CommonUtilLifecycleModule
 import com.yidian.http.ServiceFactory
@@ -119,7 +118,6 @@ class BusinessApplication : YdBaseApplication() {
     Zap.addService(XPageService.SERVICE_NAME, XPageService())
     Zap.addService(XEventService.SERVICE_NAME, XEventService())
     Zap.addService(AppUpgradeService.SERVICE_NAME, AppUpgradeService())
-    Zap.addService(MBHttpReqService.SERVICE_NAME, MBHttpReqService())
     Zap.addService(ImageService.SERVICE_NAME, ImageService())
   }