developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
王士厅
554efa06 2 parents a3a30e5b 769712b7

Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

Inline Side-by-side
Showing 8 changed files with 95 additions and 44 deletions
... ... @@ -13,6 +13,7 @@ import { CommonConstants } from 'wdConstant/Index';
import { ProcessUtils } from 'wdRouter/Index';
import { TrackConstants, TrackingButton, TrackingPageBrowse } from 'wdTracking/Index';
import inputMethod from '@ohos.inputMethod';
import { photoPickerUtils } from '../utils/PhotoPickerUtils';
const TAG = 'FeedBackActivity'
... ... @@ -163,15 +164,15 @@ export struct FeedBackActivity {
GridCol({
}) {
if(1 == feedbackImageItem.itemType){
// Image($r('app.media.feekback_add'))
// .width(60)
// .height(60)
// .onClick(async (event: ClickEvent) => {
// if(await FastClickUtil.isMinDelayTime()){
// return
// }
// this.callFilePickerSelectImage();
// })
Image($r('app.media.feekback_add'))
.width(60)
.height(60)
.onClick(async (event: ClickEvent) => {
if(await FastClickUtil.isMinDelayTime()){
return
}
this.callFilePickerSelectImage();
})
}else{
Stack({alignContent: Alignment.TopEnd}) {
Image(feedbackImageItem.picPath)
... ... @@ -347,20 +348,9 @@ export struct FeedBackActivity {
async callFilePickerSelectImage(): Promise<void> { // async 用于申明一个 function 是异步的
let array: string[];
try {
// 设置photoPicker的参数
let PhotoSelectOptions = new picker.PhotoSelectOptions();
PhotoSelectOptions.MIMEType = picker.PhotoViewMIMETypes.IMAGE_TYPE; // 过滤选择媒体文件类型
let max = 3-this.pics.length+1
PhotoSelectOptions.maxSelectNumber = max; // 选择媒体文件的最大数目
let mediaFlag = false;
let photoPicker = new picker.PhotoViewPicker(); // 使用图库选择器对象前，需要先创建PhotoViewPicker实例
photoPicker.select(PhotoSelectOptions).then((PhotoSelectResult) => {
Logger.info(TAG, 'PhotoViewPicker.select successfully, PhotoSelectResult uri: ' + JSON.stringify(PhotoSelectResult)); // 日志中记录成功信息
if (PhotoSelectResult !== null && PhotoSelectResult !== undefined) { // 接口采用callback异步返回形式，返回PhotoSelectResult对象，故进行下一步操作前要先判断是否已经成功返回PhotoSelectResult对象了
// PhotoSelectResult为返回的结果集。
// 其中包含Array<string>类型的photoUris，为返回图库选择后的媒体文件的uri数组；还包含boolean类型的isOriginalPhoto，指示返回图库选择后的媒体文件是否为原图。
// 声明变量array，其取值为PhotoSelectResult中的数组。
photoPickerUtils.getPhotoPicker(3).then(PhotoSelectResult => {
if (PhotoSelectResult) {
array = PhotoSelectResult['photoUris'];
let beforeLen = this.pics.length + array.length;
let totalLen = this.pics.length+array.length;
... ... @@ -396,9 +386,6 @@ export struct FeedBackActivity {
this.getFilenameByUriForMedia(array);
}
})
.catch((err: BusinessError) => {
Logger.error(TAG, 'PhotoViewPicker.select failed with err: ' + JSON.stringify(err));
});
} catch (err) {
Logger.error(TAG, 'PhotoViewPicker failed with err: ' + err);
}
... ...
... ... @@ -7,7 +7,7 @@ import {AreaPickerDialog} from '../view/areaPickerDialog/AreaPickerDialog'
import {EditUserInfoCustomDialog} from '../view/areaPickerDialog/EditUserInfoCustomDialog'
import {EditUserSexCustomDialog} from '../view/areaPickerDialog/EditUserSexCustomDialog'
import {CustomDialogUI} from '../view/areaPickerDialog/CustomDialogUI'
import {AreaListModel } from '../../model/AreaListModel';
import { AreaListManageModel, AreaListModel } from '../../model/AreaListModel';
import router from '@ohos.router';
import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
import { TrackConstants } from 'wdTracking/Index';
... ... @@ -34,11 +34,16 @@ struct EditUserInfoPage {
dialogController: CustomDialogController = new CustomDialogController({
builder: AreaPickerDialog({dataSource:this.dataSource,firstSelect:this.firstSelect,secondSelect:this.secondSelect,thirdSelect:this.thirdSelect,
confirmCallback:(province:string,city:string,county:string,address:string)=>{
this.currentUserInfo.userExtend.province = province;
this.currentUserInfo.userExtend.city = city;
this.currentUserInfo.userExtend.county = county;
confirmCallback:(province:AreaListManageModel,city:AreaListManageModel,county:AreaListManageModel,address:string)=>{
this.currentUserInfo.userExtend.province = province.label;
this.currentUserInfo.userExtend.city = city.label;
this.currentUserInfo.userExtend.county = county.label;
this.currentUserInfo.userExtend.address = address;
this.currentUserInfo.userExtend.provinceCode = province.code;
this.currentUserInfo.userExtend.cityCode = city.code;
this.currentUserInfo.userExtend.districtCode = county.code;
this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_region
this.updateEditModel()
this.getAreaIndex()
... ... @@ -93,9 +98,9 @@ struct EditUserInfoPage {
pickerSelect(index:number){
if (index === 0) {
photoPickerUtils.getPhotoPicker().then(value => {
if (value.length > 0) {
this.headerImg = value
photoPickerUtils.getPhotoPicker(1).then(value => {
if (value) {
this.headerImg = value['photoUris'][0]
}
})
}else {
... ... @@ -115,7 +120,6 @@ struct EditUserInfoPage {
}
this.getAccountOwnerInfo()
this.getAreaList()
}
onPageShow(){
... ... @@ -280,6 +284,7 @@ struct EditUserInfoPage {
this.currentUserInfo = editModel as editModel;
this.listData.push(...EditInfoViewModel.getEditListInfo(editModel))
});
this.getAreaList()
}else {
EditInfoViewModel.queryPeopleAccountOwnerInfo(getContext(this)).then((peopleItem) => {
EditInfoViewModel.queryAccountOwnerInfo(getContext(this)).then((editM) => {
... ... @@ -290,6 +295,7 @@ struct EditUserInfoPage {
this.currentUserInfo = editM as editModel;
this.listData.push(...EditInfoViewModel.getEditListInfo(editM))
});
this.getAreaList()
});
}
}
... ...
... ... @@ -17,7 +17,7 @@ export struct AreaPickerDialog {
secondSelect:number = 0
thirdSelect:number = 0
confirmCallback: (province:string,city:string,county:string,address:string) => void = () => {
confirmCallback: (province:AreaListManageModel,city:AreaListManageModel,county:AreaListManageModel,address:string) => void = () => {
}
... ... @@ -43,7 +43,7 @@ export struct AreaPickerDialog {
Button('提交',{type:ButtonType.Normal})
.onClick(()=> {
this.controller.close()
this.confirmCallback(this.currentFirst.label,this.currentSecondBean.label,this.currentThirdBean.label,this.currentFirst.label+this.currentSecondBean.label+this.currentThirdBean.label);
this.confirmCallback(this.currentFirst,this.currentSecondBean,this.currentThirdBean,this.currentFirst.label+this.currentSecondBean.label+this.currentThirdBean.label);
})
.width(60)
.backgroundColor(0xffffff)
... ...
... ... @@ -39,11 +39,17 @@ export class EditInfoModel{
address:string = ''
//生日
birthday:string = ''
creatorId:string = ''
//性别
sex:number = 0
airec:number = 0
districtCode:string = ''
provinceCode:string = ''
cityCode:string = ''
}
export class editModel{
... ... @@ -84,6 +90,14 @@ export interface editModelParams {
birthday?:string;
//性别
sex?:string;
///人民号
name?: string;
districtCode?:string;
countryCode?:string;
provinceCode?:string;
cityCode?:string;
creatorId?:string;
}
... ...
... ... @@ -11,20 +11,20 @@ const PERMISSIONS: Array<Permissions> = [
export class PhotoPickerUtils {
async getPhotoPicker(){
async getPhotoPicker(maxSelectNumber:number){
this.pickerPermissions()
let PhotoSelectOptions = new picker.PhotoSelectOptions();
PhotoSelectOptions.MIMEType = picker.PhotoViewMIMETypes.IMAGE_TYPE; // 过滤选择媒体文件类型
PhotoSelectOptions.maxSelectNumber = 1; // 选择媒体文件的最大数目
PhotoSelectOptions.maxSelectNumber = maxSelectNumber; // 选择媒体文件的最大数目
let photoPicker = new picker.PhotoViewPicker(); // 使用图库选择器对象前，需要先创建PhotoViewPicker实例
return new Promise<string>((success, fail) => {
return new Promise<picker.PhotoSelectResult>((success, fail) => {
photoPicker.select(PhotoSelectOptions).then((PhotoSelectResult) => {
if (PhotoSelectResult !== null && PhotoSelectResult !==
undefined) {
// 接口采用callback异步返回形式，返回PhotoSelectResult对象，故进行下一步操作前要先判断是否已经成功返回PhotoSelectResult对象了
success(PhotoSelectResult['photoUris'][0])
success(PhotoSelectResult)
}
})
})
... ...
... ... @@ -139,6 +139,8 @@ class EditInfoViewModel {
}
updateUserInfo(item:editModel):Promise<ResponseDTO> {
if (item.userType === 1){
if (item.editDataType == WDEditDataModelType.WDEditDataModelType_head) {
} else if (item.editDataType == WDEditDataModelType.WDEditDataModelType_nickname) {
this.params = { userName: item.userName }
... ... @@ -171,6 +173,41 @@ class EditInfoViewModel {
promptAction.showToast({ message: error.message })
})
})
}else {
let url = ''
if (item.editDataType == WDEditDataModelType.WDEditDataModelType_head) {
url = '/api/rmrb-creator-user/c/rmrb-creator-user/creator/updateIcon'
} else if (item.editDataType == WDEditDataModelType.WDEditDataModelType_nickname) {
this.params = { name: item.userName}
url = '/api/rmrb-creator-user/c/rmrb-creator-user/creator/updateName'
} else if (item.editDataType == WDEditDataModelType.WDEditDataModelType_intro) {
this.params = { introduction: item.userExtend.introduction }
url = '/api/rmrb-creator-user/c/rmrb-creator-user/creator/updateIntroduction'
} else if (item.editDataType == WDEditDataModelType.WDEditDataModelType_region) {
this.params = {provinceCode:item.userExtend.provinceCode,cityCode:item.userExtend.cityCode, districtCode: item.userExtend.districtCode ,countryCode:'86'}
url = '/api/rmrb-creator-user/c/rmrb-creator-user/creator/updateArea'
}
this.params.creatorId = item.userExtend.creatorId
return new Promise((success, error) => {
this.BasePostRequest(url,this.params)
.then((navResDTO: ResponseDTO) => {
if (navResDTO.code == 0) {
promptAction.showToast({ message: '您的资料已提交' })
success(navResDTO)
}else {
promptAction.showToast({ message: navResDTO.message })
}
})
.catch((error: Error) => {
Logger.info(TAG,'updateUserInfo','EditInfoViewModel')
promptAction.showToast({ message: error.message })
})
})
}
}
}
... ...
... ... @@ -95,7 +95,7 @@ export class BackgroundAudioController {
let metadata: AVSessionManager.AVMetadata = {
assetId: assetId.length > 0 ? assetId : "fake-asset-id",
title: title.length > 0 ? title : " ",
mediaImage: pixelMapImage ?? ("file://" + mediaImage.id),
mediaImage: "https://cdnjdphoto.aikan.pdnews.cn/WapApi/800/launcher_icon.png" ,//pixelMapImage ?? ("file://" + mediaImage.id),
artist: artist.length > 0 ? artist : "人日日报",
duration: duration
};
... ... @@ -155,11 +155,14 @@ export class BackgroundAudioController {
//设置进度，单位ms
async setSessionPlayProgress(progressDuration: number, totalDuration: number) {
this.setSessionPlayProgressForce(progressDuration, totalDuration, false)
}
async setSessionPlayProgressForce(progressDuration: number, totalDuration: number, force: boolean) {
if (totalDuration <= 0) {
return
}
let newProgress = progressDuration / totalDuration
if (Math.abs(newProgress - this.lastProgress) < 0.01) {
if (force == false && Math.abs(newProgress - this.lastProgress) < 0.01) {
return
}
// Logger.debug(TAG, `set progress: ` + progressDuration + " duration: " + totalDuration);
... ... @@ -177,7 +180,7 @@ export class BackgroundAudioController {
this.lastItemAssetId = undefined
}
if (this.hasSetupProgress) {
if (force == false && this.hasSetupProgress) {
return
}
this.hasSetupProgress = true
... ... @@ -255,9 +258,9 @@ export class BackgroundAudioController {
} else {
Logger.debug(TAG, `SetAVPlaybackState seek buffering`);
}
// 应用响应seek命令，使用应用内播放器完成seek实现
this.avplayerController?.setSeekMicroSecondsTime(position)
this.setSessionPlayProgressForce(position, this.lastItemTotalDuration, true)
setTimeout(() => {
this.hasSetupProgress = false
}, 1000)
... ...
... ... @@ -342,6 +342,10 @@ export class WDPlayerController {
return;
}
this.avPlayer?.seek(value);
if (this.status == PlayerConstants.STATUS_PAUSE) {
this.avPlayer?.play()
}
}
setBright() {
... ...