|
@@ -42,6 +42,7 @@ import { MessageEvents, util, worker, ErrorEvent, JSON } from '@kit.ArkTS';
|
|
|
import { Verify } from './Verify';
|
|
import { Verify } from './Verify';
|
|
|
import { taskpool } from '@kit.ArkTS';
|
|
import { taskpool } from '@kit.ArkTS';
|
|
|
import { RotatingCover } from './RotatingCover';
|
|
import { RotatingCover } from './RotatingCover';
|
|
|
|
|
+import { PointLightButton } from './PointLight/PointLightButton';
|
|
|
import { PlayConstants } from '../common/constants/PlayConstants';
|
|
import { PlayConstants } from '../common/constants/PlayConstants';
|
|
|
import { effectKit } from '@kit.ArkGraphics2D';
|
|
import { effectKit } from '@kit.ArkGraphics2D';
|
|
|
import { ColorConversion } from '../common/util/ColorConversion';
|
|
import { ColorConversion } from '../common/util/ColorConversion';
|
|
@@ -10451,6 +10452,20 @@ export struct LocalMusic {
|
|
|
.backgroundColor(Color.Transparent)
|
|
.backgroundColor(Color.Transparent)
|
|
|
.layoutWeight(1)
|
|
.layoutWeight(1)
|
|
|
|
|
|
|
|
|
|
+ // PointLightButton({
|
|
|
|
|
+ // builder: () => {
|
|
|
|
|
+ // this.PlayOrPauseButton()
|
|
|
|
|
+ // },
|
|
|
|
|
+ // isPx: true,
|
|
|
|
|
+ // builderHeight: 60,
|
|
|
|
|
+ // builderWidth: 60,
|
|
|
|
|
+ // })
|
|
|
|
|
+ // .layoutWeight(1)
|
|
|
|
|
+ // .onClick(() =>{
|
|
|
|
|
+ // this.playOrPause()
|
|
|
|
|
+ // })
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
|
|
|
Button({ type: ButtonType.Circle, stateEffect: true }) {
|
|
Button({ type: ButtonType.Circle, stateEffect: true }) {
|
|
|
Image($r('app.media.ic_next'))
|
|
Image($r('app.media.ic_next'))
|
|
@@ -10478,6 +10493,16 @@ export struct LocalMusic {
|
|
|
.margin({ bottom:this.isCoverOpacity()?0:15 })
|
|
.margin({ bottom:this.isCoverOpacity()?0:15 })
|
|
|
.justifyContent(FlexAlign.SpaceEvenly)
|
|
.justifyContent(FlexAlign.SpaceEvenly)
|
|
|
}
|
|
}
|
|
|
|
|
+ @Builder
|
|
|
|
|
+ PlayOrPauseButton(){
|
|
|
|
|
+ Image(this.CONTROL_PlayStatus === PlayStatus.PLAY ?
|
|
|
|
|
+ (this.isCircleBtn?$r('app.media.hm_pause'):$r('app.media.ic_public_play'))
|
|
|
|
|
+ : (this.isCircleBtn?$r('app.media.hm_play2'):$r('app.media.ic_public_pause')))
|
|
|
|
|
+ .width(this.isPhoneLan()?45:55)
|
|
|
|
|
+ .clickEffect({level:ClickEffectLevel.LIGHT, scale: 0.5})
|
|
|
|
|
+ .fillColor(Color.White)
|
|
|
|
|
+ .aspectRatio(CommonConstants.ASPECT_RATIO)
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
|
|
|
@Builder
|
|
@Builder
|
|
@@ -13682,13 +13707,14 @@ export struct LocalMusic {
|
|
|
|
|
|
|
|
this.updateSessionPlayState(true)
|
|
this.updateSessionPlayState(true)
|
|
|
this.setCurrentPlayMode()
|
|
this.setCurrentPlayMode()
|
|
|
|
|
+
|
|
|
|
|
+ if(startOffset&&startOffset>0){//cue分轨播放
|
|
|
|
|
+ this.seekTo(startOffset + "");
|
|
|
|
|
+ this.saveLastPlayList()
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
}, 500)
|
|
}, 500)
|
|
|
|
|
|
|
|
- if(startOffset&&startOffset>0){//cue分轨播放
|
|
|
|
|
- this.seekTo(startOffset + "");
|
|
|
|
|
- this.saveLastPlayList()
|
|
|
|
|
- return
|
|
|
|
|
- }
|
|
|
|
|
//rmvb和flac格式马上记忆播放会报错,会延迟1s在读取记忆播放。
|
|
//rmvb和flac格式马上记忆播放会报错,会延迟1s在读取记忆播放。
|
|
|
let timeoutPlay = 0
|
|
let timeoutPlay = 0
|
|
|
if (StrUtil.isNotEmpty(this.videoUrl) &&
|
|
if (StrUtil.isNotEmpty(this.videoUrl) &&
|