迁移XPageService和XEventService到BRoot

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

@@ -6,7 +6,6 @@ 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
 import com.yidian.shenghuoquan.bmanagercenter.R
 import com.yidian.shenghuoquan.bmanagercenter.adapter.FirstCareerListAdapter
 import com.yidian.shenghuoquan.bmanagercenter.adapter.SecondCareerListAdapter
@@ -14,6 +13,7 @@ import com.yidian.shenghuoquan.bmanagercenter.bean.CareerListBean
 import com.yidian.shenghuoquan.bmanagercenter.databinding.ActivityChooseCareerBinding
 import com.yidian.shenghuoquan.bmanagercenter.utils.JsonUtils
 import com.yidian.xarc.xevent.XBaseEvent
+import com.yidian.xarc.xevent.XEventManager
 import com.yidian.xpage.XPageManager
 
 
@@ -69,7 +69,7 @@ class ChooseCareerActivity : BaseActivity<ActivityChooseCareerBinding>() {
       val secondCareer = adapter.data[position] as String
       // 回传选择的职业
       val event = XBaseEvent(XEventConfig.CHOOSE_CAREER, secondCareer)
-      XEventService.postEvent(event)
+      XEventManager.post(event)
       XPageManager.pop(null)
     }
   }

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

@@ -3,12 +3,15 @@ package com.yidian.shenghuoquan.broot.app
 import android.content.Intent
 import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.shenghuoquan.broot.service.XEventService
+import com.yidian.shenghuoquan.broot.service.XPageService
 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.yac.core.core.YacModuleSpec
+import com.yidian.yac.core.zap.Zap
 
 
 @YacModuleSpec
@@ -40,6 +43,7 @@ class BRootApplication : YdBaseApplication() {
   }
 
   private fun initService() {
-
+    Zap.addService(XPageService.SERVICE_NAME, XPageService())
+    Zap.addService(XEventService.SERVICE_NAME, XEventService())
   }
 }

CommonLib/BCommon/src/main/java/com/yidian/bcommon/services/XEventService.kt → Components/BRoot/src/main/java/com/yidian/shenghuoquan/broot/service/XEventService.kt

-package com.yidian.bcommon.services
+package com.yidian.shenghuoquan.broot.service
 
 import android.util.Log
 import com.yidian.xarc.xbrid.XBridManager
@@ -10,12 +10,12 @@ import com.yidian.yac.core.zap.ZapTicket
 import org.json.JSONObject
 
 /**
- * @description: xevent支持类
- * @author: huyajun
- * @date:  2020/9/27
+ * XEventService服务
+ * ⚠️ 注意：架构需要使用，请勿随意修改
  **/
 
 class XEventService : ZapService() {
+
   override fun onAction(
     path: String,
     action: String,
@@ -28,8 +28,9 @@ class XEventService : ZapService() {
         params as JSONObject
         val name: String = params["name"] as String
         val body = params["body"]
+        //向客户端发送Event
         XEventManager.post(XBaseEvent(name, body))
-        //向flutter发送Event事件
+        //向flutter发送Event
         ZapTicket("flutter-event")
           .withAction("handleEvent")
           .withServiceParams(params)
@@ -39,6 +40,7 @@ class XEventService : ZapService() {
           .onResult { result ->
             Log.d(TAG, "flutter-event+onResult: $result")
           }.ship()
+        //向h5发送Event
         XBridManager.postEvent(name, body, null)
         resolver.success("事件已发送")
       }
@@ -54,6 +56,8 @@ class XEventService : ZapService() {
   companion object {
     const val SERVICE_NAME: String = "xevent"
     private val TAG = "XEventService"
+
+    // 调用XEventService的示例代码如下：使用ZapTicket
     fun postEvent(xbaseEvent: XBaseEvent) {
       val jsonObject = JSONObject()
       jsonObject.put("name", xbaseEvent.name)

CommonLib/BCommon/src/main/java/com/yidian/bcommon/services/XPageService.kt → Components/BRoot/src/main/java/com/yidian/shenghuoquan/broot/service/XPageService.kt

-package com.yidian.bcommon.services
+package com.yidian.shenghuoquan.broot.service
 
 import com.yidian.xarc.xrouter.ResultResolver
 import com.yidian.xpage.XPageManager
 import com.yidian.yac.core.zap.ZapService
 
 /**
- * @description: xpage服务类
- * @author: huyajun
- * @date:  2020/9/27
+ * XPageService服务
+ * ⚠️ 注意：架构需要使用，请勿随意修改
  **/
 
 class XPageService : ZapService() {

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

@@ -8,8 +8,6 @@ import com.orhanobut.hawk.Hawk
 import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.constant.GlobalConstants
 import com.yidian.bcommon.services.AppUpgradeService
-import com.yidian.bcommon.services.XEventService
-import com.yidian.bcommon.services.XPageService
 import com.yidian.commonutil.CommonUtilLifecycleModule
 import com.yidian.news.util.ProcessUtil
 import com.yidian.xpage.XPageManager
@@ -102,8 +100,6 @@ class BusinessApplication : YdBaseApplication() {
   }
 
   private fun loadService() {
-    Zap.addService(XPageService.SERVICE_NAME, XPageService())
-    Zap.addService(XEventService.SERVICE_NAME, XEventService())
     Zap.addService(AppUpgradeService.SERVICE_NAME, AppUpgradeService())
   }
 

config/config.gradle

@@ -2,8 +2,8 @@ ext {
     android = [
             applicationTestId: "com.shenghuoquan.business.debug",
             applicationId    : "com.shenghuoquan.business",
-            versionCode      : 102,
-            versionName      : "1.0.2",
+            versionCode      : 103,
+            versionName      : "1.0.3",
             isApplication    : false,
     ]
     // 高德地图的key