developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
陈剑华
7698c877 2 parents e771fe10 8c1348ba

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 2 changed files with 71 additions and 62 deletions
@@ -39,14 +39,14 @@ class AppLoginAuthInfo { @@ -39,14 +39,14 @@ class AppLoginAuthInfo {
39 } 39 }
40 40
41 interface IDataJson { 41 interface IDataJson {
42 - jumpType:number  
43 - jumpUrl:string  
44 - newsId:string  
45 - newsObjectLevel:string  
46 - newsObjectType:number  
47 - newsRelId:string  
48 - newsTitle:string  
49 - pageId:string 42 + jumpType: number
  43 + jumpUrl: string
  44 + newsId: string
  45 + newsObjectLevel: string
  46 + newsObjectType: number
  47 + newsRelId: string
  48 + newsTitle: string
  49 + pageId: string
50 } 50 }
51 51
52 /** 52 /**
@@ -159,59 +159,64 @@ function handleJsCallAppInnerLinkMethod(data: Message) { @@ -159,59 +159,64 @@ function handleJsCallAppInnerLinkMethod(data: Message) {
159 content.objectType = ''; 159 content.objectType = '';
160 content.linkUrl = encodeURI(urlParams.get('url') || ''); 160 content.linkUrl = encodeURI(urlParams.get('url') || '');
161 switch (urlParams.get('type')) { 161 switch (urlParams.get('type')) {
162 - case 'video':  
163 - content.objectType = ContentConstants.TYPE_VOD  
164 - ProcessUtils.processPage(content)  
165 - break;  
166 - case 'live':  
167 - content.objectType = ContentConstants.TYPE_LIVE  
168 - ProcessUtils.processPage(content)  
169 - break;  
170 - case 'article':  
171 - content.objectType = ContentConstants.TYPE_TELETEXT  
172 - ProcessUtils.processPage(content)  
173 - break;  
174 - case 'picture':  
175 - content.objectType = ContentConstants.TYPE_NINE  
176 - ProcessUtils.processPage(content)  
177 - break;  
178 - case 'audio':  
179 - content.objectType = ContentConstants.TYPE_AUDIO 162 + case 'video':
  163 + content.objectType = ContentConstants.TYPE_VOD
  164 + ProcessUtils.processPage(content)
  165 + break;
  166 + case 'live':
  167 + content.objectType = ContentConstants.TYPE_LIVE
  168 + ProcessUtils.processPage(content)
  169 + break;
  170 + case 'article':
  171 + content.objectType = ContentConstants.TYPE_TELETEXT
  172 + ProcessUtils.processPage(content)
  173 + break;
  174 + case 'picture':
  175 + content.objectType = ContentConstants.TYPE_NINE
  176 + ProcessUtils.processPage(content)
  177 + break;
  178 + case 'audio':
  179 + content.objectType = ContentConstants.TYPE_AUDIO
  180 + ProcessUtils.processPage(content)
  181 + break;
  182 + case 'h5':
  183 + if (urlParams.get('skipType') === '1') {
  184 + content.objectType = ContentConstants.TYPE_LINK
180 ProcessUtils.processPage(content) 185 ProcessUtils.processPage(content)
181 - break;  
182 - case 'h5':  
183 - if (urlParams.get('skipType') === '1') {  
184 - content.objectType = ContentConstants.TYPE_LINK  
185 - ProcessUtils.processPage(content)  
186 - }  
187 - if (urlParams.get('skipType') === '4') {  
188 - content.objectType = ContentConstants.TYPE_LINK  
189 - ProcessUtils.jumpExternalWebPage(content.linkUrl)  
190 - }  
191 - break;  
192 - case 'topic':  
193 - if (urlParams.get('subType') === 'h5') {  
194 - content.objectType = ContentConstants.TYPE_SPECIAL_TOPIC  
195 - ProcessUtils.processPage(content)  
196 - }  
197 - if (urlParams.get('subType') === 'moring_evening_news') {  
198 - ProcessUtils.gotoMorningEveningPaper()  
199 - }  
200 - if (urlParams.get('subType') === 'electronic_newspapers') {  
201 - ProcessUtils.gotoENewsPaper()  
202 - }  
203 - break;  
204 - case 'dynamic':  
205 - content.objectType = ContentConstants.TYPE_FOURTEEN 186 + }
  187 + if (urlParams.get('skipType') === '4') {
  188 + content.objectType = ContentConstants.TYPE_LINK
  189 + ProcessUtils.jumpExternalWebPage(content.linkUrl)
  190 + }
  191 + break;
  192 + case 'topic':
  193 + if (urlParams.get('subType') === 'h5') {
  194 + content.objectType = ContentConstants.TYPE_SPECIAL_TOPIC
206 ProcessUtils.processPage(content) 195 ProcessUtils.processPage(content)
207 - break;  
208 - case 'owner_page':  
209 - let creatorId = urlParams.get('creatorId') || ''  
210 - ProcessUtils.gotoPeopleShipHomePage(creatorId)  
211 - break;  
212 - default:  
213 - break;  
214 - } 196 + }
  197 + if (urlParams.get('subType') === 'moring_evening_news') {
  198 + ProcessUtils.gotoMorningEveningPaper()
  199 + }
  200 + if (urlParams.get('subType') === 'electronic_newspapers') {
  201 + ProcessUtils.gotoENewsPaper()
  202 + }
  203 + break;
  204 + case 'dynamic':
  205 + content.objectType = ContentConstants.TYPE_FOURTEEN
  206 + ProcessUtils.processPage(content)
  207 + break;
  208 + case 'owner_page':
  209 + let creatorId = urlParams.get('creatorId') || ''
  210 + ProcessUtils.gotoPeopleShipHomePage(creatorId)
  211 + break;
  212 + case 'app':
  213 + if (urlParams.get('subType') === 'login') {
  214 + ProcessUtils.gotoLoginPage()
  215 + }
  216 + break;
  217 + default:
  218 + break;
  219 + }
215 220
216 } 221 }
217 222
@@ -15,11 +15,15 @@ export function handleJsCallAppService(data: Message, callback: (res: string) => @@ -15,11 +15,15 @@ export function handleJsCallAppService(data: Message, callback: (res: string) =>
15 } 15 }
16 16
17 let url: string = HttpUrlUtils.getHost() + data?.data?.url 17 let url: string = HttpUrlUtils.getHost() + data?.data?.url
18 - if(queryString){  
19 - url +`?${queryString}}` 18 + if (queryString) {
  19 + url = url + `?${queryString}`
20 } 20 }
  21 + console.log('yzl', queryString, url)
21 WDHttp.get(url).then((res) => { 22 WDHttp.get(url).then((res) => {
22 - callback(JSON.stringify(res)) 23 + callback(JSON.stringify({
  24 + netError: '0',
  25 + responseMap: res
  26 + }))
23 }) 27 })
24 } 28 }
25 if (data?.data?.method === 'post') { 29 if (data?.data?.method === 'post') {