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

 import { Action } from './Action';
 import { Action } from './Action';
+
 interface dataObject {
 interface dataObject {
   // dataSource:
   // dataSource:
   // 1、图文详情数据
   // 1、图文详情数据
@@ -17,7 +18,11 @@ interface dataObject {
   webViewHeight?: string
   webViewHeight?: string
   dataJson?: string
   dataJson?: string
   appInnerLink?: string
   appInnerLink?: string
+  method?: string
+  url?: string
+  parameters?: object
 }
 }
+
 /**
 /**
  * 消息Message
  * 消息Message
  */
  */

@@ -11,6 +11,7 @@
     "wdKit": "file:../wdKit",
     "wdKit": "file:../wdKit",
     "wdJsBridge": "file:../wdJsBridge",
     "wdJsBridge": "file:../wdJsBridge",
     "wdBean": "file:../../features/wdBean",
     "wdBean": "file:../../features/wdBean",
-    "wdRouter": "file:../wdRouter"
+    "wdRouter": "file:../wdRouter",
+    "wdNetwork": "file:../wdNetwork"
   }
   }
 }
 }

@@ -10,6 +10,7 @@ export class H5CallNativeType {
   static jsCall_callAppService = 'jsCall_callAppService'
   static jsCall_callAppService = 'jsCall_callAppService'
   static jsCall_appInnerLinkMethod = 'jsCall_appInnerLinkMethod'
   static jsCall_appInnerLinkMethod = 'jsCall_appInnerLinkMethod'
   static jsCall_receiveH5Data = 'jsCall_receiveH5Data'
   static jsCall_receiveH5Data = 'jsCall_receiveH5Data'
+  static jsCall_getAppLoginAuthInfo = 'jsCall_getAppLoginAuthInfo'
   // TODO 业务自行新增类型、自行在JsBridgeBiz#performJSCallNative里添加接收分支处理。
   // TODO 业务自行新增类型、自行在JsBridgeBiz#performJSCallNative里添加接收分支处理。
 
 
   static {
   static {
@@ -19,6 +20,8 @@ export class H5CallNativeType {
     H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_callAppService)
     H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_callAppService)
     H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_appInnerLinkMethod)
     H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_appInnerLinkMethod)
     H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_receiveH5Data)
     H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_receiveH5Data)
+    H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_getAppLoginAuthInfo)
+
   }
   }
 }
 }
 
 

+import HashMap from '@ohos.util.HashMap';
 import { Callback } from 'wdJsBridge';
 import { Callback } from 'wdJsBridge';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
@@ -8,6 +9,7 @@ import { ProcessUtils } from 'wdRouter';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import Url from '@ohos.url'
 import Url from '@ohos.url'
 import { ContentDTO } from 'wdBean/Index';
 import { ContentDTO } from 'wdBean/Index';
+import { ResponseDTO, WDHttp, HttpUrlUtils } from 'wdNetwork';
 
 
 const TAG = 'JsBridgeBiz'
 const TAG = 'JsBridgeBiz'
 
 
@@ -37,7 +39,9 @@ export function performJSCallNative(data: Message, call: Callback) {
     case H5CallNativeType.jsCall_getArticleDetailBussinessData:
     case H5CallNativeType.jsCall_getArticleDetailBussinessData:
       break;
       break;
     case H5CallNativeType.jsCall_callAppService:
     case H5CallNativeType.jsCall_callAppService:
-      handleJsCallCallAppService(data)
+      handleJsCallCallAppService(data, (res: string) => {
+        call(res)
+      })
       break;
       break;
     case H5CallNativeType.jsCall_receiveH5Data:
     case H5CallNativeType.jsCall_receiveH5Data:
       handleJsCallReceiveH5Data(data)
       handleJsCallReceiveH5Data(data)
@@ -60,6 +64,21 @@ function handleJsCallCurrentPageOperate(data: Message) {
   }
   }
 }
 }
 
 
+function handleJsCallCallAppService(data: Message, callback: (res: string) => void) {
+  let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+  let url: string = HttpUrlUtils.getHost() + data?.data?.url
+  if (data?.data?.method === 'get') {
+    WDHttp.get<ResponseDTO<string>>(url, headers).then((res: ResponseDTO<string>) => {
+      callback(JSON.stringify(res))
+    })
+  }
+  if (data?.data?.method === 'post') {
+    WDHttp.post<ResponseDTO<string>>(url, data?.data?.parameters, headers).then(res => {
+      callback(JSON.stringify(res))
+    })
+  }
+}
+
 /**
 /**
  * 获取App公共信息
  * 获取App公共信息
  */
  */
@@ -87,19 +106,14 @@ function handleJsCallReceiveH5Data(data: Message) {
   }
   }
 }
 }
 
 
-function handleJsCallCallAppService(data: Message) {
-
-}
-
 function handleJsCallAppInnerLinkMethod(data: Message) {
 function handleJsCallAppInnerLinkMethod(data: Message) {
   let urlObject = Url.URL.parseURL(data?.data?.appInnerLink);
   let urlObject = Url.URL.parseURL(data?.data?.appInnerLink);
   let urlParams = new Url.URLParams(urlObject.search);
   let urlParams = new Url.URLParams(urlObject.search);
-  console.log('urlObject:', `${JSON.stringify(urlParams)}`)
   let content: ContentDTO = {
   let content: ContentDTO = {
     objectId: urlParams.get('contentId') || '',
     objectId: urlParams.get('contentId') || '',
     relId: urlParams.get('relId') || '',
     relId: urlParams.get('relId') || '',
     relType: urlParams.get('relType') || '',
     relType: urlParams.get('relType') || '',
-    pageId:urlParams.get('pageId') || '',
+    pageId: urlParams.get('pageId') || '',
     objectType: ''
     objectType: ''
   } as ContentDTO
   } as ContentDTO
   if (urlParams.get('skipType') === '1') {
   if (urlParams.get('skipType') === '1') {
@@ -130,14 +144,14 @@ function handleJsCallAppInnerLinkMethod(data: Message) {
         ProcessUtils.processPage(content)
         ProcessUtils.processPage(content)
         break;
         break;
       case 'topic':
       case 'topic':
-        if(urlParams.get('subType') === 'h5'){
+        if (urlParams.get('subType') === 'h5') {
           content.objectType = ContentConstants.TYPE_SPECIAL_TOPIC
           content.objectType = ContentConstants.TYPE_SPECIAL_TOPIC
           ProcessUtils.processPage(content)
           ProcessUtils.processPage(content)
         }
         }
-        if(urlParams.get('subType') === 'moring_evening_news'){
+        if (urlParams.get('subType') === 'moring_evening_news') {
           ProcessUtils.gotoMorningEveningPaper()
           ProcessUtils.gotoMorningEveningPaper()
         }
         }
-        if(urlParams.get('subType') === 'electronic_newspapers'){
+        if (urlParams.get('subType') === 'electronic_newspapers') {
           ProcessUtils.gotoENewsPaper()
           ProcessUtils.gotoENewsPaper()
         }
         }
         break;
         break;
@@ -148,7 +162,7 @@ function handleJsCallAppInnerLinkMethod(data: Message) {
       case 'owner_page':
       case 'owner_page':
         let creatorId = urlParams.get('creatorId') || ''
         let creatorId = urlParams.get('creatorId') || ''
         ProcessUtils.gotoPeopleShipHomePage(creatorId)
         ProcessUtils.gotoPeopleShipHomePage(creatorId)
-      break;
+        break;
       default:
       default:
         break;
         break;
     }
     }

@@ -6,7 +6,7 @@ import {
   H5ReceiveDetailBean,
   H5ReceiveDetailBean,
   ResponseBean
   ResponseBean
 } from 'wdBean';
 } from 'wdBean';
-import { Logger, SPHelper } from 'wdKit';
+import { Logger, SPHelper, NetworkUtil } from 'wdKit';
 import { SpConstants } from 'wdConstant';
 import { SpConstants } from 'wdConstant';
 import { WdWebLocalComponent } from 'wdWebComponent';
 import { WdWebLocalComponent } from 'wdWebComponent';
 import { NativeCallH5Type } from 'wdWebComponent/src/main/ets/pages/NativeCallH5Type';
 import { NativeCallH5Type } from 'wdWebComponent/src/main/ets/pages/NativeCallH5Type';
@@ -61,7 +61,7 @@ export struct ImageAndTextWebComponent {
       let h5ReceiveDataExtraBean: H5ReceiveDataExtraBean = {
       let h5ReceiveDataExtraBean: H5ReceiveDataExtraBean = {
         creatorId: creatorId,
         creatorId: creatorId,
         isLogin: isLogin,
         isLogin: isLogin,
-        networkStatus: 1,
+        networkStatus: Number(NetworkUtil.isNetConnected()),
         loadImageOnlyWifiSwitch: '2',
         loadImageOnlyWifiSwitch: '2',
 
 
       } as H5ReceiveDataExtraBean
       } as H5ReceiveDataExtraBean

@@ -118,6 +118,7 @@ struct LaunchInterestsHobbiesPage {
       // .rowsTemplate('1fr 1fr 1fr 1fr')
       // .rowsTemplate('1fr 1fr 1fr 1fr')
       .columnsGap('23lpx')
       .columnsGap('23lpx')
       .rowsGap('23lpx')
       .rowsGap('23lpx')
+      .scrollBar(BarState.Off)
 
 
       Stack({alignContent:Alignment.Center}){
       Stack({alignContent:Alignment.Center}){
         Button(this.selectCount == 0?'选好了':'选好了(' + this.selectCount + ')')
         Button(this.selectCount == 0?'选好了':'选好了(' + this.selectCount + ')')