Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

 import emitter from '@ohos.events.emitter';
 import emitter from '@ohos.events.emitter';
-import HashMap from '@ohos.util.HashMap';
 
 
 const TAG: string = 'EmitterUtils';
 const TAG: string = 'EmitterUtils';
 
 
 /**
 /**
  * 线程间通信简单工具
  * 线程间通信简单工具
- * TODO 待优化
  */
  */
 export class EmitterUtils {
 export class EmitterUtils {
   /**
   /**
@@ -23,15 +21,17 @@ export class EmitterUtils {
   /**
   /**
    * 发送消息
    * 发送消息
    * @param eventId 事件id
    * @param eventId 事件id
-   * @param data 数据
+   * @param str 字符串数据
    */
    */
-  static sendEvent(eventId: number, data: { [key: string]: any; }) {
+  static sendEvent(eventId: number, str?: string) {
     let event: emitter.InnerEvent = {
     let event: emitter.InnerEvent = {
       eventId: eventId,
       eventId: eventId,
       priority: emitter.EventPriority.LOW
       priority: emitter.EventPriority.LOW
     };
     };
     let eventData: emitter.EventData = {
     let eventData: emitter.EventData = {
-      data: data
+      data: {
+        jsonStr: str
+      }
     };
     };
     emitter.emit(event, eventData);
     emitter.emit(event, eventData);
   }
   }
@@ -41,18 +41,29 @@ export class EmitterUtils {
    * @param eventId 事件id
    * @param eventId 事件id
    * @param callback 回调函数
    * @param callback 回调函数
    */
    */
-  static receiveEvent(eventId: number, callback: (data?: { [key: string]: any; }) => void) {
+  static receiveEvent(eventId: number, callback: (str?: string) => void) {
     let event: emitter.InnerEvent = {
     let event: emitter.InnerEvent = {
       eventId: eventId
       eventId: eventId
     };
     };
 
 
-    // 收到eventId为1的事件后执行该回调
-    let callback1 = (eventData: emitter.EventData): void => {
-      callback(eventData.data)
+    // 收到eventId事件后执行该回调
+    let callback1 = (eventData?: emitter.EventData): void => {
+      if (eventData && eventData.data) {
+        try {
+          let jsonObject: EmitterBean = JSON.parse(JSON.stringify(eventData.data))
+          callback(jsonObject.jsonStr)
+        } catch (err) {
+          callback()
+        }
+      } else {
+        callback()
+      }
     };
     };
-
-    // 订阅eventId为1的事件
+    // 订阅eventId事件
     emitter.on(event, callback1);
     emitter.on(event, callback1);
   }
   }
 }
 }
 
 
+interface EmitterBean {
+  jsonStr: string
+}