Showing
5 changed files
with
11 additions
and
5 deletions
| @@ -128,7 +128,7 @@ export class AppInnerLink { | @@ -128,7 +128,7 @@ export class AppInnerLink { | ||
| 128 | } | 128 | } |
| 129 | if (params.type == "topic" && params.subType == "moring_evening_news") { | 129 | if (params.type == "topic" && params.subType == "moring_evening_news") { |
| 130 | ///解决早晚报切换不更新问题,内部更新id | 130 | ///解决早晚报切换不更新问题,内部更新id |
| 131 | - SPHelper.default.deleteSync('dailyPaperTopicPageId'); | 131 | + SPHelper.default.saveSync('dailyPaperTopicPageId', params.pageId + ""); |
| 132 | ProcessUtils.gotoMorningEveningPaper() | 132 | ProcessUtils.gotoMorningEveningPaper() |
| 133 | } | 133 | } |
| 134 | 134 |
| @@ -198,7 +198,7 @@ function handleJsCallAppInnerLinkMethod(data: Message) { | @@ -198,7 +198,7 @@ function handleJsCallAppInnerLinkMethod(data: Message) { | ||
| 198 | } | 198 | } |
| 199 | if (urlParams.get('subType') === 'moring_evening_news') { | 199 | if (urlParams.get('subType') === 'moring_evening_news') { |
| 200 | ///解决早晚报切换不更新问题,内部更新id | 200 | ///解决早晚报切换不更新问题,内部更新id |
| 201 | - SPHelper.default.deleteSync('dailyPaperTopicPageId'); | 201 | + SPHelper.default.saveSync('dailyPaperTopicPageId', content.pageId + ""); |
| 202 | ProcessUtils.gotoMorningEveningPaper() | 202 | ProcessUtils.gotoMorningEveningPaper() |
| 203 | } | 203 | } |
| 204 | if (urlParams.get('subType') === 'electronic_newspapers') { | 204 | if (urlParams.get('subType') === 'electronic_newspapers') { |
| @@ -35,6 +35,7 @@ export class NewspaperDataFetcher { | @@ -35,6 +35,7 @@ export class NewspaperDataFetcher { | ||
| 35 | ) | 35 | ) |
| 36 | 36 | ||
| 37 | if (page.topicInfo?.frontFlag && page.topicInfo.frontLinkObject) { | 37 | if (page.topicInfo?.frontFlag && page.topicInfo.frontLinkObject) { |
| 38 | + data.paperInfo.pageId = page.id | ||
| 38 | data.paperInfo.showLeftImage = true | 39 | data.paperInfo.showLeftImage = true |
| 39 | data.paperInfo.leftImageUrl = page.topicInfo.frontLinkObject.coverUrl | 40 | data.paperInfo.leftImageUrl = page.topicInfo.frontLinkObject.coverUrl |
| 40 | data.paperInfo.leftTitle = page.topicInfo.frontLinkObject.title | 41 | data.paperInfo.leftTitle = page.topicInfo.frontLinkObject.title |
| @@ -17,6 +17,8 @@ export class FormNewspaperPaperInfo { | @@ -17,6 +17,8 @@ export class FormNewspaperPaperInfo { | ||
| 17 | leftTitle?: string | 17 | leftTitle?: string |
| 18 | leftDeepLink?: string | 18 | leftDeepLink?: string |
| 19 | 19 | ||
| 20 | + pageId?: number //早晚报id | ||
| 21 | + | ||
| 20 | rightContentHasAnyImage?: boolean = false | 22 | rightContentHasAnyImage?: boolean = false |
| 21 | } | 23 | } |
| 22 | 24 |
| @@ -35,7 +35,7 @@ struct DailyNewspaperWidgetCard { | @@ -35,7 +35,7 @@ struct DailyNewspaperWidgetCard { | ||
| 35 | .width("100%").height(36) | 35 | .width("100%").height(36) |
| 36 | // .margin({top: 3}) | 36 | // .margin({top: 3}) |
| 37 | .onClick(() => { | 37 | .onClick(() => { |
| 38 | - jumpWithDeepLink(DAILY_NEWSPAPER_DEEP_LINK, this) | 38 | + jumpWithDeepLink(`rmrbapp://rmrb.app/openwith?type=topic&subType=moring_evening_news&pageId=${this.paperInfo.pageId}&relId=&skipType=1`, this) |
| 39 | }) | 39 | }) |
| 40 | 40 | ||
| 41 | Row() { | 41 | Row() { |
| @@ -64,7 +64,7 @@ struct DailyNewspaperWidgetCard { | @@ -64,7 +64,7 @@ struct DailyNewspaperWidgetCard { | ||
| 64 | .borderRadius(6) | 64 | .borderRadius(6) |
| 65 | .onClick(() => { | 65 | .onClick(() => { |
| 66 | // jumpWithDeepLink(this.paperInfo.leftDeepLink || "", this) | 66 | // jumpWithDeepLink(this.paperInfo.leftDeepLink || "", this) |
| 67 | - jumpWithDeepLink(DAILY_NEWSPAPER_DEEP_LINK, this) | 67 | + jumpWithDeepLink(`rmrbapp://rmrb.app/openwith?type=topic&subType=moring_evening_news&pageId=${this.paperInfo.pageId}&relId=&skipType=1`, this) |
| 68 | }) | 68 | }) |
| 69 | 69 | ||
| 70 | Text(this.paperInfo.leftTitle) | 70 | Text(this.paperInfo.leftTitle) |
| @@ -88,6 +88,7 @@ struct DailyNewspaperWidgetCard { | @@ -88,6 +88,7 @@ struct DailyNewspaperWidgetCard { | ||
| 88 | ContentCellView({ | 88 | ContentCellView({ |
| 89 | content: item, | 89 | content: item, |
| 90 | index: index, | 90 | index: index, |
| 91 | + pageId:this.paperInfo.pageId, | ||
| 91 | needShowNumber: this.needShowNumber, | 92 | needShowNumber: this.needShowNumber, |
| 92 | hasImage: (item.coverUrl && item.coverUrl.length > 0 ? true : false) | 93 | hasImage: (item.coverUrl && item.coverUrl.length > 0 ? true : false) |
| 93 | }) | 94 | }) |
| @@ -109,6 +110,8 @@ struct DailyNewspaperWidgetCard { | @@ -109,6 +110,8 @@ struct DailyNewspaperWidgetCard { | ||
| 109 | struct ContentCellView { | 110 | struct ContentCellView { |
| 110 | @Prop needShowNumber: boolean = false | 111 | @Prop needShowNumber: boolean = false |
| 111 | @Prop content: FormNewspaperPaperContent | 112 | @Prop content: FormNewspaperPaperContent |
| 113 | + | ||
| 114 | + private pageId : number = 0 | ||
| 112 | private index : number = 0 | 115 | private index : number = 0 |
| 113 | private hasImage: boolean = false | 116 | private hasImage: boolean = false |
| 114 | build() { | 117 | build() { |
| @@ -148,7 +151,7 @@ struct ContentCellView { | @@ -148,7 +151,7 @@ struct ContentCellView { | ||
| 148 | .justifyContent(FlexAlign.Start) | 151 | .justifyContent(FlexAlign.Start) |
| 149 | .onClick(() => { | 152 | .onClick(() => { |
| 150 | // jumpWithDeepLink(this.content.deepLink || "", this) | 153 | // jumpWithDeepLink(this.content.deepLink || "", this) |
| 151 | - jumpWithDeepLink(DAILY_NEWSPAPER_DEEP_LINK, this) | 154 | + jumpWithDeepLink(`rmrbapp://rmrb.app/openwith?type=topic&subType=moring_evening_news&pageId=${this.pageId}&relId=&skipType=1`, this) |
| 152 | }) | 155 | }) |
| 153 | } | 156 | } |
| 154 | } | 157 | } |
-
Please register or login to post a comment