developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
liyubing
a4c79e9e 2 parents 2fe43fac 10ef4874

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 57 changed files with 155 additions and 1541 deletions
@@ -8,4 +8,6 @@ @@ -8,4 +8,6 @@
8 /.clangd 8 /.clangd
9 /.clang-format 9 /.clang-format
10 /.clang-tidy 10 /.clang-tidy
11 -**/.test  
  11 +**/.test
  12 +**/oh-package-lock.json5
  13 +/oh-package-lock.json5
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
@@ -3,4 +3,6 @@ @@ -3,4 +3,6 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
  8 +/BuildProfile.ets
1 -export default class BuildProfile {  
2 - static readonly HAR_VERSION = '1.0.0';  
3 - static readonly BUILD_MODE_NAME = 'debug';  
4 - static readonly DEBUG = true;  
5 - static readonly TARGET_NAME = 'default';  
6 - static readonly BUILD_VERSION = '';  
7 -}  
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "@umeng/analytics@^1.0.19": "@umeng/analytics@1.0.19",  
9 - "@umeng/common@^1.0.21": "@umeng/common@1.0.21",  
10 - "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon"  
11 - },  
12 - "packages": {  
13 - "@umeng/analytics@1.0.19": {  
14 - "name": "@umeng/analytics",  
15 - "integrity": "sha512-0m9z5l8to+POjDl9UkCQC8s4P+e2E1OILwUglC7ME4QwqfH44e59GLJtQdwF0h6kwpsy3YBft4SoWK8MYbuP7g==",  
16 - "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/analytics/-/analytics-1.0.19.har",  
17 - "registryType": "ohpm"  
18 - },  
19 - "@umeng/common@1.0.21": {  
20 - "name": "@umeng/common",  
21 - "integrity": "sha512-EbXsd4OoRisTQf5egNY/+z1D2bvrYw9VwC2xu3EJA9TiDPSbnaJZ5+yltA/Se6yZ4oCcFvq6e5/AAfPuumunbw==",  
22 - "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/common/-/common-1.0.21.har",  
23 - "registryType": "ohpm",  
24 - "dependencies": {  
25 - "libcommon.so": "./src/main/cpp/types/libcommon"  
26 - }  
27 - },  
28 - "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": {  
29 - "name": "libcommon.so",  
30 - "resolved": "../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",  
31 - "registryType": "local"  
32 - }  
33 - }  
34 -}  
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",  
9 - "@umeng/analytics@^1.0.19": "@umeng/analytics@1.0.19",  
10 - "@umeng/common@^1.0.21": "@umeng/common@1.0.21",  
11 - "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",  
12 - "wdConstant@../wdConstant": "wdConstant@../wdConstant",  
13 - "wdKit@../wdKit": "wdKit@../wdKit"  
14 - },  
15 - "packages": {  
16 - "@ohos/axios@2.2.0": {  
17 - "name": "@ohos/axios",  
18 - "integrity": "sha512-v1QBWk6DfcN8wUW3D0ieFbHTR1taSI5cOgxp5l6B5cegXuNYhSc8ggKlAIXe6h/14LsfM+NW0ZGfSXcNEIM5yA==",  
19 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",  
20 - "registryType": "ohpm"  
21 - },  
22 - "@umeng/analytics@1.0.19": {  
23 - "name": "@umeng/analytics",  
24 - "integrity": "sha512-0m9z5l8to+POjDl9UkCQC8s4P+e2E1OILwUglC7ME4QwqfH44e59GLJtQdwF0h6kwpsy3YBft4SoWK8MYbuP7g==",  
25 - "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/analytics/-/analytics-1.0.19.har",  
26 - "registryType": "ohpm"  
27 - },  
28 - "@umeng/common@1.0.21": {  
29 - "name": "@umeng/common",  
30 - "integrity": "sha512-EbXsd4OoRisTQf5egNY/+z1D2bvrYw9VwC2xu3EJA9TiDPSbnaJZ5+yltA/Se6yZ4oCcFvq6e5/AAfPuumunbw==",  
31 - "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/common/-/common-1.0.21.har",  
32 - "registryType": "ohpm",  
33 - "dependencies": {  
34 - "libcommon.so": "./src/main/cpp/types/libcommon"  
35 - }  
36 - },  
37 - "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": {  
38 - "name": "libcommon.so",  
39 - "resolved": "../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",  
40 - "registryType": "local"  
41 - },  
42 - "wdConstant@../wdConstant": {  
43 - "name": "wdconstant",  
44 - "resolved": "../wdConstant",  
45 - "registryType": "local"  
46 - },  
47 - "wdKit@../wdKit": {  
48 - "name": "wdkit",  
49 - "resolved": "../wdKit",  
50 - "registryType": "local",  
51 - "dependencies": {  
52 - "@umeng/common": "^1.0.21",  
53 - "@umeng/analytics": "^1.0.19"  
54 - }  
55 - }  
56 - }  
57 -}  
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "wdBean@../../features/wdBean": "wdBean@../../features/wdBean",  
9 - "wdKit@../wdKit": "wdKit@../wdKit"  
10 - },  
11 - "packages": {  
12 - "wdBean@../../features/wdBean": {  
13 - "name": "wdbean",  
14 - "resolved": "../../features/wdBean",  
15 - "registryType": "local"  
16 - },  
17 - "wdKit@../wdKit": {  
18 - "name": "wdkit",  
19 - "resolved": "../wdKit",  
20 - "registryType": "local"  
21 - }  
22 - }  
23 -}  
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "wdBean@../../features/wdBean": "wdBean@../../features/wdBean",  
9 - "wdConstant@../wdConstant": "wdConstant@../wdConstant",  
10 - "wdJsBridge@../wdJsBridge": "wdJsBridge@../wdJsBridge",  
11 - "wdKit@../wdKit": "wdKit@../wdKit",  
12 - "wdRouter@../wdRouter": "wdRouter@../wdRouter"  
13 - },  
14 - "packages": {  
15 - "wdBean@../../features/wdBean": {  
16 - "name": "wdbean",  
17 - "resolved": "../../features/wdBean",  
18 - "registryType": "local"  
19 - },  
20 - "wdConstant@../wdConstant": {  
21 - "name": "wdconstant",  
22 - "resolved": "../wdConstant",  
23 - "registryType": "local"  
24 - },  
25 - "wdJsBridge@../wdJsBridge": {  
26 - "name": "wdjsbridge",  
27 - "resolved": "../wdJsBridge",  
28 - "registryType": "local"  
29 - },  
30 - "wdKit@../wdKit": {  
31 - "name": "wdkit",  
32 - "resolved": "../wdKit",  
33 - "registryType": "local"  
34 - },  
35 - "wdRouter@../wdRouter": {  
36 - "name": "wdrouter",  
37 - "resolved": "../wdRouter",  
38 - "registryType": "local",  
39 - "dependencies": {  
40 - "wdKit": "file:../wdKit",  
41 - "wdBean": "file:../../features/wdBean"  
42 - }  
43 - }  
44 - }  
45 -}  
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",  
9 - "@ohos/lottie@2.0.0": "@ohos/lottie@2.0.0",  
10 - "wdBean@../wdBean": "wdBean@../wdBean",  
11 - "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",  
12 - "wdDetailPlayApi@../wdDetailPlayApi": "wdDetailPlayApi@../wdDetailPlayApi",  
13 - "wdDetailPlayShortVideo@../wdDetailPlayShortVideo": "wdDetailPlayShortVideo@../wdDetailPlayShortVideo",  
14 - "wdJsBridge@../../commons/wdJsBridge": "wdJsBridge@../../commons/wdJsBridge",  
15 - "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",  
16 - "wdLogin@../wdLogin": "wdLogin@../wdLogin",  
17 - "wdNetwork@../../commons/wdNetwork": "wdNetwork@../../commons/wdNetwork",  
18 - "wdPlayer@../wdPlayer": "wdPlayer@../wdPlayer",  
19 - "wdRouter@../../commons/wdRouter": "wdRouter@../../commons/wdRouter",  
20 - "wdWebComponent@../../commons/wdWebComponent": "wdWebComponent@../../commons/wdWebComponent"  
21 - },  
22 - "packages": {  
23 - "@ohos/axios@2.2.0": {  
24 - "name": "@ohos/axios",  
25 - "integrity": "sha512-v1QBWk6DfcN8wUW3D0ieFbHTR1taSI5cOgxp5l6B5cegXuNYhSc8ggKlAIXe6h/14LsfM+NW0ZGfSXcNEIM5yA==",  
26 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",  
27 - "registryType": "ohpm"  
28 - },  
29 - "@ohos/lottie@2.0.0": {  
30 - "name": "@ohos/lottie",  
31 - "integrity": "sha512-jFEFYfuqGO323aMiwtzHmDGRJI0qTxjZD2Lzbn+LxRdoHSfu5OVu22I8gVm5ej019tCw3WOk547NHZ2GuWiNSg==",  
32 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/lottie/-/lottie-2.0.0.har",  
33 - "registryType": "ohpm"  
34 - },  
35 - "wdBean@../wdBean": {  
36 - "name": "wdbean",  
37 - "resolved": "../wdBean",  
38 - "registryType": "local"  
39 - },  
40 - "wdConstant@../../commons/wdConstant": {  
41 - "name": "wdconstant",  
42 - "resolved": "../../commons/wdConstant",  
43 - "registryType": "local"  
44 - },  
45 - "wdDetailPlayApi@../wdDetailPlayApi": {  
46 - "name": "wddetailplayapi",  
47 - "resolved": "../wdDetailPlayApi",  
48 - "registryType": "local",  
49 - "dependencies": {  
50 - "wdPlayer": "file:../../features/wdPlayer",  
51 - "wdKit": "file:../../commons/wdKit",  
52 - "wdBean": "file:../../features/wdBean",  
53 - "wdRouter": "file:../../commons/wdRouter",  
54 - "wdNetwork": "file:../../commons/wdNetwork"  
55 - }  
56 - },  
57 - "wdDetailPlayShortVideo@../wdDetailPlayShortVideo": {  
58 - "name": "wddetailplayshortvideo",  
59 - "resolved": "../wdDetailPlayShortVideo",  
60 - "registryType": "local",  
61 - "dependencies": {  
62 - "@ohos/lottie": "2.0.0",  
63 - "wdPlayer": "file:../../features/wdPlayer",  
64 - "wdKit": "file:../../commons/wdKit",  
65 - "wdBean": "file:../../features/wdBean",  
66 - "wdRouter": "file:../../commons/wdRouter",  
67 - "wdNetwork": "file:../../commons/wdNetwork",  
68 - "wdDetailPlayApi": "file:../../features/wdDetailPlayApi"  
69 - }  
70 - },  
71 - "wdJsBridge@../../commons/wdJsBridge": {  
72 - "name": "wdjsbridge",  
73 - "resolved": "../../commons/wdJsBridge",  
74 - "registryType": "local"  
75 - },  
76 - "wdKit@../../commons/wdKit": {  
77 - "name": "wdkit",  
78 - "resolved": "../../commons/wdKit",  
79 - "registryType": "local"  
80 - },  
81 - "wdLogin@../wdLogin": {  
82 - "name": "wdlogin",  
83 - "resolved": "../wdLogin",  
84 - "registryType": "local",  
85 - "dependencies": {  
86 - "wdConstant": "file:../../commons/wdConstant",  
87 - "wdKit": "file:../../commons/wdKit",  
88 - "wdWebComponent": "file:../../commons/wdWebComponent",  
89 - "wdBean": "file:../../features/wdBean",  
90 - "wdRouter": "file:../../commons/wdRouter",  
91 - "wdNetwork": "file:../../commons/wdNetwork"  
92 - }  
93 - },  
94 - "wdNetwork@../../commons/wdNetwork": {  
95 - "name": "wdnetwork",  
96 - "resolved": "../../commons/wdNetwork",  
97 - "registryType": "local",  
98 - "dependencies": {  
99 - "wdConstant": "file:../wdConstant",  
100 - "wdKit": "file:../wdKit",  
101 - "@ohos/axios": "^2.1.1"  
102 - }  
103 - },  
104 - "wdPlayer@../wdPlayer": {  
105 - "name": "wdplayer",  
106 - "resolved": "../wdPlayer",  
107 - "registryType": "local",  
108 - "dependencies": {  
109 - "wdKit": "file:../../commons/wdKit"  
110 - }  
111 - },  
112 - "wdRouter@../../commons/wdRouter": {  
113 - "name": "wdrouter",  
114 - "resolved": "../../commons/wdRouter",  
115 - "registryType": "local",  
116 - "dependencies": {  
117 - "wdKit": "file:../wdKit",  
118 - "wdBean": "file:../../features/wdBean"  
119 - }  
120 - },  
121 - "wdWebComponent@../../commons/wdWebComponent": {  
122 - "name": "wdwebcomponent",  
123 - "resolved": "../../commons/wdWebComponent",  
124 - "registryType": "local",  
125 - "dependencies": {  
126 - "wdConstant": "file:../wdConstant",  
127 - "wdKit": "file:../wdKit",  
128 - "wdJsBridge": "file:../wdJsBridge",  
129 - "wdBean": "file:../../features/wdBean",  
130 - "wdRouter": "file:../wdRouter"  
131 - }  
132 - }  
133 - }  
134 -}  
@@ -91,14 +91,14 @@ export struct MorningEveningPaperComponent { @@ -91,14 +91,14 @@ export struct MorningEveningPaperComponent {
91 private AudioSuspension = new AudioSuspensionModel() 91 private AudioSuspension = new AudioSuspensionModel()
92 92
93 onCancel() { 93 onCancel() {
94 - Logger.info(TAG, "cj2024 onCancel = ") 94 + console.log(TAG, "cj2024 onCancel = ")
95 } 95 }
96 96
97 /** 97 /**
98 * 回调无用 98 * 回调无用
99 **/ 99 **/
100 onConfirm() { 100 onConfirm() {
101 - Logger.info(TAG, "cj2024 onConfirm = ") 101 + console.log(TAG, "cj2024 onConfirm = ")
102 // if (this.playerController != undefined) { 102 // if (this.playerController != undefined) {
103 // 103 //
104 // } 104 // }
@@ -108,10 +108,10 @@ export struct MorningEveningPaperComponent { @@ -108,10 +108,10 @@ export struct MorningEveningPaperComponent {
108 108
109 // 续播判断 109 // 续播判断
110 changeContinue() { 110 changeContinue() {
111 - Logger.info(TAG, "cj2024 changeContinue = 1") 111 + console.log(TAG, "cj2024 changeContinue = 1")
112 // if (this.nextContId) { 112 // if (this.nextContId) {
113 this.playerController.continue = () => { 113 this.playerController.continue = () => {
114 - Logger.info(TAG, "cj2024 changeContinue = 2") 114 + console.log(TAG, "cj2024 changeContinue = 2")
115 this.playerController?.stop(); 115 this.playerController?.stop();
116 // this.playVM.playWithContentId(this.nextContId ?? ''); 116 // this.playVM.playWithContentId(this.nextContId ?? '');
117 } 117 }
@@ -130,8 +130,8 @@ export struct MorningEveningPaperComponent { @@ -130,8 +130,8 @@ export struct MorningEveningPaperComponent {
130 const dailyPaperTopicPageId = await SPHelper.default.getSync('dailyPaperTopicPageId', "") as String 130 const dailyPaperTopicPageId = await SPHelper.default.getSync('dailyPaperTopicPageId', "") as String
131 console.info(TAG, `aboutToAppear = ` + dailyPaperTopicPageId) 131 console.info(TAG, `aboutToAppear = ` + dailyPaperTopicPageId)
132 const currentTime = new Date().getTime() 132 const currentTime = new Date().getTime()
133 - Logger.info(TAG, "currentTime = " + currentTime)  
134 - Logger.info(TAG, `currentTime = ${currentTime}`) 133 + console.log(TAG, "currentTime = " + currentTime)
  134 + console.log(TAG, `currentTime = ${currentTime}`)
135 try { 135 try {
136 136
137 // let pageInfoBean = await MorningEveningViewModel.getMorningEveningPageInfo("" + this.dailyPaperTopicPageId) 137 // let pageInfoBean = await MorningEveningViewModel.getMorningEveningPageInfo("" + this.dailyPaperTopicPageId)
@@ -145,13 +145,13 @@ export struct MorningEveningPaperComponent { @@ -145,13 +145,13 @@ export struct MorningEveningPaperComponent {
145 let dateTime = DateTimeUtils.parseDate(this.pageInfoBean?.topicInfo?.topicDate ?? '', DateTimeUtils.PATTERN_DATE_HYPHEN) 145 let dateTime = DateTimeUtils.parseDate(this.pageInfoBean?.topicInfo?.topicDate ?? '', DateTimeUtils.PATTERN_DATE_HYPHEN)
146 const dateShow = new Date(dateTime) 146 const dateShow = new Date(dateTime)
147 this.subTitle = `${dateShow.getFullYear()}年\n${(dateShow.getMonth() + 1)}月${dateShow.getDate()}日` 147 this.subTitle = `${dateShow.getFullYear()}年\n${(dateShow.getMonth() + 1)}月${dateShow.getDate()}日`
148 - Logger.info(TAG, "pageInfoBean topicDate = " + this.pageInfoBean?.topicInfo?.topicDate)  
149 - Logger.info(TAG, "pageInfoBean title = " + this.pageInfoBean?.topicInfo?.title) 148 + console.log(TAG, "pageInfoBean topicDate = " + this.pageInfoBean?.topicInfo?.topicDate)
  149 + console.log(TAG, "pageInfoBean title = " + this.pageInfoBean?.topicInfo?.title)
150 150
151 - Logger.info(TAG, "pageInfoBean dateTime = " + dateTime)  
152 - Logger.info(TAG, "pageInfoBean subTitle = " + this.subTitle) 151 + console.log(TAG, "pageInfoBean dateTime = " + dateTime)
  152 + console.log(TAG, "pageInfoBean subTitle = " + this.subTitle)
153 153
154 - Logger.info(TAG, "this.pageInfoBean = " + JSON.stringify(this.pageInfoBean)) 154 + console.log(TAG, "this.pageInfoBean = " + JSON.stringify(this.pageInfoBean))
155 155
156 this.isHasTopView = this.pageInfoBean?.topicInfo?.frontLinkObject?true:false 156 this.isHasTopView = this.pageInfoBean?.topicInfo?.frontLinkObject?true:false
157 let coverUrl = this.isHasTopView?this.pageInfoBean?.topicInfo?.frontLinkObject?.coverUrl as string :'' 157 let coverUrl = this.isHasTopView?this.pageInfoBean?.topicInfo?.frontLinkObject?.coverUrl as string :''
@@ -159,21 +159,22 @@ export struct MorningEveningPaperComponent { @@ -159,21 +159,22 @@ export struct MorningEveningPaperComponent {
159 159
160 let compInfoBean = await MorningEveningViewModel.getMorningEveningCompInfo(pageInfoBean?.id, pageInfoBean?.groups[0]?.id, currentTime + "", pageInfoBean?.topicInfo?.topicId) 160 let compInfoBean = await MorningEveningViewModel.getMorningEveningCompInfo(pageInfoBean?.id, pageInfoBean?.groups[0]?.id, currentTime + "", pageInfoBean?.topicInfo?.topicId)
161 // this.compInfoBean = compInfoBean 161 // this.compInfoBean = compInfoBean
162 - Logger.info(TAG, "compInfoBean = " + JSON.stringify(compInfoBean)) 162 + console.log(TAG, "compInfoBean = " + JSON.stringify(compInfoBean))
163 if (compInfoBean?.compList[0]) { 163 if (compInfoBean?.compList[0]) {
164 this.compListItem = compInfoBean?.compList[0] 164 this.compListItem = compInfoBean?.compList[0]
165 - Logger.debug(TAG, '获取评论数据' + `${this.compListItem.operDataList.length}`) 165 + console.log(TAG, '获取评论数据' + `${this.compListItem.operDataList.length}`)
166 if (this.compListItem.operDataList && this.compListItem.operDataList.length > 0) { 166 if (this.compListItem.operDataList && this.compListItem.operDataList.length > 0) {
167 this.getAllContentInteractData(this.compListItem.operDataList) 167 this.getAllContentInteractData(this.compListItem.operDataList)
168 } 168 }
169 - Logger.debug(TAG, 'compInfoBean?.compList[0].audioDataList', JSON.stringify(compInfoBean?.compList[0].audioDataList)) 169 + console.log(TAG, 'compInfoBean?.compList[0].audioDataList', JSON.stringify(compInfoBean?.compList[0].audioDataList))
170 if (compInfoBean?.compList[0].audioDataList) { 170 if (compInfoBean?.compList[0].audioDataList) {
171 this.audioPlayUrl = compInfoBean?.compList[0].audioDataList[0].audioUrl 171 this.audioPlayUrl = compInfoBean?.compList[0].audioDataList[0].audioUrl
172 this.audioTitle = compInfoBean?.compList[0].audioDataList[0].title 172 this.audioTitle = compInfoBean?.compList[0].audioDataList[0].title
  173 + console.log(TAG, 'this.audioPlayUrl', this.audioPlayUrl)
173 } 174 }
174 } 175 }
175 176
176 - Logger.info(TAG, "compInfoBean compStyle = " + compInfoBean.compList[0].compStyle) 177 + console.log(TAG, "compInfoBean compStyle = " + compInfoBean.compList[0].compStyle)
177 this.playerController.onTimeUpdate = (position, duration) => { 178 this.playerController.onTimeUpdate = (position, duration) => {
178 this.currentTime = DateFormatUtil.secondToTime(position); 179 this.currentTime = DateFormatUtil.secondToTime(position);
179 this.totalTime = DateFormatUtil.secondToTime(duration); 180 this.totalTime = DateFormatUtil.secondToTime(duration);
@@ -203,10 +204,10 @@ export struct MorningEveningPaperComponent { @@ -203,10 +204,10 @@ export struct MorningEveningPaperComponent {
203 contentType: Number(item.objectType ?? '1') 204 contentType: Number(item.objectType ?? '1')
204 }) 205 })
205 }) 206 })
206 - Logger.debug(TAG, '获取评论数据' + `${JSON.stringify(params)}`) 207 + console.log(TAG, '获取评论数据' + `${JSON.stringify(params)}`)
207 208
208 this.commentList = await PeopleShipMainViewModel.getContentInteractInfo(params) 209 this.commentList = await PeopleShipMainViewModel.getContentInteractInfo(params)
209 - Logger.debug(TAG, '获取评论数据' + `${JSON.stringify(this.commentList)}`) 210 + console.log(TAG, '获取评论数据' + `${JSON.stringify(this.commentList)}`)
210 211
211 } catch (exception) { 212 } catch (exception) {
212 213
@@ -216,7 +217,7 @@ export struct MorningEveningPaperComponent { @@ -216,7 +217,7 @@ export struct MorningEveningPaperComponent {
216 async setComponentBgColor(imageUrl: string) { 217 async setComponentBgColor(imageUrl: string) {
217 // 图片转换为PixelMap对象 218 // 图片转换为PixelMap对象
218 // const pixelMap: image.PixelMap = await image2PixelMap(item.icon); 219 // const pixelMap: image.PixelMap = await image2PixelMap(item.icon);
219 - Logger.debug(TAG, "compInfoBean compStyle = " + imageUrl) 220 + console.log(TAG, "compInfoBean compStyle = " + imageUrl)
220 221
221 if (imageUrl.length > 0 && this.pageInfoBean.topicInfo.frontFlag === 1) { 222 if (imageUrl.length > 0 && this.pageInfoBean.topicInfo.frontFlag === 1) {
222 const imageSource: image.ImageSource | undefined = await getPicture(imageUrl) 223 const imageSource: image.ImageSource | undefined = await getPicture(imageUrl)
@@ -237,11 +238,11 @@ export struct MorningEveningPaperComponent { @@ -237,11 +238,11 @@ export struct MorningEveningPaperComponent {
237 const pixelMap: image.PixelMap = await imageNet2PixelMap(imageSource); 238 const pixelMap: image.PixelMap = await imageNet2PixelMap(imageSource);
238 effectKit.createColorPicker(pixelMap, (err, colorPicker) => { 239 effectKit.createColorPicker(pixelMap, (err, colorPicker) => {
239 let color = colorPicker.getLargestProportionColor(); 240 let color = colorPicker.getLargestProportionColor();
240 - Logger.debug(TAG, "compInfoBean compStyle = " + color) 241 + console.log(TAG, "compInfoBean compStyle = " + color)
241 // color = ColorUtils.getMorningEveningPaperRgb({red:color.red,green:color.green,blue:color.blue,alpha:color.alpha}) 242 // color = ColorUtils.getMorningEveningPaperRgb({red:color.red,green:color.green,blue:color.blue,alpha:color.alpha})
242 // 将取色器选取的color示例转换为十六进制颜色代码 243 // 将取色器选取的color示例转换为十六进制颜色代码
243 this.mixedBgColor = "#" + color.alpha.toString(16) + color.red.toString(16) + color.green.toString(16) + color.blue.toString(16); 244 this.mixedBgColor = "#" + color.alpha.toString(16) + color.red.toString(16) + color.green.toString(16) + color.blue.toString(16);
244 - Logger.debug(TAG, "compInfoBean compStyle = " + this.mixedBgColor) 245 + console.log(TAG, "compInfoBean compStyle = " + this.mixedBgColor)
245 }); 246 });
246 247
247 } 248 }
@@ -267,11 +268,15 @@ export struct MorningEveningPaperComponent { @@ -267,11 +268,15 @@ export struct MorningEveningPaperComponent {
267 topicInfoView({ frontLinkObject: this.pageInfoBean?.topicInfo?.frontLinkObject }) 268 topicInfoView({ frontLinkObject: this.pageInfoBean?.topicInfo?.frontLinkObject })
268 } 269 }
269 270
270 - if (this.audioPlayUrl !== ""){  
271 - ListItem() {  
272 - this.AudioBarView()  
273 - } 271 + }
  272 +
  273 + if (this.audioPlayUrl.length > 0){
  274 + ListItem() {
  275 + this.AudioBarView()
274 } 276 }
  277 + .margin({
  278 + top: this.isHasTopView ? 10 : 44+this.topSafeHeight
  279 + })
275 } 280 }
276 281
277 ListItem() { 282 ListItem() {
@@ -282,7 +287,7 @@ export struct MorningEveningPaperComponent { @@ -282,7 +287,7 @@ export struct MorningEveningPaperComponent {
282 compListItem: this.compListItem, 287 compListItem: this.compListItem,
283 }) 288 })
284 .margin({ 289 .margin({
285 - top: this.isHasTopView ? 10 : 44+this.topSafeHeight 290 + top: this.isHasTopView || this.audioPlayUrl.length > 0 ? 10 : 44+this.topSafeHeight
286 }) 291 })
287 } 292 }
288 } 293 }
@@ -310,8 +315,11 @@ export struct MorningEveningPaperComponent { @@ -310,8 +315,11 @@ export struct MorningEveningPaperComponent {
310 @Builder 315 @Builder
311 topPaperTitle(){ 316 topPaperTitle(){
312 Column(){ 317 Column(){
313 - PaperTitleComponent({topicInfo:this.pageInfoBean?.topicInfo}).margin({top:this.topSafeHeight})  
314 - }.height(44+this.topSafeHeight).backgroundColor(this.isHasTopView?(this.scrollOffset > 100?this.mixedBgColor:''):this.mixedBgColor) 318 + PaperTitleComponent({topicInfo:this.pageInfoBean?.topicInfo})
  319 + .margin({top:this.topSafeHeight})
  320 + }
  321 + .height(44+this.topSafeHeight)
  322 + .backgroundColor(this.isHasTopView?(this.scrollOffset > 100?this.mixedBgColor:''):this.mixedBgColor)
315 } 323 }
316 324
317 @Builder 325 @Builder
@@ -328,7 +336,7 @@ export struct MorningEveningPaperComponent { @@ -328,7 +336,7 @@ export struct MorningEveningPaperComponent {
328 .margin({ left: 10 }) 336 .margin({ left: 10 })
329 .alignSelf(ItemAlign.Start) 337 .alignSelf(ItemAlign.Start)
330 338
331 - Text(`${this.pageInfoBean.topicInfo.topicPattern === 1 ? '早上好' : this.pageInfoBean.topicInfo.topicPattern === 2 ? '中午好' : '晚上好'}， 请收听今日新闻播报`) 339 + Text(`${this.pageInfoBean.topicInfo?.topicPattern === 1 ? '早上好' : this.pageInfoBean.topicInfo?.topicPattern === 2 ? '中午好' : '晚上好'}， 请收听今日新闻播报`)
332 .fontSize(14) 340 .fontSize(14)
333 .margin({ left: 50 }) 341 .margin({ left: 50 })
334 .fontColor(Color.Black) 342 .fontColor(Color.Black)
@@ -350,27 +358,20 @@ export struct MorningEveningPaperComponent { @@ -350,27 +358,20 @@ export struct MorningEveningPaperComponent {
350 .margin({ left: 10 })// .alignSelf(ItemAlign.Center) 358 .margin({ left: 10 })// .alignSelf(ItemAlign.Center)
351 .objectFit(ImageFit.Contain) 359 .objectFit(ImageFit.Contain)
352 .onClick(() => { 360 .onClick(() => {
353 - Logger.info("TAG", "cj compInfoBean onClick1 = " + this.isAudioPlaying) 361 + console.log("TAG", "cj compInfoBean onClick1 = " + this.isAudioPlaying)
354 // dialog.open() 362 // dialog.open()
355 // this.playerController.firstPlay(this.audioPlayUrl, this.audioTitle) 363 // this.playerController.firstPlay(this.audioPlayUrl, this.audioTitle)
356 this.AudioSuspension.setPlayerUrl(this.audioPlayUrl, this.audioTitle) 364 this.AudioSuspension.setPlayerUrl(this.audioPlayUrl, this.audioTitle)
357 - Logger.info(TAG, "this.audioPlayUrl = " + this.audioPlayUrl)  
358 - Logger.info("TAG", "cj compInfoBean onClick2 = " + this.isAudioPlaying) 365 + console.log(TAG, "this.audioPlayUrl = " + this.audioPlayUrl)
  366 + console.log("TAG", "cj compInfoBean onClick2 = " + this.isAudioPlaying)
359 }) 367 })
360 } 368 }
361 - // .aspectRatio(7 / 4)  
362 .height('100%') 369 .height('100%')
363 - // .justifyContent(FlexAlign.Center)  
364 - // .width(94)  
365 - // .width(140)  
366 .width('20%') 370 .width('20%')
367 - // .height(56)  
368 .onClick(() => { 371 .onClick(() => {
369 - // console.info(TAG, `onClick listen_right_bg`);  
370 }) 372 })
371 } 373 }
372 .margin({ left: 12, right: 12 }) 374 .margin({ left: 12, right: 12 })
373 - // .width('100%')  
374 .height(56) 375 .height(56)
375 .alignItems(VerticalAlign.Center) 376 .alignItems(VerticalAlign.Center)
376 .justifyContent(FlexAlign.SpaceBetween) 377 .justifyContent(FlexAlign.SpaceBetween)
@@ -66,7 +66,7 @@ export struct Card10Component { @@ -66,7 +66,7 @@ export struct Card10Component {
66 .width(CommonConstants.FULL_WIDTH) 66 .width(CommonConstants.FULL_WIDTH)
67 .fontSize($r('app.float.font_size_18')) 67 .fontSize($r('app.float.font_size_18'))
68 .fontWeight(600) 68 .fontWeight(600)
69 - .maxLines(2) 69 + .maxLines(1)
70 .textOverflow({ overflow: TextOverflow.Ellipsis }) 70 .textOverflow({ overflow: TextOverflow.Ellipsis })
71 .margin({ bottom: 19 }) 71 .margin({ bottom: 19 })
72 .onClick((event: ClickEvent) => { 72 .onClick((event: ClickEvent) => {
@@ -75,7 +75,8 @@ export struct Card4Component { @@ -75,7 +75,8 @@ export struct Card4Component {
75 Span(this.contentDTO.newsTitle) 75 Span(this.contentDTO.newsTitle)
76 } 76 }
77 } 77 }
78 - .fontSize($r('app.float.font_size_18')) 78 + .fontSize(17.5)
  79 + .lineHeight(27)
79 .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222')) 80 .fontColor(this.clicked ? 0x848484 : $r('app.color.color_222222'))
80 .maxLines(3) 81 .maxLines(3)
81 .textOverflow({ overflow: TextOverflow.Ellipsis }) 82 .textOverflow({ overflow: TextOverflow.Ellipsis })
@@ -117,7 +117,7 @@ struct localCard { @@ -117,7 +117,7 @@ struct localCard {
117 .fontSize($r('app.float.font_size_18')) 117 .fontSize($r('app.float.font_size_18'))
118 .fontColor('#000000') 118 .fontColor('#000000')
119 .align(Alignment.TopStart) 119 .align(Alignment.TopStart)
120 - .maxLines(1) 120 + .maxLines(3)
121 .textOverflow({ overflow: TextOverflow.Ellipsis }) 121 .textOverflow({ overflow: TextOverflow.Ellipsis })
122 .lineHeight(25) 122 .lineHeight(25)
123 .fontWeight(500) 123 .fontWeight(500)
@@ -116,7 +116,6 @@ export struct HomePageBottomFollowComponent { @@ -116,7 +116,6 @@ export struct HomePageBottomFollowComponent {
116 this.curPageNum = 1; 116 this.curPageNum = 1;
117 this.hasMore = true 117 this.hasMore = true
118 this.isGetRequest = false 118 this.isGetRequest = false
119 - this.data_follow.clear()  
120 119
121 if (!this.isLoading){ 120 if (!this.isLoading){
122 this.getNewPageData() 121 this.getNewPageData()
@@ -201,6 +200,7 @@ export struct HomePageBottomFollowComponent { @@ -201,6 +200,7 @@ export struct HomePageBottomFollowComponent {
201 let object = new FollowListDetailRequestItem(-1, 20, this.curPageNum) 200 let object = new FollowListDetailRequestItem(-1, 20, this.curPageNum)
202 201
203 MinePageDatasModel.getMineFollowListData(object, getContext(this)).then((value) => { 202 MinePageDatasModel.getMineFollowListData(object, getContext(this)).then((value) => {
  203 + if (this.curPageNum === 1) this.data_follow.clear()
204 if (!this.data_follow || value.list.length == 0) { 204 if (!this.data_follow || value.list.length == 0) {
205 this.hasMore = false 205 this.hasMore = false
206 } else { 206 } else {
@@ -77,7 +77,6 @@ export struct OtherHomePageBottomFollowComponent{ @@ -77,7 +77,6 @@ export struct OtherHomePageBottomFollowComponent{
77 this.curPageNum = 1; 77 this.curPageNum = 1;
78 this.hasMore = true 78 this.hasMore = true
79 this.isGetRequest = false 79 this.isGetRequest = false
80 - this.data_follow.clear()  
81 80
82 if (!this.isLoading){ 81 if (!this.isLoading){
83 this.getNewPageData() 82 this.getNewPageData()
@@ -164,6 +163,9 @@ export struct OtherHomePageBottomFollowComponent{ @@ -164,6 +163,9 @@ export struct OtherHomePageBottomFollowComponent{
164 let object = new UserFollowListRequestItem(Number(this.curUserId),20,this.curPageNum,"1") 163 let object = new UserFollowListRequestItem(Number(this.curUserId),20,this.curPageNum,"1")
165 164
166 MinePageDatasModel.getOtherUserFollowListData(object,getContext(this)).then((value)=>{ 165 MinePageDatasModel.getOtherUserFollowListData(object,getContext(this)).then((value)=>{
  166 +
  167 + if (this.curPageNum === 1) this.data_follow.clear()
  168 +
167 if (!this.data_follow || value.list.length == 0){ 169 if (!this.data_follow || value.list.length == 0){
168 this.hasMore = false 170 this.hasMore = false
169 }else{ 171 }else{
@@ -430,7 +430,7 @@ export struct PaperSingleColumn999CardView { @@ -430,7 +430,7 @@ export struct PaperSingleColumn999CardView {
430 build() { 430 build() {
431 Column() { 431 Column() {
432 Text(this.item?.newsTitle) 432 Text(this.item?.newsTitle)
433 - .fontColor('#222222') 433 + .fontColor(this.isRead ? 0x848484 : '#222222')
434 .fontSize(16) 434 .fontSize(16)
435 .fontWeight(FontWeight.Medium) 435 .fontWeight(FontWeight.Medium)
436 .alignSelf(ItemAlign.Start) 436 .alignSelf(ItemAlign.Start)
@@ -57,7 +57,8 @@ struct EditUserInfoPage { @@ -57,7 +57,8 @@ struct EditUserInfoPage {
57 sexDialogController: CustomDialogController = new CustomDialogController({ 57 sexDialogController: CustomDialogController = new CustomDialogController({
58 builder: EditUserSexCustomDialog({ 58 builder: EditUserSexCustomDialog({
59 confirmCallback:(index)=>{ 59 confirmCallback:(index)=>{
60 - this.currentUserInfo.userExtend.sex = index; 60 + ///1男 2女
  61 + this.currentUserInfo.userExtend.sex = index == 0?2:1;
61 this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_sex 62 this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_sex
62 this.updateEditModel() 63 this.updateEditModel()
63 } 64 }
@@ -40,7 +40,7 @@ export class EditInfoModel{ @@ -40,7 +40,7 @@ export class EditInfoModel{
40 //生日 40 //生日
41 birthday:string = '' 41 birthday:string = ''
42 //性别 42 //性别
43 - sex:number = 10 43 + sex:number = 0
44 44
45 airec:number = 0 45 airec:number = 0
46 46
@@ -41,7 +41,7 @@ class EditInfoViewModel { @@ -41,7 +41,7 @@ class EditInfoViewModel {
41 new EditListInfo('简介',item&&item.userExtend.introduction?item.userExtend.introduction:'待完善'), 41 new EditListInfo('简介',item&&item.userExtend.introduction?item.userExtend.introduction:'待完善'),
42 new EditListInfo('地区',item&&item.userExtend.address?item.userExtend.address:'待完善'), 42 new EditListInfo('地区',item&&item.userExtend.address?item.userExtend.address:'待完善'),
43 new EditListInfo('生日',item&&item.userExtend.birthday?item.userExtend.birthday:'待完善'), 43 new EditListInfo('生日',item&&item.userExtend.birthday?item.userExtend.birthday:'待完善'),
44 - new EditListInfo('性别',item?(item.userExtend.sex === 10?'待完善':(item.userExtend.sex === 1?'男':'女')):'待完善'),] 44 + new EditListInfo('性别',item?(item.userExtend.sex === 0?'待完善':(item.userExtend.sex === 1?'男':'女')):'待完善'),]
45 return this.editListData 45 return this.editListData
46 } 46 }
47 47
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",  
9 - "wdBean@../wdBean": "wdBean@../wdBean",  
10 - "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",  
11 - "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",  
12 - "wdNetwork@../../commons/wdNetwork": "wdNetwork@../../commons/wdNetwork",  
13 - "wdPlayer@../wdPlayer": "wdPlayer@../wdPlayer",  
14 - "wdRouter@../../commons/wdRouter": "wdRouter@../../commons/wdRouter"  
15 - },  
16 - "packages": {  
17 - "@ohos/axios@2.2.0": {  
18 - "name": "@ohos/axios",  
19 - "integrity": "sha512-v1QBWk6DfcN8wUW3D0ieFbHTR1taSI5cOgxp5l6B5cegXuNYhSc8ggKlAIXe6h/14LsfM+NW0ZGfSXcNEIM5yA==",  
20 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",  
21 - "registryType": "ohpm"  
22 - },  
23 - "wdBean@../wdBean": {  
24 - "name": "wdbean",  
25 - "resolved": "../wdBean",  
26 - "registryType": "local"  
27 - },  
28 - "wdConstant@../../commons/wdConstant": {  
29 - "name": "wdconstant",  
30 - "resolved": "../../commons/wdConstant",  
31 - "registryType": "local"  
32 - },  
33 - "wdKit@../../commons/wdKit": {  
34 - "name": "wdkit",  
35 - "resolved": "../../commons/wdKit",  
36 - "registryType": "local"  
37 - },  
38 - "wdNetwork@../../commons/wdNetwork": {  
39 - "name": "wdnetwork",  
40 - "resolved": "../../commons/wdNetwork",  
41 - "registryType": "local",  
42 - "dependencies": {  
43 - "wdConstant": "file:../wdConstant",  
44 - "wdKit": "file:../wdKit",  
45 - "@ohos/axios": "^2.1.1"  
46 - }  
47 - },  
48 - "wdPlayer@../wdPlayer": {  
49 - "name": "wdplayer",  
50 - "resolved": "../wdPlayer",  
51 - "registryType": "local",  
52 - "dependencies": {  
53 - "wdKit": "file:../../commons/wdKit"  
54 - }  
55 - },  
56 - "wdRouter@../../commons/wdRouter": {  
57 - "name": "wdrouter",  
58 - "resolved": "../../commons/wdRouter",  
59 - "registryType": "local",  
60 - "dependencies": {  
61 - "wdKit": "file:../wdKit",  
62 - "wdBean": "file:../../features/wdBean"  
63 - }  
64 - }  
65 - }  
66 -}  
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",  
9 - "@ohos/lottie@2.0.0": "@ohos/lottie@2.0.0",  
10 - "wdBean@../wdBean": "wdBean@../wdBean",  
11 - "wdComponent@../wdComponent": "wdComponent@../wdComponent",  
12 - "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",  
13 - "wdDetailPlayApi@../wdDetailPlayApi": "wdDetailPlayApi@../wdDetailPlayApi",  
14 - "wdDetailPlayShortVideo@../wdDetailPlayShortVideo": "wdDetailPlayShortVideo@../wdDetailPlayShortVideo",  
15 - "wdJsBridge@../../commons/wdJsBridge": "wdJsBridge@../../commons/wdJsBridge",  
16 - "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",  
17 - "wdLogin@../wdLogin": "wdLogin@../wdLogin",  
18 - "wdNetwork@../../commons/wdNetwork": "wdNetwork@../../commons/wdNetwork",  
19 - "wdPlayer@../wdPlayer": "wdPlayer@../wdPlayer",  
20 - "wdRouter@../../commons/wdRouter": "wdRouter@../../commons/wdRouter",  
21 - "wdWebComponent@../../commons/wdWebComponent": "wdWebComponent@../../commons/wdWebComponent"  
22 - },  
23 - "packages": {  
24 - "@ohos/axios@2.2.0": {  
25 - "name": "@ohos/axios",  
26 - "integrity": "sha512-v1QBWk6DfcN8wUW3D0ieFbHTR1taSI5cOgxp5l6B5cegXuNYhSc8ggKlAIXe6h/14LsfM+NW0ZGfSXcNEIM5yA==",  
27 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",  
28 - "registryType": "ohpm"  
29 - },  
30 - "@ohos/lottie@2.0.0": {  
31 - "name": "@ohos/lottie",  
32 - "integrity": "sha512-jFEFYfuqGO323aMiwtzHmDGRJI0qTxjZD2Lzbn+LxRdoHSfu5OVu22I8gVm5ej019tCw3WOk547NHZ2GuWiNSg==",  
33 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/lottie/-/lottie-2.0.0.har",  
34 - "registryType": "ohpm"  
35 - },  
36 - "wdBean@../wdBean": {  
37 - "name": "wdbean",  
38 - "resolved": "../wdBean",  
39 - "registryType": "local"  
40 - },  
41 - "wdComponent@../wdComponent": {  
42 - "name": "wdcomponent",  
43 - "resolved": "../wdComponent",  
44 - "registryType": "local",  
45 - "dependencies": {  
46 - "@ohos/lottie": "2.0.0",  
47 - "wdConstant": "file:../../commons/wdConstant",  
48 - "wdPlayer": "file:../../features/wdPlayer",  
49 - "wdLogin": "file:../../features/wdLogin",  
50 - "wdKit": "file:../../commons/wdKit",  
51 - "wdWebComponent": "file:../../commons/wdWebComponent",  
52 - "wdBean": "file:../../features/wdBean",  
53 - "wdDetailPlayShortVideo": "file:../../features/wdDetailPlayShortVideo",  
54 - "wdRouter": "file:../../commons/wdRouter",  
55 - "wdNetwork": "file:../../commons/wdNetwork",  
56 - "wdJsBridge": "file:../../commons/wdJsBridge"  
57 - }  
58 - },  
59 - "wdConstant@../../commons/wdConstant": {  
60 - "name": "wdconstant",  
61 - "resolved": "../../commons/wdConstant",  
62 - "registryType": "local"  
63 - },  
64 - "wdDetailPlayApi@../wdDetailPlayApi": {  
65 - "name": "wddetailplayapi",  
66 - "resolved": "../wdDetailPlayApi",  
67 - "registryType": "local",  
68 - "dependencies": {  
69 - "wdPlayer": "file:../../features/wdPlayer",  
70 - "wdKit": "file:../../commons/wdKit",  
71 - "wdBean": "file:../../features/wdBean",  
72 - "wdRouter": "file:../../commons/wdRouter",  
73 - "wdNetwork": "file:../../commons/wdNetwork"  
74 - }  
75 - },  
76 - "wdDetailPlayShortVideo@../wdDetailPlayShortVideo": {  
77 - "name": "wddetailplayshortvideo",  
78 - "resolved": "../wdDetailPlayShortVideo",  
79 - "registryType": "local",  
80 - "dependencies": {  
81 - "@ohos/lottie": "2.0.0",  
82 - "wdPlayer": "file:../../features/wdPlayer",  
83 - "wdKit": "file:../../commons/wdKit",  
84 - "wdBean": "file:../../features/wdBean",  
85 - "wdRouter": "file:../../commons/wdRouter",  
86 - "wdNetwork": "file:../../commons/wdNetwork",  
87 - "wdDetailPlayApi": "file:../../features/wdDetailPlayApi"  
88 - }  
89 - },  
90 - "wdJsBridge@../../commons/wdJsBridge": {  
91 - "name": "wdjsbridge",  
92 - "resolved": "../../commons/wdJsBridge",  
93 - "registryType": "local"  
94 - },  
95 - "wdKit@../../commons/wdKit": {  
96 - "name": "wdkit",  
97 - "resolved": "../../commons/wdKit",  
98 - "registryType": "local"  
99 - },  
100 - "wdLogin@../wdLogin": {  
101 - "name": "wdlogin",  
102 - "resolved": "../wdLogin",  
103 - "registryType": "local",  
104 - "dependencies": {  
105 - "wdConstant": "file:../../commons/wdConstant",  
106 - "wdKit": "file:../../commons/wdKit",  
107 - "wdWebComponent": "file:../../commons/wdWebComponent",  
108 - "wdBean": "file:../../features/wdBean",  
109 - "wdRouter": "file:../../commons/wdRouter",  
110 - "wdNetwork": "file:../../commons/wdNetwork"  
111 - }  
112 - },  
113 - "wdNetwork@../../commons/wdNetwork": {  
114 - "name": "wdnetwork",  
115 - "resolved": "../../commons/wdNetwork",  
116 - "registryType": "local",  
117 - "dependencies": {  
118 - "wdConstant": "file:../wdConstant",  
119 - "wdKit": "file:../wdKit",  
120 - "@ohos/axios": "^2.1.1"  
121 - }  
122 - },  
123 - "wdPlayer@../wdPlayer": {  
124 - "name": "wdplayer",  
125 - "resolved": "../wdPlayer",  
126 - "registryType": "local",  
127 - "dependencies": {  
128 - "wdKit": "file:../../commons/wdKit"  
129 - }  
130 - },  
131 - "wdRouter@../../commons/wdRouter": {  
132 - "name": "wdrouter",  
133 - "resolved": "../../commons/wdRouter",  
134 - "registryType": "local",  
135 - "dependencies": {  
136 - "wdKit": "file:../wdKit",  
137 - "wdBean": "file:../../features/wdBean"  
138 - }  
139 - },  
140 - "wdWebComponent@../../commons/wdWebComponent": {  
141 - "name": "wdwebcomponent",  
142 - "resolved": "../../commons/wdWebComponent",  
143 - "registryType": "local",  
144 - "dependencies": {  
145 - "wdConstant": "file:../wdConstant",  
146 - "wdKit": "file:../wdKit",  
147 - "wdJsBridge": "file:../wdJsBridge",  
148 - "wdBean": "file:../../features/wdBean",  
149 - "wdRouter": "file:../wdRouter"  
150 - }  
151 - }  
152 - }  
153 -}  
@@ -54,6 +54,9 @@ export struct PlayerComponent { @@ -54,6 +54,9 @@ export struct PlayerComponent {
54 this.playerController.onVideoSizePlayerComponentBack = (width: number, height: number) => { 54 this.playerController.onVideoSizePlayerComponentBack = (width: number, height: number) => {
55 if(width>height){ 55 if(width>height){
56 this.isLarge = false 56 this.isLarge = false
  57 + if(width > 2){
  58 + this.liveStreamType = 0
  59 + }
57 }else{ 60 }else{
58 this.isLarge = true 61 this.isLarge = true
59 } 62 }
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",  
9 - "@ohos/lottie@2.0.0": "@ohos/lottie@2.0.0",  
10 - "wdBean@../wdBean": "wdBean@../wdBean",  
11 - "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",  
12 - "wdDetailPlayApi@../wdDetailPlayApi": "wdDetailPlayApi@../wdDetailPlayApi",  
13 - "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",  
14 - "wdNetwork@../../commons/wdNetwork": "wdNetwork@../../commons/wdNetwork",  
15 - "wdPlayer@../wdPlayer": "wdPlayer@../wdPlayer",  
16 - "wdRouter@../../commons/wdRouter": "wdRouter@../../commons/wdRouter"  
17 - },  
18 - "packages": {  
19 - "@ohos/axios@2.2.0": {  
20 - "name": "@ohos/axios",  
21 - "integrity": "sha512-v1QBWk6DfcN8wUW3D0ieFbHTR1taSI5cOgxp5l6B5cegXuNYhSc8ggKlAIXe6h/14LsfM+NW0ZGfSXcNEIM5yA==",  
22 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",  
23 - "registryType": "ohpm"  
24 - },  
25 - "@ohos/lottie@2.0.0": {  
26 - "name": "@ohos/lottie",  
27 - "integrity": "sha512-jFEFYfuqGO323aMiwtzHmDGRJI0qTxjZD2Lzbn+LxRdoHSfu5OVu22I8gVm5ej019tCw3WOk547NHZ2GuWiNSg==",  
28 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/lottie/-/lottie-2.0.0.har",  
29 - "registryType": "ohpm"  
30 - },  
31 - "wdBean@../wdBean": {  
32 - "name": "wdbean",  
33 - "resolved": "../wdBean",  
34 - "registryType": "local"  
35 - },  
36 - "wdConstant@../../commons/wdConstant": {  
37 - "name": "wdconstant",  
38 - "resolved": "../../commons/wdConstant",  
39 - "registryType": "local"  
40 - },  
41 - "wdDetailPlayApi@../wdDetailPlayApi": {  
42 - "name": "wddetailplayapi",  
43 - "resolved": "../wdDetailPlayApi",  
44 - "registryType": "local",  
45 - "dependencies": {  
46 - "wdPlayer": "file:../../features/wdPlayer",  
47 - "wdKit": "file:../../commons/wdKit",  
48 - "wdBean": "file:../../features/wdBean",  
49 - "wdRouter": "file:../../commons/wdRouter",  
50 - "wdNetwork": "file:../../commons/wdNetwork"  
51 - }  
52 - },  
53 - "wdKit@../../commons/wdKit": {  
54 - "name": "wdkit",  
55 - "resolved": "../../commons/wdKit",  
56 - "registryType": "local"  
57 - },  
58 - "wdNetwork@../../commons/wdNetwork": {  
59 - "name": "wdnetwork",  
60 - "resolved": "../../commons/wdNetwork",  
61 - "registryType": "local",  
62 - "dependencies": {  
63 - "wdConstant": "file:../wdConstant",  
64 - "wdKit": "file:../wdKit",  
65 - "@ohos/axios": "^2.1.1"  
66 - }  
67 - },  
68 - "wdPlayer@../wdPlayer": {  
69 - "name": "wdplayer",  
70 - "resolved": "../wdPlayer",  
71 - "registryType": "local",  
72 - "dependencies": {  
73 - "wdKit": "file:../../commons/wdKit"  
74 - }  
75 - },  
76 - "wdRouter@../../commons/wdRouter": {  
77 - "name": "wdrouter",  
78 - "resolved": "../../commons/wdRouter",  
79 - "registryType": "local",  
80 - "dependencies": {  
81 - "wdKit": "file:../wdKit",  
82 - "wdBean": "file:../../features/wdBean"  
83 - }  
84 - }  
85 - }  
86 -}  
@@ -58,6 +58,7 @@ export struct DetailPlayShortVideoPage { @@ -58,6 +58,7 @@ export struct DetailPlayShortVideoPage {
58 PageName: string = '' 58 PageName: string = ''
59 @State toastText: ResourceStr = "正在使用非WI-FI网络，播放将产生流量费用" 59 @State toastText: ResourceStr = "正在使用非WI-FI网络，播放将产生流量费用"
60 @Consume onlyWifiLoadVideo: boolean 60 @Consume onlyWifiLoadVideo: boolean
  61 + @Consume toastTextVisible: boolean
61 62
62 /** 63 /**
63 * 页面显示重查用户关注、点赞等信息 64 * 页面显示重查用户关注、点赞等信息
@@ -169,9 +170,12 @@ export struct DetailPlayShortVideoPage { @@ -169,9 +170,12 @@ export struct DetailPlayShortVideoPage {
169 } 170 }
170 171
171 async aboutToAppear() { 172 async aboutToAppear() {
172 - if(await onlyWifiLoadVideo()){  
173 - this.onlyWifiLoadVideo = true 173 + if (!this.onlyWifiLoadVideo) {
  174 + this.onlyWifiLoadVideo = await onlyWifiLoadVideo()
  175 + this.toastTextVisible = this.onlyWifiLoadVideo ? false : true
  176 + console.log(TAG, 'this.onlyWifiLoadVideo', this.onlyWifiLoadVideo)
174 } 177 }
  178 +
175 this.videoLandScape = this.contentDetailData.videoInfo[0]?.videoLandScape 179 this.videoLandScape = this.contentDetailData.videoInfo[0]?.videoLandScape
176 this.ratio = (this.contentDetailData.videoInfo[0]?.resolutionWidth || 16) / 180 this.ratio = (this.contentDetailData.videoInfo[0]?.resolutionWidth || 16) /
177 (this.contentDetailData.videoInfo[0]?.resolutionHeight || 9) 181 (this.contentDetailData.videoInfo[0]?.resolutionHeight || 9)
@@ -280,7 +284,7 @@ export struct DetailPlayShortVideoPage { @@ -280,7 +284,7 @@ export struct DetailPlayShortVideoPage {
280 playerController: this.playerController 284 playerController: this.playerController
281 }) 285 })
282 286
283 - if (!this.onlyWifiLoadVideo) { 287 + if (this.toastTextVisible) {
284 this.buildContent() 288 this.buildContent()
285 } 289 }
286 290
@@ -357,6 +361,7 @@ export struct DetailPlayShortVideoPage { @@ -357,6 +361,7 @@ export struct DetailPlayShortVideoPage {
357 }) 361 })
358 .onClick(() => { 362 .onClick(() => {
359 this.onlyWifiLoadVideo = true 363 this.onlyWifiLoadVideo = true
  364 + this.toastTextVisible = false
360 this.playerController?.play() 365 this.playerController?.play()
361 this.imageVisible = false 366 this.imageVisible = false
362 }) 367 })
@@ -40,6 +40,7 @@ export struct DetailVideoListPage { @@ -40,6 +40,7 @@ export struct DetailVideoListPage {
40 pageShowTime:number = 0; 40 pageShowTime:number = 0;
41 pageHideTime:number = 0; 41 pageHideTime:number = 0;
42 @Provide onlyWifiLoadVideo: boolean = false 42 @Provide onlyWifiLoadVideo: boolean = false
  43 + @Provide toastTextVisible: boolean = false
43 44
44 async aboutToAppear(): Promise<void> { 45 async aboutToAppear(): Promise<void> {
45 // 注册监听网络连接 46 // 注册监听网络连接
@@ -65,6 +65,7 @@ export struct VideoChannelDetail { @@ -65,6 +65,7 @@ export struct VideoChannelDetail {
65 pageShowTime: number = 0; 65 pageShowTime: number = 0;
66 pageHideTime: number = 0; 66 pageHideTime: number = 0;
67 @Provide onlyWifiLoadVideo: boolean = false 67 @Provide onlyWifiLoadVideo: boolean = false
  68 + @Provide toastTextVisible: boolean = false
68 69
69 autoRefreshChange() { 70 autoRefreshChange() {
70 if (this.topNavIndex === 0 && !this.isRequesting) { 71 if (this.topNavIndex === 0 && !this.isRequesting) {
@@ -13,7 +13,6 @@ export struct PlayerBottomView { @@ -13,7 +13,6 @@ export struct PlayerBottomView {
13 @Consume isDragging?: boolean 13 @Consume isDragging?: boolean
14 @Consume contentDetailData: ContentDetailDTO 14 @Consume contentDetailData: ContentDetailDTO
15 @Consume displayDirection: DisplayDirection 15 @Consume displayDirection: DisplayDirection
16 - @Consume onlyWifiLoadVideo: boolean  
17 16
18 aboutToAppear(): void { 17 aboutToAppear(): void {
19 18
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",  
9 - "wdBean@../wdBean": "wdBean@../wdBean",  
10 - "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",  
11 - "wdDetailPlayApi@../wdDetailPlayApi": "wdDetailPlayApi@../wdDetailPlayApi",  
12 - "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",  
13 - "wdNetwork@../../commons/wdNetwork": "wdNetwork@../../commons/wdNetwork",  
14 - "wdPlayer@../wdPlayer": "wdPlayer@../wdPlayer",  
15 - "wdRouter@../../commons/wdRouter": "wdRouter@../../commons/wdRouter"  
16 - },  
17 - "packages": {  
18 - "@ohos/axios@2.2.0": {  
19 - "name": "@ohos/axios",  
20 - "integrity": "sha512-v1QBWk6DfcN8wUW3D0ieFbHTR1taSI5cOgxp5l6B5cegXuNYhSc8ggKlAIXe6h/14LsfM+NW0ZGfSXcNEIM5yA==",  
21 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",  
22 - "registryType": "ohpm"  
23 - },  
24 - "wdBean@../wdBean": {  
25 - "name": "wdbean",  
26 - "resolved": "../wdBean",  
27 - "registryType": "local"  
28 - },  
29 - "wdConstant@../../commons/wdConstant": {  
30 - "name": "wdconstant",  
31 - "resolved": "../../commons/wdConstant",  
32 - "registryType": "local"  
33 - },  
34 - "wdDetailPlayApi@../wdDetailPlayApi": {  
35 - "name": "wddetailplayapi",  
36 - "resolved": "../wdDetailPlayApi",  
37 - "registryType": "local",  
38 - "dependencies": {  
39 - "wdPlayer": "file:../../features/wdPlayer",  
40 - "wdKit": "file:../../commons/wdKit",  
41 - "wdBean": "file:../../features/wdBean",  
42 - "wdRouter": "file:../../commons/wdRouter",  
43 - "wdNetwork": "file:../../commons/wdNetwork"  
44 - }  
45 - },  
46 - "wdKit@../../commons/wdKit": {  
47 - "name": "wdkit",  
48 - "resolved": "../../commons/wdKit",  
49 - "registryType": "local"  
50 - },  
51 - "wdNetwork@../../commons/wdNetwork": {  
52 - "name": "wdnetwork",  
53 - "resolved": "../../commons/wdNetwork",  
54 - "registryType": "local",  
55 - "dependencies": {  
56 - "wdConstant": "file:../wdConstant",  
57 - "wdKit": "file:../wdKit",  
58 - "@ohos/axios": "^2.1.1"  
59 - }  
60 - },  
61 - "wdPlayer@../wdPlayer": {  
62 - "name": "wdplayer",  
63 - "resolved": "../wdPlayer",  
64 - "registryType": "local",  
65 - "dependencies": {  
66 - "wdKit": "file:../../commons/wdKit"  
67 - }  
68 - },  
69 - "wdRouter@../../commons/wdRouter": {  
70 - "name": "wdrouter",  
71 - "resolved": "../../commons/wdRouter",  
72 - "registryType": "local",  
73 - "dependencies": {  
74 - "wdKit": "file:../wdKit",  
75 - "wdBean": "file:../../features/wdBean"  
76 - }  
77 - }  
78 - }  
79 -}  
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",  
9 - "wdBean@../wdBean": "wdBean@../wdBean",  
10 - "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",  
11 - "wdJsBridge@../../commons/wdJsBridge": "wdJsBridge@../../commons/wdJsBridge",  
12 - "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",  
13 - "wdLogin@../wdLogin": "wdLogin@../wdLogin",  
14 - "wdNetwork@../../commons/wdNetwork": "wdNetwork@../../commons/wdNetwork",  
15 - "wdRouter@../../commons/wdRouter": "wdRouter@../../commons/wdRouter",  
16 - "wdWebComponent@../../commons/wdWebComponent": "wdWebComponent@../../commons/wdWebComponent"  
17 - },  
18 - "packages": {  
19 - "@ohos/axios@2.2.0": {  
20 - "name": "@ohos/axios",  
21 - "integrity": "sha512-v1QBWk6DfcN8wUW3D0ieFbHTR1taSI5cOgxp5l6B5cegXuNYhSc8ggKlAIXe6h/14LsfM+NW0ZGfSXcNEIM5yA==",  
22 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",  
23 - "registryType": "ohpm"  
24 - },  
25 - "wdBean@../wdBean": {  
26 - "name": "wdbean",  
27 - "resolved": "../wdBean",  
28 - "registryType": "local"  
29 - },  
30 - "wdConstant@../../commons/wdConstant": {  
31 - "name": "wdconstant",  
32 - "resolved": "../../commons/wdConstant",  
33 - "registryType": "local"  
34 - },  
35 - "wdJsBridge@../../commons/wdJsBridge": {  
36 - "name": "wdjsbridge",  
37 - "resolved": "../../commons/wdJsBridge",  
38 - "registryType": "local"  
39 - },  
40 - "wdKit@../../commons/wdKit": {  
41 - "name": "wdkit",  
42 - "resolved": "../../commons/wdKit",  
43 - "registryType": "local"  
44 - },  
45 - "wdLogin@../wdLogin": {  
46 - "name": "wdlogin",  
47 - "resolved": "../wdLogin",  
48 - "registryType": "local",  
49 - "dependencies": {  
50 - "wdConstant": "file:../../commons/wdConstant",  
51 - "wdKit": "file:../../commons/wdKit",  
52 - "wdWebComponent": "file:../../commons/wdWebComponent",  
53 - "wdBean": "file:../../features/wdBean",  
54 - "wdRouter": "file:../../commons/wdRouter",  
55 - "wdNetwork": "file:../../commons/wdNetwork"  
56 - }  
57 - },  
58 - "wdNetwork@../../commons/wdNetwork": {  
59 - "name": "wdnetwork",  
60 - "resolved": "../../commons/wdNetwork",  
61 - "registryType": "local",  
62 - "dependencies": {  
63 - "wdConstant": "file:../wdConstant",  
64 - "wdKit": "file:../wdKit",  
65 - "@ohos/axios": "^2.1.1"  
66 - }  
67 - },  
68 - "wdRouter@../../commons/wdRouter": {  
69 - "name": "wdrouter",  
70 - "resolved": "../../commons/wdRouter",  
71 - "registryType": "local",  
72 - "dependencies": {  
73 - "wdKit": "file:../wdKit",  
74 - "wdBean": "file:../../features/wdBean",  
75 - "wdNetwork": "file:../../commons/wdNetwork",  
76 - "wdConstant": "file:../../commons/wdConstant"  
77 - }  
78 - },  
79 - "wdWebComponent@../../commons/wdWebComponent": {  
80 - "name": "wdwebcomponent",  
81 - "resolved": "../../commons/wdWebComponent",  
82 - "registryType": "local",  
83 - "dependencies": {  
84 - "wdConstant": "file:../wdConstant",  
85 - "wdKit": "file:../wdKit",  
86 - "wdJsBridge": "file:../wdJsBridge",  
87 - "wdBean": "file:../../features/wdBean",  
88 - "wdRouter": "file:../wdRouter"  
89 - }  
90 - }  
91 - }  
92 -}  
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",  
9 - "wdBean@../wdBean": "wdBean@../wdBean",  
10 - "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",  
11 - "wdJsBridge@../../commons/wdJsBridge": "wdJsBridge@../../commons/wdJsBridge",  
12 - "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",  
13 - "wdNetwork@../../commons/wdNetwork": "wdNetwork@../../commons/wdNetwork",  
14 - "wdRouter@../../commons/wdRouter": "wdRouter@../../commons/wdRouter",  
15 - "wdWebComponent@../../commons/wdWebComponent": "wdWebComponent@../../commons/wdWebComponent"  
16 - },  
17 - "packages": {  
18 - "@ohos/axios@2.2.0": {  
19 - "name": "@ohos/axios",  
20 - "integrity": "sha512-v1QBWk6DfcN8wUW3D0ieFbHTR1taSI5cOgxp5l6B5cegXuNYhSc8ggKlAIXe6h/14LsfM+NW0ZGfSXcNEIM5yA==",  
21 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",  
22 - "registryType": "ohpm"  
23 - },  
24 - "wdBean@../wdBean": {  
25 - "name": "wdbean",  
26 - "resolved": "../wdBean",  
27 - "registryType": "local"  
28 - },  
29 - "wdConstant@../../commons/wdConstant": {  
30 - "name": "wdconstant",  
31 - "resolved": "../../commons/wdConstant",  
32 - "registryType": "local"  
33 - },  
34 - "wdJsBridge@../../commons/wdJsBridge": {  
35 - "name": "wdjsbridge",  
36 - "resolved": "../../commons/wdJsBridge",  
37 - "registryType": "local"  
38 - },  
39 - "wdKit@../../commons/wdKit": {  
40 - "name": "wdkit",  
41 - "resolved": "../../commons/wdKit",  
42 - "registryType": "local"  
43 - },  
44 - "wdNetwork@../../commons/wdNetwork": {  
45 - "name": "wdnetwork",  
46 - "resolved": "../../commons/wdNetwork",  
47 - "registryType": "local",  
48 - "dependencies": {  
49 - "wdConstant": "file:../wdConstant",  
50 - "wdKit": "file:../wdKit",  
51 - "@ohos/axios": "^2.1.1"  
52 - }  
53 - },  
54 - "wdRouter@../../commons/wdRouter": {  
55 - "name": "wdrouter",  
56 - "resolved": "../../commons/wdRouter",  
57 - "registryType": "local",  
58 - "dependencies": {  
59 - "wdKit": "file:../wdKit",  
60 - "wdBean": "file:../../features/wdBean"  
61 - }  
62 - },  
63 - "wdWebComponent@../../commons/wdWebComponent": {  
64 - "name": "wdwebcomponent",  
65 - "resolved": "../../commons/wdWebComponent",  
66 - "registryType": "local",  
67 - "dependencies": {  
68 - "wdConstant": "file:../wdConstant",  
69 - "wdKit": "file:../wdKit",  
70 - "wdJsBridge": "file:../wdJsBridge",  
71 - "wdBean": "file:../../features/wdBean",  
72 - "wdRouter": "file:../wdRouter"  
73 - }  
74 - }  
75 - }  
76 -}  
@@ -8,6 +8,9 @@ import { WDRouterRule } from 'wdRouter/src/main/ets/router/WDRouterRule'; @@ -8,6 +8,9 @@ import { WDRouterRule } from 'wdRouter/src/main/ets/router/WDRouterRule';
8 import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/src/main/ets/bean/content/Params' 8 import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/src/main/ets/bean/content/Params'
9 import {InterestsHobbiesModel} from '../../../../../../../products/phone/src/main/ets/pages/viewModel/InterestsHobbiesModel' 9 import {InterestsHobbiesModel} from '../../../../../../../products/phone/src/main/ets/pages/viewModel/InterestsHobbiesModel'
10 import { TrackingPageBrowse, TrackConstants, TrackingButton, ParamType, Tracking } from 'wdTracking/Index' 10 import { TrackingPageBrowse, TrackConstants, TrackingButton, ParamType, Tracking } from 'wdTracking/Index'
  11 +import { window } from '@kit.ArkUI';
  12 +import { BusinessError } from '@kit.BasicServicesKit';
  13 +import { common } from '@kit.AbilityKit'
11 14
12 @Extend(Row) 15 @Extend(Row)
13 function otherStyle() { 16 function otherStyle() {
@@ -45,6 +48,7 @@ struct LoginPage { @@ -45,6 +48,7 @@ struct LoginPage {
45 lastTime: number = 0 48 lastTime: number = 0
46 @State codeStateSuccess:boolean=false 49 @State codeStateSuccess:boolean=false
47 @State toastText:string = "" 50 @State toastText:string = ""
  51 + @State isPrivacyMode: boolean = true;
48 dialogToast: CustomDialogController = new CustomDialogController({ 52 dialogToast: CustomDialogController = new CustomDialogController({
49 builder: CustomToast({ 53 builder: CustomToast({
50 msg: this.toastText, 54 msg: this.toastText,
@@ -84,6 +88,29 @@ struct LoginPage { @@ -84,6 +88,29 @@ struct LoginPage {
84 this.currentChanged() 88 this.currentChanged()
85 } 89 }
86 90
  91 + disableScreenCapture(){
  92 + let windowClass: window.Window|undefined = undefined;
  93 + let context = getContext(this) as common.UIAbilityContext
  94 + try {
  95 + window.getLastWindow(context, (err, data) => {
  96 + if (err.code) {
  97 + return
  98 + }
  99 + windowClass = data
  100 + windowClass.setWindowPrivacyMode(this.isPrivacyMode, (err: BusinessError) => {
  101 + const errCode: number = err.code;
  102 + if (errCode) {
  103 + console.error('Failed to set the window to privacy mode. Cause:' + JSON.stringify(err));
  104 + return;
  105 + }
  106 + console.info('Succeeded in setting the window to privacy mode.');
  107 + });
  108 + })
  109 + } catch (exception) {
  110 + console.error('Failed to set the window to privacy mode. Cause:' + JSON.stringify(exception));
  111 + }
  112 + }
  113 +
87 aboutToDisappear(): void { 114 aboutToDisappear(): void {
88 this.breakpointSystem.unregister(); 115 this.breakpointSystem.unregister();
89 } 116 }
@@ -91,6 +118,8 @@ struct LoginPage { @@ -91,6 +118,8 @@ struct LoginPage {
91 onPageShow() { 118 onPageShow() {
92 Logger.debug(TAG, "onPageShow:" + this.isCodeSend + " ") 119 Logger.debug(TAG, "onPageShow:" + this.isCodeSend + " ")
93 this.pageShowTime = DateTimeUtils.getTimeStamp() 120 this.pageShowTime = DateTimeUtils.getTimeStamp()
  121 + this.isPrivacyMode = true
  122 + this.disableScreenCapture()
94 } 123 }
95 124
96 onPageHide(): void { 125 onPageHide(): void {
@@ -103,6 +132,8 @@ struct LoginPage { @@ -103,6 +132,8 @@ struct LoginPage {
103 }else{ 132 }else{
104 TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page,duration) 133 TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page,duration)
105 } 134 }
  135 + this.isPrivacyMode = false
  136 + this.disableScreenCapture()
106 } 137 }
107 138
108 build() { 139 build() {
@@ -637,3 +668,5 @@ function trackTypeClick(typeValue: number,pageId: string){ @@ -637,3 +668,5 @@ function trackTypeClick(typeValue: number,pageId: string){
637 668
638 Tracking.event("login_type_click", params) 669 Tracking.event("login_type_click", params)
639 } 670 }
  671 +
  672 +
@@ -8,6 +8,11 @@ @@ -8,6 +8,11 @@
8 // "tablet", 8 // "tablet",
9 // "2in1" 9 // "2in1"
10 ], 10 ],
  11 + "requestPermissions": [
  12 + {
  13 + "name": "ohos.permission.PRIVACY_WINDOW"
  14 + }
  15 + ],
11 "compressNativeLibs": true, 16 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 17 "deliveryWithInstall": true,
13 "pages": "$profile:main_pages" 18 "pages": "$profile:main_pages"
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "@umeng/analytics@^1.0.19": "@umeng/analytics@1.0.19",  
9 - "@umeng/common@^1.0.21": "@umeng/common@1.0.21",  
10 - "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",  
11 - "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit"  
12 - },  
13 - "packages": {  
14 - "@umeng/analytics@1.0.19": {  
15 - "name": "@umeng/analytics",  
16 - "integrity": "sha512-0m9z5l8to+POjDl9UkCQC8s4P+e2E1OILwUglC7ME4QwqfH44e59GLJtQdwF0h6kwpsy3YBft4SoWK8MYbuP7g==",  
17 - "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/analytics/-/analytics-1.0.19.har",  
18 - "registryType": "ohpm"  
19 - },  
20 - "@umeng/common@1.0.21": {  
21 - "name": "@umeng/common",  
22 - "integrity": "sha512-EbXsd4OoRisTQf5egNY/+z1D2bvrYw9VwC2xu3EJA9TiDPSbnaJZ5+yltA/Se6yZ4oCcFvq6e5/AAfPuumunbw==",  
23 - "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/common/-/common-1.0.21.har",  
24 - "registryType": "ohpm",  
25 - "dependencies": {  
26 - "libcommon.so": "./src/main/cpp/types/libcommon"  
27 - }  
28 - },  
29 - "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": {  
30 - "name": "libcommon.so",  
31 - "resolved": "../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",  
32 - "registryType": "local"  
33 - },  
34 - "wdKit@../../commons/wdKit": {  
35 - "name": "wdkit",  
36 - "resolved": "../../commons/wdKit",  
37 - "registryType": "local",  
38 - "dependencies": {  
39 - "@umeng/common": "^1.0.21",  
40 - "@umeng/analytics": "^1.0.19"  
41 - }  
42 - }  
43 - }  
44 -}  
@@ -187,6 +187,10 @@ export class WDAliPlayerController { @@ -187,6 +187,10 @@ export class WDAliPlayerController {
187 if(this.onVideoSizePlayerTitleComponentBack){ 187 if(this.onVideoSizePlayerTitleComponentBack){
188 this.onVideoSizePlayerTitleComponentBack(this.avPlayer?.getVideoWidth(), this.avPlayer?.getVideoHeight()); 188 this.onVideoSizePlayerTitleComponentBack(this.avPlayer?.getVideoWidth(), this.avPlayer?.getVideoHeight());
189 } 189 }
  190 +
  191 + if(this.onVideoSizePlayerComponentBack){
  192 + this.onVideoSizePlayerComponentBack(this.avPlayer?.getVideoWidth(), this.avPlayer?.getVideoHeight());
  193 + }
190 if (this.onCanplay) { 194 if (this.onCanplay) {
191 this.onCanplay() 195 this.onCanplay()
192 } else { 196 } else {
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",  
9 - "@umeng/analytics@^1.0.19": "@umeng/analytics@1.0.19",  
10 - "@umeng/common@^1.0.21": "@umeng/common@1.0.21",  
11 - "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",  
12 - "wdBean@../wdBean": "wdBean@../wdBean",  
13 - "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",  
14 - "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",  
15 - "wdNetwork@../../commons/wdNetwork": "wdNetwork@../../commons/wdNetwork",  
16 - "wdRouter@../../commons/wdRouter": "wdRouter@../../commons/wdRouter",  
17 - "wdShareBase@../../commons/wdShareBase": "wdShareBase@../../commons/wdShareBase"  
18 - },  
19 - "packages": {  
20 - "@ohos/axios@2.2.0": {  
21 - "name": "@ohos/axios",  
22 - "integrity": "sha512-v1QBWk6DfcN8wUW3D0ieFbHTR1taSI5cOgxp5l6B5cegXuNYhSc8ggKlAIXe6h/14LsfM+NW0ZGfSXcNEIM5yA==",  
23 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",  
24 - "registryType": "ohpm"  
25 - },  
26 - "@umeng/analytics@1.0.19": {  
27 - "name": "@umeng/analytics",  
28 - "integrity": "sha512-0m9z5l8to+POjDl9UkCQC8s4P+e2E1OILwUglC7ME4QwqfH44e59GLJtQdwF0h6kwpsy3YBft4SoWK8MYbuP7g==",  
29 - "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/analytics/-/analytics-1.0.19.har",  
30 - "registryType": "ohpm"  
31 - },  
32 - "@umeng/common@1.0.21": {  
33 - "name": "@umeng/common",  
34 - "integrity": "sha512-EbXsd4OoRisTQf5egNY/+z1D2bvrYw9VwC2xu3EJA9TiDPSbnaJZ5+yltA/Se6yZ4oCcFvq6e5/AAfPuumunbw==",  
35 - "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/common/-/common-1.0.21.har",  
36 - "registryType": "ohpm",  
37 - "dependencies": {  
38 - "libcommon.so": "./src/main/cpp/types/libcommon"  
39 - }  
40 - },  
41 - "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": {  
42 - "name": "libcommon.so",  
43 - "resolved": "../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",  
44 - "registryType": "local"  
45 - },  
46 - "wdBean@../wdBean": {  
47 - "name": "wdbean",  
48 - "resolved": "../wdBean",  
49 - "registryType": "local"  
50 - },  
51 - "wdConstant@../../commons/wdConstant": {  
52 - "name": "wdconstant",  
53 - "resolved": "../../commons/wdConstant",  
54 - "registryType": "local"  
55 - },  
56 - "wdKit@../../commons/wdKit": {  
57 - "name": "wdkit",  
58 - "resolved": "../../commons/wdKit",  
59 - "registryType": "local",  
60 - "dependencies": {  
61 - "@umeng/common": "^1.0.21",  
62 - "@umeng/analytics": "^1.0.19"  
63 - }  
64 - },  
65 - "wdNetwork@../../commons/wdNetwork": {  
66 - "name": "wdnetwork",  
67 - "resolved": "../../commons/wdNetwork",  
68 - "registryType": "local",  
69 - "dependencies": {  
70 - "wdConstant": "file:../wdConstant",  
71 - "wdKit": "file:../wdKit",  
72 - "@ohos/axios": "^2.1.1"  
73 - }  
74 - },  
75 - "wdRouter@../../commons/wdRouter": {  
76 - "name": "wdrouter",  
77 - "resolved": "../../commons/wdRouter",  
78 - "registryType": "local",  
79 - "dependencies": {  
80 - "wdKit": "file:../wdKit",  
81 - "wdBean": "file:../../features/wdBean",  
82 - "wdNetwork": "file:../../commons/wdNetwork",  
83 - "wdConstant": "file:../../commons/wdConstant"  
84 - }  
85 - },  
86 - "wdShareBase@../../commons/wdShareBase": {  
87 - "name": "wdsharebase",  
88 - "resolved": "../../commons/wdShareBase",  
89 - "registryType": "local",  
90 - "packageType": "InterfaceHar"  
91 - }  
92 - }  
93 -}  
@@ -3,4 +3,5 @@ @@ -3,4 +3,5 @@
3 /.preview 3 /.preview
4 /build 4 /build
5 /.cxx 5 /.cxx
6 -/.test  
  6 +/.test
  7 +/oh-package-lock.json5
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",  
9 - "@sensorsdata/analytics@^0.0.2": "@sensorsdata/analytics@0.0.2",  
10 - "@umeng/analytics@^1.0.19": "@umeng/analytics@1.0.19",  
11 - "@umeng/common@^1.0.21": "@umeng/common@1.0.21",  
12 - "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",  
13 - "wdBean@../wdBean": "wdBean@../wdBean",  
14 - "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",  
15 - "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",  
16 - "wdNetwork@../../commons/wdNetwork": "wdNetwork@../../commons/wdNetwork"  
17 - },  
18 - "packages": {  
19 - "@ohos/axios@2.2.0": {  
20 - "name": "@ohos/axios",  
21 - "integrity": "sha512-v1QBWk6DfcN8wUW3D0ieFbHTR1taSI5cOgxp5l6B5cegXuNYhSc8ggKlAIXe6h/14LsfM+NW0ZGfSXcNEIM5yA==",  
22 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",  
23 - "registryType": "ohpm"  
24 - },  
25 - "@sensorsdata/analytics@0.0.2": {  
26 - "name": "@sensorsdata/analytics",  
27 - "integrity": "sha512-SQCEmOw8ftGJmKtPl/1qUczZqu/yoQ4F2QHpK2Mayk+XctvNDSHn4QWengHj/pg36AopvuVfa0i6KR9c4KiIuQ==",  
28 - "resolved": "https://ohpm.openharmony.cn/ohpm/@sensorsdata/analytics/-/analytics-0.0.2.har",  
29 - "registryType": "ohpm"  
30 - },  
31 - "@umeng/analytics@1.0.19": {  
32 - "name": "@umeng/analytics",  
33 - "integrity": "sha512-0m9z5l8to+POjDl9UkCQC8s4P+e2E1OILwUglC7ME4QwqfH44e59GLJtQdwF0h6kwpsy3YBft4SoWK8MYbuP7g==",  
34 - "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/analytics/-/analytics-1.0.19.har",  
35 - "registryType": "ohpm"  
36 - },  
37 - "@umeng/common@1.0.21": {  
38 - "name": "@umeng/common",  
39 - "integrity": "sha512-EbXsd4OoRisTQf5egNY/+z1D2bvrYw9VwC2xu3EJA9TiDPSbnaJZ5+yltA/Se6yZ4oCcFvq6e5/AAfPuumunbw==",  
40 - "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/common/-/common-1.0.21.har",  
41 - "registryType": "ohpm",  
42 - "dependencies": {  
43 - "libcommon.so": "./src/main/cpp/types/libcommon"  
44 - }  
45 - },  
46 - "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": {  
47 - "name": "libcommon.so",  
48 - "resolved": "../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",  
49 - "registryType": "local"  
50 - },  
51 - "wdBean@../wdBean": {  
52 - "name": "wdbean",  
53 - "resolved": "../wdBean",  
54 - "registryType": "local"  
55 - },  
56 - "wdConstant@../../commons/wdConstant": {  
57 - "name": "wdconstant",  
58 - "resolved": "../../commons/wdConstant",  
59 - "registryType": "local"  
60 - },  
61 - "wdKit@../../commons/wdKit": {  
62 - "name": "wdkit",  
63 - "resolved": "../../commons/wdKit",  
64 - "registryType": "local",  
65 - "dependencies": {  
66 - "@umeng/common": "^1.0.21",  
67 - "@umeng/analytics": "^1.0.19"  
68 - }  
69 - },  
70 - "wdNetwork@../../commons/wdNetwork": {  
71 - "name": "wdnetwork",  
72 - "resolved": "../../commons/wdNetwork",  
73 - "registryType": "local",  
74 - "dependencies": {  
75 - "wdConstant": "file:../wdConstant",  
76 - "wdKit": "file:../wdKit",  
77 - "@ohos/axios": "^2.1.1"  
78 - }  
79 - }  
80 - }  
81 -}  
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "@mpaas/compress@^1.0.0": "@mpaas/compress@1.0.0",  
9 - "@mpaas/fake-island@^1.0.0": "@mpaas/fake-island@1.0.0",  
10 - "@mpaas/framework@0.0.2": "@mpaas/framework@0.0.2",  
11 - "@mpaas/framework@^0.0.2": "@mpaas/framework@0.0.2",  
12 - "@mpaas/fs-ext@^1.0.0": "@mpaas/fs-ext@1.0.0",  
13 - "@mpaas/lang@^1.0.0": "@mpaas/lang@1.0.0",  
14 - "@mpaas/path@^1.0.0": "@mpaas/path@1.0.0",  
15 - "@mpaas/rpc@^0.0.2": "@mpaas/rpc@0.0.2",  
16 - "@mpaas/shuckle@^1.0.0": "@mpaas/shuckle@1.0.0",  
17 - "@mpaas/trace-log@^0.0.2": "@mpaas/trace-log@0.0.2",  
18 - "@mpaas/transport_build@^0.0.2": "@mpaas/transport_build@0.0.2",  
19 - "@mpaas/udid@0.0.2": "@mpaas/udid@0.0.2",  
20 - "@mpaas/upgrade@0.0.2": "@mpaas/upgrade@0.0.2",  
21 - "@ohos/crypto-js@^2.0.2": "@ohos/crypto-js@2.0.3",  
22 - "@ohos/hypium@1.0.16": "@ohos/hypium@1.0.16",  
23 - "@ohos/pulltorefresh@^2.0.5": "@ohos/pulltorefresh@2.0.5",  
24 - "dayjs@^1.11.7": "dayjs@1.11.7",  
25 - "libcompress.so@oh_modules/.ohpm/@mpaas+compress@1.0.0/oh_modules/@mpaas/compress/src/main/cpp/types/libcompress": "libcompress.so@oh_modules/.ohpm/@mpaas+compress@1.0.0/oh_modules/@mpaas/compress/src/main/cpp/types/libcompress",  
26 - "libframework_api.so@oh_modules/.ohpm/@mpaas+framework@0.0.2/oh_modules/@mpaas/framework/src/main/cpp/types/libframework_api": "libframework_api.so@oh_modules/.ohpm/@mpaas+framework@0.0.2/oh_modules/@mpaas/framework/src/main/cpp/types/libframework_api",  
27 - "libgwcli.so@oh_modules/.ohpm/@mpaas+fake-island@1.0.0/oh_modules/@mpaas/fake-island/types": "libgwcli.so@oh_modules/.ohpm/@mpaas+fake-island@1.0.0/oh_modules/@mpaas/fake-island/types",  
28 - "liblang.so@oh_modules/.ohpm/@mpaas+lang@1.0.0/oh_modules/@mpaas/lang/types": "liblang.so@oh_modules/.ohpm/@mpaas+lang@1.0.0/oh_modules/@mpaas/lang/types",  
29 - "libmplog.so@oh_modules/.ohpm/@mpaas+trace-log@0.0.2/oh_modules/@mpaas/trace-log/types": "libmplog.so@oh_modules/.ohpm/@mpaas+trace-log@0.0.2/oh_modules/@mpaas/trace-log/types",  
30 - "libshuckle.so@oh_modules/.ohpm/@mpaas+shuckle@1.0.0/oh_modules/@mpaas/shuckle/src/main/cpp/types/libshuckle": "libshuckle.so@oh_modules/.ohpm/@mpaas+shuckle@1.0.0/oh_modules/@mpaas/shuckle/src/main/cpp/types/libshuckle",  
31 - "long@^5.2.1": "long@5.2.1",  
32 - "pako@^2.1.0": "pako@2.1.0"  
33 - },  
34 - "packages": {  
35 - "@mpaas/compress@1.0.0": {  
36 - "name": "@mpaas/compress",  
37 - "integrity": "sha512-x/aUK/zKjoUnd4kYGNAI1JMcEY2n4N6Rn+F+zcIYs8WLgobY6kFXTphLJ/NlSgjJklc2009U8zeStvtjon1zaQ==",  
38 - "resolved": "https://mpaas-ohpm.oss-cn-hangzhou.aliyuncs.com/dist/@mpaas/compress/compress-1.0.0.har",  
39 - "registryType": "ohpm",  
40 - "dependencies": {  
41 - "libcompress.so": "file:./src/main/cpp/types/libcompress"  
42 - }  
43 - },  
44 - "@mpaas/fake-island@1.0.0": {  
45 - "name": "@mpaas/fake-island",  
46 - "integrity": "sha512-cEt0Zsie0rwfvnYmqA+6pa93L6NLkJKwiqJCoE9Z2hFjhk9s4RSz7F0AUuj4WobrpdElXuipoCNFPXWLb4ZBlA==",  
47 - "resolved": "https://mpaas-ohpm.oss-cn-hangzhou.aliyuncs.com/dist/@mpaas/fake-island/fake-island-1.0.0.har",  
48 - "registryType": "ohpm",  
49 - "dependencies": {  
50 - "libgwcli.so": "file:./types"  
51 - }  
52 - },  
53 - "@mpaas/framework@0.0.2": {  
54 - "name": "@mpaas/framework",  
55 - "integrity": "sha512-nNpCI44zvg4fN9GNM5m31LdqfLrej9mMo/+BMny8QK+/Jvc3m/itE45bWZZ7unfflq40H2t4YOgtNAIW3m8MaA==",  
56 - "resolved": "https://mpaas-ohpm.oss-cn-hangzhou.aliyuncs.com/dist/@mpaas/framework/framework-0.0.2.har",  
57 - "registryType": "ohpm",  
58 - "dependencies": {  
59 - "libframework_api.so": "file:./src/main/cpp/types/libframework_api",  
60 - "@mpaas/udid": "0.0.2"  
61 - }  
62 - },  
63 - "@mpaas/fs-ext@1.0.0": {  
64 - "name": "@mpaas/fs-ext",  
65 - "integrity": "sha512-4TGUdrkmVSFktp1NcRdcs4uLYH6GvN1aTkMD2z8TJLztz5Hq5fMrvuznsmwTsSaRxGfGuyHPER8enMQo8wcfKA==",  
66 - "resolved": "https://mpaas-ohpm.oss-cn-hangzhou.aliyuncs.com/dist/@mpaas/fs-ext/fs-ext-1.0.0.har",  
67 - "registryType": "ohpm",  
68 - "dependencies": {  
69 - "@mpaas/path": "^1.0.0"  
70 - }  
71 - },  
72 - "@mpaas/lang@1.0.0": {  
73 - "name": "@mpaas/lang",  
74 - "integrity": "sha512-dcQ2QPrvwZgBhoGUjAbSFfkReDkwqEPMTzy/Xk05dhIB9VVznpLPahlQLVi0Am1FPATCT8J7DDrko9aJLOba+w==",  
75 - "resolved": "https://mpaas-ohpm.oss-cn-hangzhou.aliyuncs.com/dist/@mpaas/lang/lang-1.0.0.har",  
76 - "registryType": "ohpm",  
77 - "dependencies": {  
78 - "liblang.so": "file:./types"  
79 - }  
80 - },  
81 - "@mpaas/path@1.0.0": {  
82 - "name": "@mpaas/path",  
83 - "integrity": "sha512-TNjPaVOiq4DTiNFexSeI9isxeJ1H4q9Vieh3Bnv66o0U/e7rwV1qjEUtMvihX3MlsX0VKVkT0Xyf/wm18l4XYw==",  
84 - "resolved": "https://mpaas-ohpm.oss-cn-hangzhou.aliyuncs.com/dist/@mpaas/path/path-1.0.0.har",  
85 - "registryType": "ohpm"  
86 - },  
87 - "@mpaas/rpc@0.0.2": {  
88 - "name": "@mpaas/rpc",  
89 - "integrity": "sha512-BeiXDHW77CpZF5x4nuQc+3A7MfhFfU3+Wc73gac/ZRhIPuAAzfLmlzm5alqdm6oiWAw17ERQydUSG4SQSCHQ4g==",  
90 - "resolved": "https://mpaas-ohpm.oss-cn-hangzhou.aliyuncs.com/dist/@mpaas/rpc/rpc-0.0.2.har",  
91 - "registryType": "ohpm",  
92 - "dependencies": {  
93 - "@mpaas/transport_build": "^0.0.2",  
94 - "@mpaas/lang": "^1.0.0",  
95 - "@mpaas/framework": "^0.0.2"  
96 - }  
97 - },  
98 - "@mpaas/shuckle@1.0.0": {  
99 - "name": "@mpaas/shuckle",  
100 - "integrity": "sha512-B0MhrNzwG9pIoPxYVBldyenQWtWfTv5twd/0Ur1LbMpbp09AQ5wrZjKgDoeUtsIls9gzL9T8ngDZU6mRn8SYgQ==",  
101 - "resolved": "https://mpaas-ohpm.oss-cn-hangzhou.aliyuncs.com/dist/@mpaas/shuckle/shuckle-1.0.0.har",  
102 - "registryType": "ohpm",  
103 - "dependencies": {  
104 - "libshuckle.so": "file:./src/main/cpp/types/libshuckle",  
105 - "@mpaas/framework": "^0.0.2"  
106 - }  
107 - },  
108 - "@mpaas/trace-log@0.0.2": {  
109 - "name": "@mpaas/trace-log",  
110 - "integrity": "sha512-Llsdnx3L2tJJDg9vwJY01YsK4IOSmCo4SmAIW9yFHTzylrzFSWdFefRhJbNlkQQilXdYygEkBByXVvT1wFSmAg==",  
111 - "resolved": "https://mpaas-ohpm.oss-cn-hangzhou.aliyuncs.com/dist/@mpaas/trace-log/trace-log-0.0.2.har",  
112 - "registryType": "ohpm",  
113 - "dependencies": {  
114 - "@mpaas/lang": "^1.0.0",  
115 - "@mpaas/fs-ext": "^1.0.0",  
116 - "@mpaas/path": "^1.0.0",  
117 - "@mpaas/framework": "0.0.2",  
118 - "libmplog.so": "file:types",  
119 - "dayjs": "^1.11.7"  
120 - }  
121 - },  
122 - "@mpaas/transport_build@0.0.2": {  
123 - "name": "@mpaas/transport_build",  
124 - "integrity": "sha512-utz9C/cKIWbYrNiTBjk1gUhPH4/M73G64hWlrYKDpkfJHJmdYcQmmYV3v7Jit1z7Qg7hhu0aOaZzShqdQdC7rg==",  
125 - "resolved": "https://mpaas-ohpm.oss-cn-hangzhou.aliyuncs.com/dist/@mpaas/transport_build/transport_build-0.0.2.har",  
126 - "registryType": "ohpm",  
127 - "dependencies": {  
128 - "@ohos/crypto-js": "^2.0.2",  
129 - "dayjs": "^1.11.7",  
130 - "pako": "^2.1.0",  
131 - "@mpaas/fake-island": "^1.0.0",  
132 - "long": "^5.2.1",  
133 - "@mpaas/framework": "^0.0.2",  
134 - "@mpaas/shuckle": "^1.0.0",  
135 - "@mpaas/compress": "^1.0.0"  
136 - }  
137 - },  
138 - "@mpaas/udid@0.0.2": {  
139 - "name": "@mpaas/udid",  
140 - "integrity": "sha512-YFLSgBOrIjjmcFm4Cn2BB1tspHKHdB4qipVl4MUhHHDfiUYbLIVuv7x5xB9xPuPf0gKO8rx0yqUuzkaNDoNsAw==",  
141 - "resolved": "https://mpaas-ohpm.oss-cn-hangzhou.aliyuncs.com/dist/@mpaas/udid/udid-0.0.2.har",  
142 - "registryType": "ohpm"  
143 - },  
144 - "@mpaas/upgrade@0.0.2": {  
145 - "name": "@mpaas/upgrade",  
146 - "integrity": "sha512-VWamULIoJPA6nxUADwwNXd3uOspZeYAsRh05pApVilIdum5ktIMXIFl71jAKsChs3jtrhs9y5EShoZD4MZrGsA==",  
147 - "resolved": "https://mpaas-ohpm.oss-cn-hangzhou.aliyuncs.com/dist/@mpaas/upgrade/upgrade-0.0.2.har",  
148 - "registryType": "ohpm",  
149 - "dependencies": {  
150 - "@mpaas/framework": "^0.0.2",  
151 - "@mpaas/rpc": "^0.0.2",  
152 - "@mpaas/lang": "^1.0.0",  
153 - "@mpaas/transport_build": "^0.0.2",  
154 - "@mpaas/trace-log": "^0.0.2"  
155 - }  
156 - },  
157 - "@ohos/crypto-js@2.0.3": {  
158 - "name": "@ohos/crypto-js",  
159 - "integrity": "sha512-LuHaR1kD5PxnOXnuR1fWvPwGtbed9Q/QGzk6JOh8y5Wdzvi8brPesODZiaWf9scOVRHsbTPOtZw91vWB35p1vQ==",  
160 - "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/crypto-js/-/crypto-js-2.0.3.har",  
161 - "registryType": "ohpm"  
162 - },  
163 - "@ohos/hypium@1.0.16": {  
164 - "name": "@ohos/hypium",  
165 - "integrity": "sha512-PC3jpwKERg68V+4dmKU+SLjNps9i5JcQH57rQriaTsh62NBgVZs4SceMmNOtrIOyldbEJ5mXSwoZwiG/nkRmTw==",  
166 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.16.har",  
167 - "registryType": "ohpm"  
168 - },  
169 - "@ohos/pulltorefresh@2.0.5": {  
170 - "name": "@ohos/pulltorefresh",  
171 - "integrity": "sha512-mgBvJ6Ga70LmAoPKTOEPLFJluHUEAaBt2+7wF7R6223Vw6UEbZrof1MyvVOLEHk8Uc64ASIMW/TNQ8AHraTV5A==",  
172 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/pulltorefresh/-/pulltorefresh-2.0.5.har",  
173 - "registryType": "ohpm"  
174 - },  
175 - "dayjs@1.11.7": {  
176 - "name": "dayjs",  
177 - "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==",  
178 - "resolved": "https://ohpm.openharmony.cn/ohpm/dayjs/-/dayjs-1.11.7.tgz",  
179 - "shasum": "4b296922642f70999544d1144a2c25730fce63e2",  
180 - "registryType": "ohpm"  
181 - },  
182 - "libcompress.so@oh_modules/.ohpm/@mpaas+compress@1.0.0/oh_modules/@mpaas/compress/src/main/cpp/types/libcompress": {  
183 - "name": "libcompress.so",  
184 - "resolved": "oh_modules/.ohpm/@mpaas+compress@1.0.0/oh_modules/@mpaas/compress/src/main/cpp/types/libcompress",  
185 - "registryType": "local"  
186 - },  
187 - "libframework_api.so@oh_modules/.ohpm/@mpaas+framework@0.0.2/oh_modules/@mpaas/framework/src/main/cpp/types/libframework_api": {  
188 - "name": "libframework_api.so",  
189 - "resolved": "oh_modules/.ohpm/@mpaas+framework@0.0.2/oh_modules/@mpaas/framework/src/main/cpp/types/libframework_api",  
190 - "registryType": "local"  
191 - },  
192 - "libgwcli.so@oh_modules/.ohpm/@mpaas+fake-island@1.0.0/oh_modules/@mpaas/fake-island/types": {  
193 - "name": "libgwcli.so",  
194 - "resolved": "oh_modules/.ohpm/@mpaas+fake-island@1.0.0/oh_modules/@mpaas/fake-island/types",  
195 - "registryType": "local"  
196 - },  
197 - "liblang.so@oh_modules/.ohpm/@mpaas+lang@1.0.0/oh_modules/@mpaas/lang/types": {  
198 - "name": "liblang.so",  
199 - "resolved": "oh_modules/.ohpm/@mpaas+lang@1.0.0/oh_modules/@mpaas/lang/types",  
200 - "registryType": "local"  
201 - },  
202 - "libmplog.so@oh_modules/.ohpm/@mpaas+trace-log@0.0.2/oh_modules/@mpaas/trace-log/types": {  
203 - "name": "libmplog.so",  
204 - "resolved": "oh_modules/.ohpm/@mpaas+trace-log@0.0.2/oh_modules/@mpaas/trace-log/types",  
205 - "registryType": "local"  
206 - },  
207 - "libshuckle.so@oh_modules/.ohpm/@mpaas+shuckle@1.0.0/oh_modules/@mpaas/shuckle/src/main/cpp/types/libshuckle": {  
208 - "name": "lishuckle.so",  
209 - "resolved": "oh_modules/.ohpm/@mpaas+shuckle@1.0.0/oh_modules/@mpaas/shuckle/src/main/cpp/types/libshuckle",  
210 - "registryType": "local",  
211 - "dependencies": {  
212 - "@mpaas/framework": "^0.0.2"  
213 - }  
214 - },  
215 - "long@5.2.1": {  
216 - "name": "long",  
217 - "integrity": "sha512-GKSNGeNAtw8IryjjkhZxuKB3JzlcLTwjtiQCHKvqQet81I93kXslhDQruGI/QsddO83mcDToBVy7GqGS/zYf/A==",  
218 - "resolved": "https://ohpm.openharmony.cn/ohpm/long/-/long-5.2.1.tgz",  
219 - "shasum": "e27595d0083d103d2fa2c20c7699f8e0c92b897f",  
220 - "registryType": "ohpm"  
221 - },  
222 - "pako@2.1.0": {  
223 - "name": "pako",  
224 - "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==",  
225 - "resolved": "https://ohpm.openharmony.cn/ohpm/pako/-/pako-2.1.0.tgz",  
226 - "shasum": "266cc37f98c7d883545d11335c00fbd4062c9a86",  
227 - "registryType": "ohpm"  
228 - }  
229 - }  
230 -}  
1 -{  
2 - "meta": {  
3 - "stableOrder": true  
4 - },  
5 - "lockfileVersion": 3,  
6 - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",  
7 - "specifiers": {  
8 - "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",  
9 - "@ohos/lottie@2.0.0": "@ohos/lottie@2.0.0",  
10 - "wdBean@../../features/wdBean": "wdBean@../../features/wdBean",  
11 - "wdComponent@../../features/wdComponent": "wdComponent@../../features/wdComponent",  
12 - "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",  
13 - "wdDetailPlayApi@../../features/wdDetailPlayApi": "wdDetailPlayApi@../../features/wdDetailPlayApi",  
14 - "wdDetailPlayShortVideo@../../features/wdDetailPlayShortVideo": "wdDetailPlayShortVideo@../../features/wdDetailPlayShortVideo",  
15 - "wdHwAbility@../../features/wdHwAbility": "wdHwAbility@../../features/wdHwAbility",  
16 - "wdJsBridge@../../commons/wdJsBridge": "wdJsBridge@../../commons/wdJsBridge",  
17 - "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",  
18 - "wdLogin@../../features/wdLogin": "wdLogin@../../features/wdLogin",  
19 - "wdNetwork@../../commons/wdNetwork": "wdNetwork@../../commons/wdNetwork",  
20 - "wdPlayer@../../features/wdPlayer": "wdPlayer@../../features/wdPlayer",  
21 - "wdRouter@../../commons/wdRouter": "wdRouter@../../commons/wdRouter",  
22 - "wdWebComponent@../../commons/wdWebComponent": "wdWebComponent@../../commons/wdWebComponent"  
23 - },  
24 - "packages": {  
25 - "@ohos/axios@2.2.0": {  
26 - "name": "@ohos/axios",  
27 - "integrity": "sha512-v1QBWk6DfcN8wUW3D0ieFbHTR1taSI5cOgxp5l6B5cegXuNYhSc8ggKlAIXe6h/14LsfM+NW0ZGfSXcNEIM5yA==",  
28 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",  
29 - "registryType": "ohpm"  
30 - },  
31 - "@ohos/lottie@2.0.0": {  
32 - "name": "@ohos/lottie",  
33 - "integrity": "sha512-jFEFYfuqGO323aMiwtzHmDGRJI0qTxjZD2Lzbn+LxRdoHSfu5OVu22I8gVm5ej019tCw3WOk547NHZ2GuWiNSg==",  
34 - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/lottie/-/lottie-2.0.0.har",  
35 - "registryType": "ohpm"  
36 - },  
37 - "wdBean@../../features/wdBean": {  
38 - "name": "wdbean",  
39 - "resolved": "../../features/wdBean",  
40 - "registryType": "local"  
41 - },  
42 - "wdComponent@../../features/wdComponent": {  
43 - "name": "wdcomponent",  
44 - "resolved": "../../features/wdComponent",  
45 - "registryType": "local",  
46 - "dependencies": {  
47 - "@ohos/lottie": "2.0.0",  
48 - "wdConstant": "file:../../commons/wdConstant",  
49 - "wdPlayer": "file:../../features/wdPlayer",  
50 - "wdLogin": "file:../../features/wdLogin",  
51 - "wdKit": "file:../../commons/wdKit",  
52 - "wdWebComponent": "file:../../commons/wdWebComponent",  
53 - "wdBean": "file:../../features/wdBean",  
54 - "wdDetailPlayShortVideo": "file:../../features/wdDetailPlayShortVideo",  
55 - "wdRouter": "file:../../commons/wdRouter",  
56 - "wdNetwork": "file:../../commons/wdNetwork",  
57 - "wdJsBridge": "file:../../commons/wdJsBridge"  
58 - }  
59 - },  
60 - "wdConstant@../../commons/wdConstant": {  
61 - "name": "wdconstant",  
62 - "resolved": "../../commons/wdConstant",  
63 - "registryType": "local"  
64 - },  
65 - "wdDetailPlayApi@../../features/wdDetailPlayApi": {  
66 - "name": "wddetailplayapi",  
67 - "resolved": "../../features/wdDetailPlayApi",  
68 - "registryType": "local",  
69 - "dependencies": {  
70 - "wdPlayer": "file:../../features/wdPlayer",  
71 - "wdKit": "file:../../commons/wdKit",  
72 - "wdBean": "file:../../features/wdBean",  
73 - "wdRouter": "file:../../commons/wdRouter",  
74 - "wdNetwork": "file:../../commons/wdNetwork"  
75 - }  
76 - },  
77 - "wdDetailPlayShortVideo@../../features/wdDetailPlayShortVideo": {  
78 - "name": "wddetailplayshortvideo",  
79 - "resolved": "../../features/wdDetailPlayShortVideo",  
80 - "registryType": "local",  
81 - "dependencies": {  
82 - "@ohos/lottie": "2.0.0",  
83 - "wdPlayer": "file:../../features/wdPlayer",  
84 - "wdKit": "file:../../commons/wdKit",  
85 - "wdBean": "file:../../features/wdBean",  
86 - "wdRouter": "file:../../commons/wdRouter",  
87 - "wdNetwork": "file:../../commons/wdNetwork",  
88 - "wdDetailPlayApi": "file:../../features/wdDetailPlayApi"  
89 - }  
90 - },  
91 - "wdHwAbility@../../features/wdHwAbility": {  
92 - "name": "wdhwability",  
93 - "resolved": "../../features/wdHwAbility",  
94 - "registryType": "local",  
95 - "dependencies": {  
96 - "wdConstant": "file:../../commons/wdConstant",  
97 - "wdLogin": "file:../../features/wdLogin",  
98 - "wdKit": "file:../../commons/wdKit",  
99 - "wdBean": "file:../../features/wdBean",  
100 - "wdNetwork": "file:../../commons/wdNetwork"  
101 - },  
102 - "packageType": "InterfaceHar"  
103 - },  
104 - "wdJsBridge@../../commons/wdJsBridge": {  
105 - "name": "wdjsbridge",  
106 - "resolved": "../../commons/wdJsBridge",  
107 - "registryType": "local"  
108 - },  
109 - "wdKit@../../commons/wdKit": {  
110 - "name": "wdkit",  
111 - "resolved": "../../commons/wdKit",  
112 - "registryType": "local"  
113 - },  
114 - "wdLogin@../../features/wdLogin": {  
115 - "name": "wdlogin",  
116 - "resolved": "../../features/wdLogin",  
117 - "registryType": "local",  
118 - "dependencies": {  
119 - "wdConstant": "file:../../commons/wdConstant",  
120 - "wdKit": "file:../../commons/wdKit",  
121 - "wdWebComponent": "file:../../commons/wdWebComponent",  
122 - "wdBean": "file:../../features/wdBean",  
123 - "wdRouter": "file:../../commons/wdRouter",  
124 - "wdNetwork": "file:../../commons/wdNetwork"  
125 - }  
126 - },  
127 - "wdNetwork@../../commons/wdNetwork": {  
128 - "name": "wdnetwork",  
129 - "resolved": "../../commons/wdNetwork",  
130 - "registryType": "local",  
131 - "dependencies": {  
132 - "wdConstant": "file:../wdConstant",  
133 - "wdKit": "file:../wdKit",  
134 - "@ohos/axios": "^2.1.1"  
135 - }  
136 - },  
137 - "wdPlayer@../../features/wdPlayer": {  
138 - "name": "wdplayer",  
139 - "resolved": "../../features/wdPlayer",  
140 - "registryType": "local",  
141 - "dependencies": {  
142 - "wdKit": "file:../../commons/wdKit"  
143 - }  
144 - },  
145 - "wdRouter@../../commons/wdRouter": {  
146 - "name": "wdrouter",  
147 - "resolved": "../../commons/wdRouter",  
148 - "registryType": "local",  
149 - "dependencies": {  
150 - "wdKit": "file:../wdKit",  
151 - "wdBean": "file:../../features/wdBean"  
152 - }  
153 - },  
154 - "wdWebComponent@../../commons/wdWebComponent": {  
155 - "name": "wdwebcomponent",  
156 - "resolved": "../../commons/wdWebComponent",  
157 - "registryType": "local",  
158 - "dependencies": {  
159 - "wdConstant": "file:../wdConstant",  
160 - "wdKit": "file:../wdKit",  
161 - "wdJsBridge": "file:../wdJsBridge",  
162 - "wdBean": "file:../../features/wdBean",  
163 - "wdRouter": "file:../wdRouter"  
164 - }  
165 - }  
166 - }  
167 -}  
@@ -151,7 +151,7 @@ struct Index { @@ -151,7 +151,7 @@ struct Index {
151 TapGesture() 151 TapGesture()
152 .onAction((event: GestureEvent) => { 152 .onAction((event: GestureEvent) => {
153 if (this.AudioSuspension.playerController) { 153 if (this.AudioSuspension.playerController) {
154 - this.AudioSuspension.playerController.get().switchPlayOrPause() 154 + this.AudioSuspension.playerController.get().pause()
155 this.AudioSuspension.minimize() 155 this.AudioSuspension.minimize()
156 } 156 }
157 })) 157 }))
1 import { insightIntent, InsightIntentExecutor } from '@kit.AbilityKit'; 1 import { insightIntent, InsightIntentExecutor } from '@kit.AbilityKit';
2 import { window } from '@kit.ArkUI'; 2 import { window } from '@kit.ArkUI';
3 import { BusinessError } from '@kit.BasicServicesKit'; 3 import { BusinessError } from '@kit.BasicServicesKit';
4 -import { NetworkUtil, SPHelper, ToastUtils } from 'wdKit'; 4 +import { NetworkUtil, SPHelper, ToastUtils, FastClickUtil } from 'wdKit';
5 import { ProcessUtils } from 'wdRouter'; 5 import { ProcessUtils } from 'wdRouter';
6 import DailyPaperTopicModel from 'wdComponent/src/main/ets/model/DailyPaperTopicModel' 6 import DailyPaperTopicModel from 'wdComponent/src/main/ets/model/DailyPaperTopicModel'
7 7
@@ -79,8 +79,11 @@ export default class InsightIntentExecutorImpl extends InsightIntentExecutor { @@ -79,8 +79,11 @@ export default class InsightIntentExecutorImpl extends InsightIntentExecutor {
79 pageLoader: window.WindowStage): Promise<insightIntent.ExecuteResult> { 79 pageLoader: window.WindowStage): Promise<insightIntent.ExecuteResult> {
80 return new Promise((resolve, reject) => { 80 return new Promise((resolve, reject) => {
81 pageLoader.loadContent('pages/MainPage') 81 pageLoader.loadContent('pages/MainPage')
82 - .then(() => { 82 + .then( async () => {
83 if (NetworkUtil.isNetConnected()) { 83 if (NetworkUtil.isNetConnected()) {
  84 + if (await FastClickUtil.isMinDelayTime()) {
  85 + return
  86 + }
84 DailyPaperTopicModel.getDailyPaperTopic().then(dailyPaperTopicBean => { 87 DailyPaperTopicModel.getDailyPaperTopic().then(dailyPaperTopicBean => {
85 if (dailyPaperTopicBean && dailyPaperTopicBean.id > 0) { 88 if (dailyPaperTopicBean && dailyPaperTopicBean.id > 0) {
86 SPHelper.default.saveSync('dailyPaperTopicPageId', dailyPaperTopicBean.id); 89 SPHelper.default.saveSync('dailyPaperTopicPageId', dailyPaperTopicBean.id);