developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
陈剑华
a2dff022 2 parents a468bc7d e0649496

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 19 changed files with 370 additions and 77 deletions
... ... @@ -350,12 +350,14 @@ export struct WdWebLocalComponent {
this.controller.pause()
this.cancelProgressTimer()
}
})
}).margin({right:16})
Row() {
Text(DateTimeUtils.getFormattedDuration(this.currentTime * 1000))
.fontSize(12)
.fontColor(Color.White)
.fontWeight(600)
Slider({
value: this.currentTime,
min: 0,
... ... @@ -385,8 +387,8 @@ export struct WdWebLocalComponent {
.fontSize(12)
.fontColor(Color.White)
.fontWeight(600)
}
.justifyContent(FlexAlign.Center)
}.alignItems(VerticalAlign.Center)
.height(48)
// Image($r('app.media.icon_full_screen'))
// .width(24)
... ... @@ -401,7 +403,9 @@ export struct WdWebLocalComponent {
colors: [[0x20000000, 0.0], [Color.Transparent, 1.0]] // [0x80000000, 0.5],
})
.width("100%")
.justifyContent(FlexAlign.SpaceAround)
.height(48)
.padding({left:16})
.alignItems(VerticalAlign.Center)
}
}
... ...
... ... @@ -139,29 +139,7 @@ export struct DynamicDetailComponent {
build() {
Column() {
//logo、日期
Row() {
Image($r('app.media.ic_article_rmh'))
.width($r('app.float.margin_80'))
.height($r('app.float.margin_28'))
.margin({ left: $r('app.float.margin_16') })
Blank()
Text(this.publishTime)
.fontColor($r('app.color.color_B0B0B0'))
.fontSize($r('app.float.font_size_12'))
.lineHeight($r('app.float.margin_28'))
.margin({ right: $r('app.float.margin_16') })
}
.height($r('app.float.margin_48'))
.width('100%')
.alignItems(VerticalAlign.Bottom)
.padding({ bottom: 5 })
.margin({top: `${this.topSafeHeight}px`})
//分割线
Image($r('app.media.ic_news_detail_division'))
.width('100%')
.height($r('app.float.margin_6'))
.padding({ left: $r('app.float.margin_16'), right: $r('app.float.margin_16') })
this.topNav()
Stack({ alignContent: Alignment.Bottom }) {
if (!this.isNetConnected) {
EmptyComponent({
... ... @@ -704,6 +682,72 @@ export struct DynamicDetailComponent {
.height('100%')
}
@Builder topNav() {
//logo、日期
Row() {
Image($r('app.media.ic_article_rmh'))
.width($r('app.float.margin_80'))
.height($r('app.float.margin_28'))
.margin({ left: $r('app.float.margin_16') })
Blank()
Text(this.publishTime)
.fontColor($r('app.color.color_B0B0B0'))
.fontSize($r('app.float.font_size_12'))
.lineHeight($r('app.float.margin_28'))
.margin({ right: $r('app.float.margin_16') })
}
.height($r('app.float.margin_48'))
.width('100%')
.alignItems(VerticalAlign.Bottom)
.padding({ bottom: 5 })
.margin({top: `${this.topSafeHeight}px`})
//分割线
Image($r('app.media.ic_news_detail_division'))
.width('100%')
.height($r('app.float.margin_6'))
.padding({ left: $r('app.float.margin_16'), right: $r('app.float.margin_16') })
// 发布时间 ，TODO：需要参考文章详情
// Column() {
// Row() {
// if (this.isNetConnected && this.contentDetailData) {
// if (this.contentDetailData.rmhPlatform == 1) { // 人民号
// if (this.contentDetailData?.rmhInfo?.userType == "5") { // 内容源账号
// Blank().height(1)
// } else {
// Image($r('app.media.logo_rmh')).width(80) .height(28)
// }
// } else if (this.contentDetailData.rmhPlatform == 2) { // 普通用户
// Blank().height(1)
// } else {
// Image($r('app.media.logo_rmrb')).width(80) .height(28)
// }
// Text(this.publishTime)
// .fontColor($r('app.color.color_B0B0B0'))
// .fontSize(13)
// .height(20)
// }
// }
// .width(CommonConstants.FULL_WIDTH)
// .height($r('app.float.margin_48'))
// .padding({ left: 15, right: 15, })
// .justifyContent(FlexAlign.SpaceBetween)
// .alignItems(VerticalAlign.Bottom)
//
// // if (this.isNetConnected && !this.detailContentEmpty) {
// Row() {
// Image($r('app.media.ic_news_detail_division'))
// .width('100%')
// .height(6)
// .margin({ top: 10 })
// .objectFit(ImageFit.Fill)
// }
// .padding({ left: 15, right: 15 })
// .backgroundColor(Color.White)
// // }
// }.backgroundColor(Color.White)
}
private titleText() {
if(!StringUtils.isEmpty(this.contentDetailData.newsContent)){
return this.contentDetailData.newsContent
... ...
import display from '@ohos.display';
const TAG = 'GalleryImage'
@Component
export struct GalleryImage {
private url: string = "";
private index: number = 0;
@State downLoadEnable: boolean = true;
@Link isScaling: boolean
@State showLoading: boolean = false;
@State rotateAngle: number = 0;
@State showError: boolean = false;
@State scaleValue: number = 1;
@State pinchValue: number = 1;
@State pinchX: number | string = '50%';
@State pinchY: number | string = '50%';
private panOption: PanGestureOptions = new PanGestureOptions({ direction: PanDirection.None, fingers: 1 })
@State offsetX: number = 0
@State offsetY: number = 0
@State positionX: number = 0
@State positionY: number = 0
private imageWith: number = 0;
@State sizeValue: number = 0;
//alt app.media.picture_loading 设计稿尺寸
@State imageWidth:string | number = 167
aboutToAppear(): void {
this.showLoading = true;
this.downLoadEnable = false;
console.info(TAG);
}
aboutToDisAppear(): void {
console.info("");
}
aboutToReuse(): void {
console.info("");
}
build() {
Column() {
Image(this.url)
.width(this.imageWidth)
.height("100%")
.objectFit(ImageFit.Contain)//todo 加载失败时占位图没隐藏
.alt($r("app.media.datail_imageLoading_w"))
.interpolation(ImageInterpolation.High)
.onComplete(msg => {
if (msg) {
this.imageWidth = '100%'
console.info(TAG, "index:" + this.index + ", loadingStatus:" + msg.loadingStatus)
// 图片数据加载成功
if (msg.loadingStatus === 0) {
this.showLoading = true;
this.downLoadEnable = false;
} else if (msg.loadingStatus === 1) {
// 图片数据解码成功
this.showLoading = false;
this.downLoadEnable = true;
this.imageWith = px2vp(display.getDefaultDisplaySync().width)
}
}
})
.onError(() => {
console.info(TAG, "图片加载异常")
this.showLoading = false;
this.showError = true;
})// 在组件上绑定缩放比例，可以通过修改缩放比例来实现组件的缩小或者放大
.scale({
x: this.scaleValue,
y: this.scaleValue,
z: 1,
centerX: this.pinchX,
centerY: this.pinchY
})// 以组件左上角为坐标原点进行移动
.translate({ x: this.offsetX, y: this.offsetY, z: 0 })
.gesture(
GestureGroup(GestureMode.Parallel,
// 两指或以上的捏合手势
PinchGesture({ fingers: 2 })
.onActionStart(() => {
console.info(TAG, 'Pinch start');
})// 当捏合手势触发时，可以通过回调函数获取缩放比例，从而修改组件的缩放比例
.onActionUpdate((event: GestureEvent) => {
const scaleValue = this.pinchValue * event.scale;
if (scaleValue <= 3 && scaleValue >= 0.8) {
this.scaleValue = scaleValue;
this.pinchX = event.pinchCenterX;
this.pinchY = event.pinchCenterY;
}
})
.onActionEnd(() => {
this.pinchValue = this.scaleValue;
console.info(TAG, 'Pinch end');
if (this.pinchValue > 1) {
this.panOption.setDirection(PanDirection.Horizontal)
this.isScaling = true;
} else {
this.panOption.setDirection(PanDirection.None)
this.isScaling = false;
}
}),
// 绑定count为1的TapGesture
TapGesture({ count: 1 })
.onAction(() => {
}),
// 绑定count为2的TapGesture
TapGesture({ count: 2 })
.onAction(() => {
console.info(TAG, '双击 start')
animateTo({
duration: 400,
}, () => {
this.scaleValue = 1;
this.pinchX = '50%';
this.pinchY = '50%';
this.pinchValue = this.scaleValue;
this.offsetX = 0;
this.offsetY = 0;
this.positionX = 0;
this.positionY = 0;
this.panOption.setDirection(PanDirection.None);
this.isScaling = false;
})
}),
PanGesture(this.panOption)
.onActionStart(() => {
console.info(TAG, 'Pan start')
})
.onActionUpdate((event?: GestureEvent) => {
if (event) {
if (this.scaleValue > 1) {
this.offsetX = this.positionX + event.offsetX
this.offsetY = this.positionY + event.offsetY
this.sizeValue = this.imageWith
}
}
})
.onActionEnd(() => {
this.positionX = this.offsetX
this.positionY = this.offsetY
console.info(TAG, 'Pan end')
})
))
}
.width('100%')
.height('100%')
.justifyContent(FlexAlign.Center)
}
}
\ No newline at end of file
... ...
... ... @@ -5,7 +5,8 @@ import {
EmitterUtils,
EmitterEventId,
NetworkUtil,
DisplayUtils
DisplayUtils,
ToastUtils
} from 'wdKit';
import {
Action,
... ... @@ -185,8 +186,10 @@ export struct ImageAndTextPageComponent {
.justifyContent(FlexAlign.Center)
}
if (this.recommendList.length > 0) {
Divider().strokeWidth(8).color('#f5f5f5')
RecommendList({ recommendList: this.recommendList })
Column(){
Divider().strokeWidth(8).color('#f5f5f5')
RecommendList({ recommendList: this.recommendList })
}.padding({bottom:this.contentDetailData?.openComment ? 0 : 44 })
}
// 评论
if (this.contentDetailData?.openComment) {
... ... @@ -264,9 +267,17 @@ export struct ImageAndTextPageComponent {
Column() {
Row() {
if (this.isNetConnected && !this.detailContentEmpty) {
Image(this.contentDetailData?.rmhInfo ? $r('app.media.logo_rmh') : $r('app.media.logo_rmrb'))
.width(80)
.height(28)
if (this.contentDetailData.rmhPlatform == 1) { // 人民号
if (this.contentDetailData?.rmhInfo?.userType == "5") { // 内容源账号
Blank().height(1)
} else {
Image($r('app.media.logo_rmh')).width(80) .height(28)
}
} else if (this.contentDetailData.rmhPlatform == 2) { // 普通用户
Blank().height(1)
} else {
Image($r('app.media.logo_rmrb')).width(80) .height(28)
}
Text(this.publishTime)
.fontColor($r('app.color.color_B0B0B0'))
.fontSize(13)
... ... @@ -439,22 +450,25 @@ export struct ImageAndTextPageComponent {
PageRepository.postExecuteLike(params).then(res => {
// console.log(TAG, '点赞、res', JSON.stringify(res))
// console.log(TAG, '点赞、取消点赞 this.newsStatusOfUser', JSON.stringify(this.newsStatusOfUser))
if (this.newsStatusOfUser) {
//内容点赞、取消点赞Tracking 1点赞 0取消点赞
this.newsStatusOfUser.likeStatus = this.newsStatusOfUser?.likeStatus == '1' ? '0' : '1'
if (this.newsStatusOfUser.likeStatus === '1') {
this.likeNum = Number(this.likeNum) + 1
if (res.code != 0){
ToastUtils.showToast(res.message, 1000);
}else {
if (this.newsStatusOfUser) {
//内容点赞、取消点赞Tracking 1点赞 0取消点赞
this.newsStatusOfUser.likeStatus = this.newsStatusOfUser?.likeStatus == '1' ? '0' : '1'
if (this.newsStatusOfUser.likeStatus === '1') {
this.likeNum = Number(this.likeNum) + 1
} else {
this.likeNum = Number(this.likeNum) - 1
}
// console.log(TAG, '点赞newsStatusOfUser.likeStatus ', this.newsStatusOfUser.likeStatus)
// this.queryContentInteractCount()
TrackingContent.like(this.newsStatusOfUser?.likeStatus == '1', TrackConstants.PageName.My, TrackConstants.PageName.My)
} else {
this.likeNum = Number(this.likeNum) - 1
// 初次进入详情页偶现获取失败，重新获取newsStatusOfUser对象
this.getInteractDataStatus()
}
// console.log(TAG, '点赞newsStatusOfUser.likeStatus ', this.newsStatusOfUser.likeStatus)
// this.queryContentInteractCount()
TrackingContent.like(this.newsStatusOfUser?.likeStatus == '1', TrackConstants.PageName.My, TrackConstants.PageName.My)
} else {
// 初次进入详情页偶现获取失败，重新获取newsStatusOfUser对象
this.getInteractDataStatus()
}
})
}
... ...
... ... @@ -114,8 +114,16 @@ export struct MultiPictureDetailItemComponent {
calcImageDefaultSize(imageWHRatio: number, size: window.Size): image.Size {
let width = 0
let height = 0;
width = size.width;
height = size.width / imageWHRatio;
// width = size.width;
// height = size.width / imageWHRatio;
if (imageWHRatio > size.width / size.height) {
// 图片宽高比大于屏幕宽高比，图片默认以屏幕宽度进行显示
width = size.width;
height = size.width / imageWHRatio;
} else {
height = size.height;
width = size.height * imageWHRatio;
}
return { width: width, height: height };
}
... ... @@ -179,7 +187,9 @@ export struct MultiPictureDetailItemComponent {
Image(this.imagePixelMap || 'app.media.datail_imageLoading_w')// TODO：知识点：宽高只根据其尺寸设置一个，通过保持宽高比来设置另一个属性
.alt($r('app.media.datail_imageLoading_w'))
.width(this.imageWidth)
.aspectRatio(this.imageWHRatio)
.objectFit(ImageFit.Cover)// TODO：知识点：保持宽高比进行缩放，可以超出父组件，以便实现多图切换的增强功能
.autoResize(false)
.interpolation(ImageInterpolation.High)
.autoResize(false)
.transform(this.matrix)// TODO：知识点：通过matrix控制图片的缩放
... ... @@ -229,11 +239,6 @@ export struct MultiPictureDetailItemComponent {
.gesture(
GestureGroup(
GestureMode.Exclusive,
// 单击返回上一层
// TapGesture({ count: 1 })
// .onAction(() => {
// router.back()
// }),
// TODO：知识点：双击切换图片大小
TapGesture({ count: 2 })
.onAction(() => {
... ... @@ -315,9 +320,10 @@ export struct MultiPictureDetailItemComponent {
}
this.imageScaleInfo.stash();
}),
// // TODO：知识点：滑动图片
// TODO：知识点：滑动图片
// PanGesture({ fingers: 1 })// TODO：需求：默认大小下左右滑动应当是切换图片
// .onActionUpdate((event: GestureEvent) => {
// console.log(TAG, "PanGesture", JSON.stringify(event))
// if (this.imageScaleInfo.scaleValue === this.imageScaleInfo.defaultScaleValue) {
// // 默认大小下不允许移动
// return;
... ...
... ... @@ -36,7 +36,7 @@ export struct CommentListDialogView {
showClose: false,
maskColor: "#50000000",
dragBar: false,
onDisappear: () => {
onWillDisappear: () => {
this.showCommentList = false
if (this.onClose) { this.onClose() }
},
... ...
... ... @@ -34,7 +34,9 @@ export struct FollowListDetailUI {
if (arr[1] == "0") {
this.data.getDataArray().forEach((element, index) => {
if (element.creatorId === arr[0]) {
this.data.deleteItem(index)
animateTo({}, () => {
this.data.deleteItem(index);
});
this.count = this.data.size()
}
});
... ... @@ -92,6 +94,7 @@ export struct FollowListDetailUI {
ListItem() {
FollowChildComponent({ data: item, type: this.type })
}
.transition(TransitionEffect.OPACITY)
}, (item: FollowListDetailItem) => item.creatorId)
//没有更多数据 显示提示
... ...
... ... @@ -251,7 +251,11 @@ export struct EmptyComponent {
} else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoSearchResult) {
imageString = $r('app.media.icon_no_result1')
} else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork) {
imageString = $r('app.media.icon_no_net1')
if(this.isBlack) {
imageString = $r('app.media.icon_no_net')
} else {
imageString = $r('app.media.icon_no_net1')
}
} else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_ContentFailed) {
imageString = $r('app.media.icon_no_content')
} else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoCreation) {
... ...
... ... @@ -382,7 +382,7 @@ export struct LiveOperRowListView {
this.publishCommentModel.rootCommentId = '-1';
this.publishCommentModel.parentId = '-1';
this.publishCommentModel.placeHolderText = "说两句..."
this.publishCommentModel.commentContent = ""
// this.publishCommentModel.commentContent = ""
this.commentInputDialogController?.open();
}
... ...
import { NumberFormatterUtils, SPHelper } from 'wdKit';
import { NumberFormatterUtils, SPHelper, ToastUtils } from 'wdKit';
import promptAction from '@ohos.promptAction';
import {
batchLikeAndCollectParams,
... ... @@ -526,15 +526,19 @@ export struct OperRowListView {
console.log(TAG, '收藏点击', JSON.stringify(params))
PageRepository.postExecuteCollectRecord(params).then(res => {
if (this.newsStatusOfUser) {
this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
if (this.newsStatusOfUser.collectStatus === 1) {
promptAction.showToast({ message: '收藏成功' })
TrackingContent.collect(true,this.pageId,this.pageName,this.pageParam)
} else {
TrackingContent.collect(false,this.pageId,this.pageName,this.pageParam)
if (res.code != 0){
ToastUtils.showToast(res.message, 1000);
}else {
if (this.newsStatusOfUser) {
this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
if (this.newsStatusOfUser.collectStatus === 1) {
promptAction.showToast({ message: '收藏成功' })
TrackingContent.collect(true,this.pageId,this.pageName,this.pageParam)
} else {
TrackingContent.collect(false,this.pageId,this.pageName,this.pageParam)
}
this.queryContentInteractCount()
}
this.queryContentInteractCount()
}
console.log(TAG, '收藏点击 this.newsStatusOfUser', JSON.stringify(this.newsStatusOfUser))
})
... ...
... ... @@ -100,6 +100,7 @@ export struct MultiPictureListPage {
.vertical(false)
.autoPlay(false)
.loop(false)
.disableSwipe(!this.isEnableSwipe)
.effectMode(EdgeEffect.None)
.cachedCount(3)
.indicator(false)
... ...
... ... @@ -48,6 +48,7 @@ struct OtherNormalUserHomePage {
@State userName:string = ""
@State headPhotoUrl:string = ""
@State levelHead:string = ""
@State listLevelHead:string = ""
@State levelId:number = 0
@State browseNum:number = 0//阅读数
@State commentNum:number = 0//评论数
... ... @@ -208,7 +209,7 @@ struct OtherNormalUserHomePage {
Stack({ alignContent: Alignment.Top }){
Tabs({controller: this.controller}) {
TabContent() {
OtherHomePageBottomCommentComponent({curUserId:this.curUserId,levelHead:this.levelHead,commentNum:$commentNum})
OtherHomePageBottomCommentComponent({curUserId:this.curUserId,levelHead:this.listLevelHead,commentNum:$commentNum})
}
TabContent() {
OtherHomePageBottomFollowComponent({curUserId:this.curUserId})
... ... @@ -422,6 +423,7 @@ struct OtherNormalUserHomePage {
this.levelHead = value[0].levelHead
}
}
this.listLevelHead = value[0].levelHead
this.levelId = value[0].level
}
}).catch((err:Error)=>{
... ...
import {
PhotoListBean,
} from 'wdBean';
export class MyDataSource implements IDataSource {
private list: PhotoListBean[] = []
// private listener: DataChangeListener
constructor(list: PhotoListBean[]) {
this.list = list
}
totalCount(): number {
return this.list.length
}
getData(index: number): PhotoListBean {
return this.list[index]
}
getList(): PhotoListBean[] {
return this.list;
}
registerDataChangeListener(listener: DataChangeListener): void {
// this.listener = listener
}
unregisterDataChangeListener() {
}
}
\ No newline at end of file
... ...
... ... @@ -41,6 +41,8 @@ export struct DetailPlayVLivePage {
@Consume @Watch('closeFullScreen') pageHide: number
@Consume contentId: string
@State swiperIndex: number = 1
///是否展示清屏按钮
@State showClearButton: boolean = false
@Consume liveDetailPageLogic: LiveDetailPageLogic
@Provide lastInputedComment: LiveRoomItemBean = {} as LiveRoomItemBean // 上次输入的消息
//播放错误
... ... @@ -198,6 +200,7 @@ export struct DetailPlayVLivePage {
playerController: this.playerController,
swiperController: this.swiperController,
swiperIndex: $swiperIndex,
showClearButton: $showClearButton
})
// 直播资源加载失败
... ... @@ -241,7 +244,7 @@ export struct DetailPlayVLivePage {
Image($r('app.media.icon_live_more'))
.width(40)
.aspectRatio(1)
.visibility(this.swiperIndex === 0 ? Visibility.Visible : Visibility.Hidden)
.visibility(this.showClearButton ? Visibility.Visible : Visibility.Hidden)
.position({ x: '100%', y: '100%' })
.markAnchor({ x: 56, y: this.bottomSafeHeight })
.onClick(() => {
... ...
... ... @@ -130,13 +130,14 @@ export struct PlayUIComponent {
})
if (this.contentDetailData.liveInfo?.liveState != 'wait') {
//标题
Text(this.contentDetailData.newsTitle)
.maxLines(1)
.textOverflow({ overflow: TextOverflow.MARQUEE })
Marquee({
start:true,
loop: 1,
src:this.contentDetailData.newsTitle
})
.fontSize(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? '18vp' : '16vp')
.fontWeight(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL ? 600 : 500)
.fontColor(Color.White)
.textAlign(TextAlign.Start)
.layoutWeight(1)
} else {
Blank()
... ...
... ... @@ -10,9 +10,9 @@ export struct PlayerInfoComponent {
@Consume liveState: string
@Consume isShowControl: boolean
@Link swiperIndex: number
@Link showClearButton: boolean
@Provide isFullScreen: boolean = false // 判断是否全屏，全屏状态下swiper禁止切换
build() {
Column() {
Swiper(this.swiperController) {
... ... @@ -35,12 +35,23 @@ export struct PlayerInfoComponent {
this.isShowControl = !this.isShowControl
}
})
.onChange((index) => {
this.swiperIndex = index
.onGestureSwipe((index: number, extraInfo: SwiperAnimationEvent) => {
this.dealShowClearButton(index,extraInfo.currentOffset)
})
.onAnimationEnd((index: number, extraInfo: SwiperAnimationEvent) => {
this.dealShowClearButton(index,extraInfo.currentOffset)
})
.disableSwipe(this.isFullScreen)
}
.height('100%')
.width('100%')
}
dealShowClearButton(index:number, currentOffset: number) {
this.swiperIndex = index
if (index == 0) {
this.showClearButton = currentOffset >= 0;
}else if (index == 1) {
this.showClearButton = false
}
}
}
\ No newline at end of file
... ...
... ... @@ -304,7 +304,7 @@ export struct DetailPlayShortVideoPage {
}
showCommentListChanged() {
// console.log('DetailVideoListPage showCommentListChanged this.showCommentList', this.showCommentList)
console.log('DetailVideoListPage showCommentListChanged this.showCommentList', this.showCommentList)
if (this.showCommentList) {
this.playerWidth = px2vp(this.windowWidth)
// this.playerHeight = px2vp(this.windowWidth) / (16 / 9.0)
... ...
... ... @@ -9,15 +9,24 @@ import { ReportDeviceInfo } from './reportDeviceInfo/ReportDeviceInfo'
import { common } from '@kit.AbilityKit'
class LoginJumpHandler implements JumpInterceptorAction {
private logining = false
/// 说明是调用了跳转 WDRouterPage.loginPage 页面的行为
on(params?: object | undefined, singleMode?: boolean | undefined): boolean {
if (this.logining) {
return true
}
this.logining = true
HuaweiAuth.sharedInstance().fetchAnonymousPhone().then((anonymousPhone) => {
router.pushUrl({url: WDRouterPage.oneKeyLoginPage.url()})
this.logining = false
}).catch((error: string) => {
router.pushUrl({url: WDRouterPage.loginPage.url()})
this.logining = false
})
return true
}
... ...
... ... @@ -337,6 +337,7 @@ export struct MultiPictureDetailPageComponent {
.indicator(false)
.displayCount(1)
.loop(false)
.disableSwipe(!this.isEnableSwipe)
.effectMode(EdgeEffect.Spring)
.id('e_swiper_content')
.alignRules({
... ...