Merge remote-tracking branch 'origin/main'

@@ -39,14 +39,14 @@ class AppLoginAuthInfo {
 }
 
 interface IDataJson {
-  jumpType:number
-  jumpUrl:string
-  newsId:string
-  newsObjectLevel:string
-  newsObjectType:number
-  newsRelId:string
-  newsTitle:string
-  pageId:string
+  jumpType: number
+  jumpUrl: string
+  newsId: string
+  newsObjectLevel: string
+  newsObjectType: number
+  newsRelId: string
+  newsTitle: string
+  pageId: string
 }
 
 /**
@@ -159,59 +159,64 @@ function handleJsCallAppInnerLinkMethod(data: Message) {
   content.objectType = '';
   content.linkUrl = encodeURI(urlParams.get('url') || '');
   switch (urlParams.get('type')) {
-      case 'video':
-        content.objectType = ContentConstants.TYPE_VOD
-        ProcessUtils.processPage(content)
-        break;
-      case 'live':
-        content.objectType = ContentConstants.TYPE_LIVE
-        ProcessUtils.processPage(content)
-        break;
-      case 'article':
-        content.objectType = ContentConstants.TYPE_TELETEXT
-        ProcessUtils.processPage(content)
-        break;
-      case 'picture':
-        content.objectType = ContentConstants.TYPE_NINE
-        ProcessUtils.processPage(content)
-        break;
-      case 'audio':
-        content.objectType = ContentConstants.TYPE_AUDIO
+    case 'video':
+      content.objectType = ContentConstants.TYPE_VOD
+      ProcessUtils.processPage(content)
+      break;
+    case 'live':
+      content.objectType = ContentConstants.TYPE_LIVE
+      ProcessUtils.processPage(content)
+      break;
+    case 'article':
+      content.objectType = ContentConstants.TYPE_TELETEXT
+      ProcessUtils.processPage(content)
+      break;
+    case 'picture':
+      content.objectType = ContentConstants.TYPE_NINE
+      ProcessUtils.processPage(content)
+      break;
+    case 'audio':
+      content.objectType = ContentConstants.TYPE_AUDIO
+      ProcessUtils.processPage(content)
+      break;
+    case 'h5':
+      if (urlParams.get('skipType') === '1') {
+        content.objectType = ContentConstants.TYPE_LINK
         ProcessUtils.processPage(content)
-        break;
-      case 'h5':
-        if (urlParams.get('skipType') === '1') {
-          content.objectType = ContentConstants.TYPE_LINK
-          ProcessUtils.processPage(content)
-        }
-        if (urlParams.get('skipType') === '4') {
-          content.objectType = ContentConstants.TYPE_LINK
-          ProcessUtils.jumpExternalWebPage(content.linkUrl)
-        }
-        break;
-      case 'topic':
-        if (urlParams.get('subType') === 'h5') {
-          content.objectType = ContentConstants.TYPE_SPECIAL_TOPIC
-          ProcessUtils.processPage(content)
-        }
-        if (urlParams.get('subType') === 'moring_evening_news') {
-          ProcessUtils.gotoMorningEveningPaper()
-        }
-        if (urlParams.get('subType') === 'electronic_newspapers') {
-          ProcessUtils.gotoENewsPaper()
-        }
-        break;
-      case 'dynamic':
-        content.objectType = ContentConstants.TYPE_FOURTEEN
+      }
+      if (urlParams.get('skipType') === '4') {
+        content.objectType = ContentConstants.TYPE_LINK
+        ProcessUtils.jumpExternalWebPage(content.linkUrl)
+      }
+      break;
+    case 'topic':
+      if (urlParams.get('subType') === 'h5') {
+        content.objectType = ContentConstants.TYPE_SPECIAL_TOPIC
         ProcessUtils.processPage(content)
-        break;
-      case 'owner_page':
-        let creatorId = urlParams.get('creatorId') || ''
-        ProcessUtils.gotoPeopleShipHomePage(creatorId)
-        break;
-      default:
-        break;
-    }
+      }
+      if (urlParams.get('subType') === 'moring_evening_news') {
+        ProcessUtils.gotoMorningEveningPaper()
+      }
+      if (urlParams.get('subType') === 'electronic_newspapers') {
+        ProcessUtils.gotoENewsPaper()
+      }
+      break;
+    case 'dynamic':
+      content.objectType = ContentConstants.TYPE_FOURTEEN
+      ProcessUtils.processPage(content)
+      break;
+    case 'owner_page':
+      let creatorId = urlParams.get('creatorId') || ''
+      ProcessUtils.gotoPeopleShipHomePage(creatorId)
+      break;
+    case 'app':
+      if (urlParams.get('subType') === 'login') {
+        ProcessUtils.gotoLoginPage()
+      }
+      break;
+    default:
+      break;
+  }
 
 }
 

@@ -15,11 +15,15 @@ export function handleJsCallAppService(data: Message, callback: (res: string) =>
     }
 
     let url: string = HttpUrlUtils.getHost() + data?.data?.url
-    if(queryString){
-      url +`?${queryString}}`
+    if (queryString) {
+      url = url + `?${queryString}`
     }
+    console.log('yzl', queryString, url)
     WDHttp.get(url).then((res) => {
-      callback(JSON.stringify(res))
+      callback(JSON.stringify({
+        netError: '0',
+        responseMap: res
+      }))
     })
   }
   if (data?.data?.method === 'post') {