Compare commits
No commits in common. "cce66ee074538132c2c384ac05012eedde7a0f73" and "59b3c5639220c713731c21c9d015ecad01c84768" have entirely different histories.
cce66ee074
...
59b3c56392
@ -4,13 +4,13 @@
|
||||
{
|
||||
"name": "default",
|
||||
"material": {
|
||||
"certpath": "/Users/wangzhongjie/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.cer",
|
||||
"storePassword": "0000001BC865153A35BD7DDD2950D70622A2081C58D17D2F5BBE67AE83F469B41A05EED0BB09AA66043089",
|
||||
"certpath": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.cer",
|
||||
"storePassword": "0000001B0C5B52D8C8C6F415D4216EAD2848AA4A376B36FD72006E4072C15BA3D11E6E65C0D1FFA92A6D86",
|
||||
"keyAlias": "debugKey",
|
||||
"keyPassword": "0000001BB839AC92D8CB8AF4765ADD271E687C74C82EC1D0ED2072093ADB1E831C3E99148406836748BCD7",
|
||||
"profile": "/Users/wangzhongjie/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p7b",
|
||||
"keyPassword": "0000001B8DCA3C8913C86858A0CDEAEB6BEE0DC29FCE9932930CA1FFE68FFF84341736AADF81F056CDD683",
|
||||
"profile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p7b",
|
||||
"signAlg": "SHA256withECDSA",
|
||||
"storeFile": "/Users/wangzhongjie/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p12"
|
||||
"storeFile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p12"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
import {User} from "../pages/interfaces"
|
||||
// 候选人数据
|
||||
export const CandidateData: Array<User> = [
|
||||
{
|
||||
sfzmhm: '342323199501470011',
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
import { VideoConfig } from '../pages/interfaces'
|
||||
|
||||
// 视频配置默认数据
|
||||
export const VideoConfigData: VideoConfig = {
|
||||
videoNum: '1',
|
||||
spls: '1',
|
||||
wz: '0,0',
|
||||
faceFlag: false,
|
||||
shuiying: true,
|
||||
pztd: '2',
|
||||
ljlx: '',
|
||||
ip: '192.168.36.94',
|
||||
port: '554',
|
||||
userName: 'admin',
|
||||
pwd: '12345qwe',
|
||||
td1: '1',
|
||||
td2: '2',
|
||||
td3: '3',
|
||||
td4: '4',
|
||||
videoRecord1: false,
|
||||
videoRecord2: true,
|
||||
videoRecord3: false,
|
||||
videoRecord4: false,
|
||||
text1: '',
|
||||
text2: '',
|
||||
text3: '',
|
||||
dolt: '',
|
||||
fontSize: '',
|
||||
rlls: '1',
|
||||
spzd4: false,
|
||||
spzd3: false,
|
||||
spzd2: false,
|
||||
spzd1: false,
|
||||
zdyz: '5',
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
export * from "./CandidateData"
|
||||
|
||||
export * from "./VideoData"
|
||||
@ -13,7 +13,7 @@ import common from '@ohos.app.ability.common';
|
||||
import { User, VideoConfig } from './interfaces';
|
||||
import WebRTCVoice from './webRTC/';
|
||||
import promptAction from '@ohos.promptAction';
|
||||
import { CandidateData, EmptyCandidateObject } from '../mock';
|
||||
import { CandidateData, EmptyCandidateObject } from '../mock/CandidateData';
|
||||
import { getSyncData } from '../common/service/initable';
|
||||
|
||||
@Entry
|
||||
|
||||
@ -1,12 +1,10 @@
|
||||
import TopLogo from './compontents/topLogo';
|
||||
import FileUtil from '../common/utils/File';
|
||||
import { VideoConfig } from './interfaces';
|
||||
import TopLogo from './compontents/topLogo'
|
||||
import FileUtil from '../common/utils/File'
|
||||
import { VideoConfig } from './interfaces'
|
||||
import common from '@ohos.app.ability.common';
|
||||
import promptAction from '@ohos.promptAction';
|
||||
import { endRecordVideo, startRecordVideo, takePhoto } from '../common/service/videoService';
|
||||
import { GlobalConfig } from '../config/index';
|
||||
import { VideoConfigData } from '../mock';
|
||||
|
||||
import promptAction from '@ohos.promptAction'
|
||||
import { startRecordVideo, endRecordVideo,takePhoto } from '../common/service/videoService'
|
||||
import { GlobalConfig } from '../config/index'
|
||||
@Entry
|
||||
@Component
|
||||
struct Index {
|
||||
@ -15,37 +13,100 @@ struct Index {
|
||||
@State previewUri: Resource = $r('app.media.2_nor')
|
||||
@State curRate: PlaybackSpeed = PlaybackSpeed.Speed_Forward_1_00_X
|
||||
@State inputFontSize: number = 10 //12
|
||||
@State rocordHandleObj: any = {
|
||||
rocord_handle1: 0,
|
||||
rocord_handle2: 0,
|
||||
rocord_handle3: 0,
|
||||
rocord_handle4: 0
|
||||
@State rocordHandleObj:any = {
|
||||
rocord_handle1:0,
|
||||
rocord_handle2:0,
|
||||
rocord_handle3:0,
|
||||
rocord_handle4:0
|
||||
}
|
||||
@State isAutoPlay: boolean = true
|
||||
@State showFlag: boolean = false
|
||||
private vocObj = null;
|
||||
@State showControls: boolean = false
|
||||
private fileUtil: FileUtil
|
||||
@State @Watch('outClick') outFlag: boolean = false;
|
||||
@State oldParam: VideoConfig = VideoConfigData
|
||||
@State param: VideoConfig = VideoConfigData
|
||||
@State oldParam: VideoConfig = {
|
||||
videoNum:'1',
|
||||
spls: '1',
|
||||
wz: '0,0',
|
||||
faceFlag: false,
|
||||
shuiying: true,
|
||||
pztd: '2',
|
||||
ljlx: '',
|
||||
ip: '192.168.36.94',
|
||||
port: '554',
|
||||
userName: 'admin',
|
||||
pwd: '12345qwe',
|
||||
td1: '1',
|
||||
td2: '2',
|
||||
td3: '3',
|
||||
td4: '4',
|
||||
videoRecord1: false,
|
||||
videoRecord2: true,
|
||||
videoRecord3: false,
|
||||
videoRecord4: false,
|
||||
text1: '',
|
||||
text2: '',
|
||||
text3: '',
|
||||
dolt: '',
|
||||
fontSize: '',
|
||||
rlls: '1',
|
||||
spzd4:false,
|
||||
spzd3:false,
|
||||
spzd2:false,
|
||||
spzd1:false,
|
||||
zdyz:'5',
|
||||
}
|
||||
@State param: VideoConfig = {
|
||||
videoNum:'1',
|
||||
spls: '1',
|
||||
wz: '0,0',
|
||||
faceFlag: false,
|
||||
shuiying: true,
|
||||
pztd: '2',
|
||||
ljlx: '',
|
||||
ip: '192.168.36.94',
|
||||
port: '554',
|
||||
userName: 'admin',
|
||||
pwd: '12345qwe',
|
||||
td1: '1',
|
||||
td2: '2',
|
||||
td3: '3',
|
||||
td4: '4',
|
||||
videoRecord1: false,
|
||||
videoRecord2: true,
|
||||
videoRecord3: false,
|
||||
videoRecord4: false,
|
||||
text1: '',
|
||||
text2: '',
|
||||
text3: '',
|
||||
dolt: '',
|
||||
fontSize: '',
|
||||
rlls: '1',
|
||||
spzd4:false,
|
||||
spzd3:false,
|
||||
spzd2:false,
|
||||
spzd1:false,
|
||||
zdyz:'5',
|
||||
}
|
||||
@State openFlag: boolean = true
|
||||
@State lsArr: Array<any> = [
|
||||
{ key: '第一路' },
|
||||
{ key: '第二路' },
|
||||
{ key: '第三路' },
|
||||
{ key: '第四路' },
|
||||
{key:'第一路'},
|
||||
{key:'第二路'},
|
||||
{key:'第三路'},
|
||||
{key:'第四路'},
|
||||
]
|
||||
private vocObj = null;
|
||||
private fileUtil: FileUtil
|
||||
|
||||
private context = getContext(this) as common.UIAbilityContext;
|
||||
private controller1: VideoController = new VideoController()
|
||||
private controller2: VideoController = new VideoController()
|
||||
private controller3: VideoController = new VideoController()
|
||||
private controller4: VideoController = new VideoController()
|
||||
@State videoArr: Array<any> = [
|
||||
{ td: 'td1', controller: this.controller1, src: '' },
|
||||
{ td: 'td2', controller: this.controller2, src: '' },
|
||||
{ td: 'td3', controller: this.controller3, src: '' },
|
||||
{ td: 'td4', controller: this.controller4, src: '' },
|
||||
{td:'td1',controller:this.controller1,src:''},
|
||||
{td:'td2',controller:this.controller2,src:''},
|
||||
{td:'td3',controller:this.controller3,src:''},
|
||||
{td:'td4',controller:this.controller4,src:''},
|
||||
]
|
||||
private inputController: TextInputController = new TextInputController()
|
||||
|
||||
@ -53,8 +114,8 @@ struct Index {
|
||||
Column() {
|
||||
TopLogo({ outFlag: $outFlag })
|
||||
Flex({ justifyContent: FlexAlign.SpaceBetween }) {
|
||||
Flex({ wrap: FlexWrap.Wrap, direction: FlexDirection.Row }) {
|
||||
ForEach(this.videoArr, (item, index) => {
|
||||
Flex({wrap:FlexWrap.Wrap,direction:FlexDirection.Row}) {
|
||||
ForEach(this.videoArr,(item,index)=>{
|
||||
Video({
|
||||
src: this.openFlag ? `rtsp://${this.param.userName}:${this.param.pwd}@${this.param.ip}:${this.param.port}/h264/ch${this.param[item.td]}/main/av_stream` : '',
|
||||
currentProgressRate: this.curRate,
|
||||
@ -67,7 +128,7 @@ struct Index {
|
||||
.controls(this.showControls)
|
||||
.margin(10 * this.ratio)
|
||||
})
|
||||
}.margin({ top: 37 * this.ratio, left: 30 * this.ratio }).width(600 * this.ratio).height(600 * this.ratio)
|
||||
}.margin({ top: 37 * this.ratio, left: 30 * this.ratio }).width(600*this.ratio).height(600*this.ratio)
|
||||
|
||||
Column() {
|
||||
Image($r('app.media.shezhi'))
|
||||
@ -109,7 +170,7 @@ struct Index {
|
||||
.margin({ bottom: 10 * this.ratio })
|
||||
.onClick(() => {
|
||||
for (let i = 1; i <= 4; i++) {
|
||||
console.log('rocord_handle', i, JSON.stringify(this.rocordHandleObj))
|
||||
console.log('rocord_handle',i,JSON.stringify(this.rocordHandleObj))
|
||||
if (this.rocordHandleObj['rocord_handle'+i]) {
|
||||
endRecordVideo(this.rocordHandleObj['rocord_handle'+i])
|
||||
this.rocordHandleObj['rocord_handle'+i] = 0
|
||||
@ -124,16 +185,16 @@ struct Index {
|
||||
.width(215 * this.ratio)
|
||||
.height(64 * this.ratio)
|
||||
.onClick(async () => {
|
||||
const arr = ['1', '2', '3', '4']
|
||||
if (!arr.includes(this.param.pztd)) {
|
||||
const arr=['1','2','3','4']
|
||||
if(!arr.includes(this.param.pztd)){
|
||||
promptAction.showToast({
|
||||
message: '请填写正确的拍照通道',
|
||||
duration: 3000
|
||||
})
|
||||
return
|
||||
}
|
||||
try {
|
||||
await takePhoto(this.param, this.context, 'pz/')
|
||||
try{
|
||||
await takePhoto(this.param,this.context,'pz/')
|
||||
promptAction.showToast({
|
||||
message: '抓图完成',
|
||||
duration: 3000
|
||||
@ -142,8 +203,8 @@ struct Index {
|
||||
// console.log('daihai err: ' + err)
|
||||
// })
|
||||
|
||||
} catch (error) {
|
||||
console.log('daihai', error)
|
||||
}catch (error){
|
||||
console.log('daihai',error)
|
||||
}
|
||||
|
||||
})
|
||||
@ -258,10 +319,9 @@ struct Index {
|
||||
.width(34 * this.ratio)
|
||||
.height(26 * this.ratio)
|
||||
.fontSize(this.inputFontSize * this.ratio)
|
||||
.margin({ left: 10 * this.ratio, right: 15 * this.ratio })
|
||||
.onChange((value: string) => {
|
||||
this.param.zdyz = value
|
||||
})
|
||||
.margin({ left: 10 * this.ratio, right: 15 * this.ratio }).onChange((value: string) => {
|
||||
this.param.zdyz = value
|
||||
})
|
||||
// Text('k').fontColor('#333333').fontSize(16 * this.ratio)
|
||||
// Text('链接类型').fontColor('#333333').fontSize(16 * this.ratio)
|
||||
// TextInput({ text: this.param.ljlx, controller: this.inputController })
|
||||
@ -279,7 +339,6 @@ struct Index {
|
||||
Row() {
|
||||
Row() {
|
||||
}.width(70 * this.ratio)
|
||||
|
||||
Text('IP地址')
|
||||
.width(158 * this.ratio)
|
||||
.fontSize(16 * this.ratio)
|
||||
@ -312,7 +371,7 @@ struct Index {
|
||||
.textAlign(TextAlign.Center)
|
||||
}
|
||||
|
||||
ForEach(this.lsArr, (item, index) => {
|
||||
ForEach(this.lsArr,(item,index)=>{
|
||||
Row() {
|
||||
Text(item.key)
|
||||
.width(70 * this.ratio)
|
||||
@ -330,7 +389,7 @@ struct Index {
|
||||
.onChange((value: string) => {
|
||||
this.param.ip = value
|
||||
})
|
||||
TextInput({ text: this.param['td'+(Number(index) + 1)], controller: this.inputController })
|
||||
TextInput({ text: this.param['td'+(Number(index)+1)], controller: this.inputController })
|
||||
.type(InputType.Normal)
|
||||
.borderRadius(2)
|
||||
.width(96 * this.ratio)
|
||||
@ -339,7 +398,7 @@ struct Index {
|
||||
.margin({ right: 10 * this.ratio })
|
||||
.fontSize(this.inputFontSize * this.ratio)
|
||||
.onChange((value: string) => {
|
||||
this.param['td'+(Number(index) + 1)] = value
|
||||
this.param['td'+(Number(index)+1)] = value
|
||||
})
|
||||
TextInput({ text: this.param.userName, controller: this.inputController })
|
||||
.type(InputType.Normal)
|
||||
@ -439,7 +498,7 @@ struct Index {
|
||||
.width(22 * this.ratio)
|
||||
.height(22 * this.ratio)
|
||||
.onChange((value: boolean) => {
|
||||
this.param.spzd1 = value
|
||||
this.param.spzd1=value
|
||||
})
|
||||
Text('一路').fontSize(16 * this.ratio).fontColor('#333333')
|
||||
Checkbox({ name: 'checkbox1', group: 'checkboxGroup' })
|
||||
@ -447,7 +506,7 @@ struct Index {
|
||||
.width(22 * this.ratio)
|
||||
.height(22 * this.ratio)
|
||||
.onChange((value: boolean) => {
|
||||
this.param.spzd2 = value
|
||||
this.param.spzd2=value
|
||||
})
|
||||
Text('二路').fontSize(16 * this.ratio).fontColor('#333333')
|
||||
}
|
||||
@ -458,7 +517,7 @@ struct Index {
|
||||
.width(22 * this.ratio)
|
||||
.height(22 * this.ratio)
|
||||
.onChange((value: boolean) => {
|
||||
this.param.spzd3 = value
|
||||
this.param.spzd3=value
|
||||
})
|
||||
Text('三路').fontSize(16 * this.ratio).fontColor('#333333')
|
||||
Checkbox({ name: 'checkbox1', group: 'checkboxGroup' })
|
||||
@ -466,7 +525,7 @@ struct Index {
|
||||
.width(22 * this.ratio)
|
||||
.height(22 * this.ratio)
|
||||
.onChange((value: boolean) => {
|
||||
this.param.spzd4 = value
|
||||
this.param.spzd4=value
|
||||
})
|
||||
Text('四路').fontSize(16 * this.ratio).fontColor('#333333')
|
||||
}
|
||||
@ -561,31 +620,27 @@ struct Index {
|
||||
this.fileUtil = fileUtil
|
||||
this.getVideoConfig()
|
||||
}
|
||||
|
||||
async getfilehandleCode(td) {
|
||||
const record_handle = await startRecordVideo(this.param, td, this.context, 'lp')
|
||||
this.rocordHandleObj['rocord_handle'+td] = record_handle
|
||||
async getfilehandleCode(td){
|
||||
const record_handle = await startRecordVideo(this.param,td,this.context,'lp')
|
||||
this.rocordHandleObj['rocord_handle'+td]=record_handle
|
||||
}
|
||||
|
||||
outClick() {
|
||||
this.openFlag = false
|
||||
}
|
||||
|
||||
sleep = (delay) => new Promise((resolve) => setTimeout(resolve, delay))
|
||||
|
||||
async onPageShow() {
|
||||
}
|
||||
|
||||
async getVideoConfig() {
|
||||
const data = await this.fileUtil.readFile(GlobalConfig.comoonfileWriteAddress + '/config/config3.txt');
|
||||
const data = await this.fileUtil.readFile(GlobalConfig.comoonfileWriteAddress+'/config/config3.txt');
|
||||
this.oldParam = JSON.parse(data)
|
||||
this.param = JSON.parse(data)
|
||||
}
|
||||
|
||||
async writeConfig() {
|
||||
this.oldParam = JSON.parse(JSON.stringify(this.param))
|
||||
this.videoArr = JSON.parse(JSON.stringify(this.videoArr))
|
||||
console.log('kkkk', JSON.stringify(this.param))
|
||||
this.videoArr=JSON.parse(JSON.stringify(this.videoArr))
|
||||
console.log('kkkk',JSON.stringify(this.param))
|
||||
const folderPath = await this.fileUtil.initFolder(`/config`);
|
||||
this.fileUtil.addFile(`${folderPath}/config3.txt`, JSON.stringify(this.param), 'overWrite')
|
||||
this.showFlag = false
|
||||
|
||||
@ -75,12 +75,12 @@
|
||||
{
|
||||
"name": "ohos.permission.MEDIA_LOCATION"
|
||||
},
|
||||
{
|
||||
"name": "ohos.permission.WRITE_MEDIA"
|
||||
},
|
||||
{
|
||||
"name": "ohos.permission.READ_MEDIA"
|
||||
},
|
||||
{
|
||||
"name": "ohos.permission.WRITE_MEDIA"
|
||||
},
|
||||
{
|
||||
"name": "ohos.permission.READ_MEDIA"
|
||||
},
|
||||
{
|
||||
"name": "ohos.permission.WRITE_IMAGEVIDEO",
|
||||
"usedScene": {
|
||||
@ -99,26 +99,26 @@
|
||||
"when": "always"
|
||||
}
|
||||
},
|
||||
// {
|
||||
// "name": "ohos.permission.READ_MEDIA",
|
||||
// "reason": "$string:module_desc",
|
||||
// "usedScene": {
|
||||
// "abilities": [
|
||||
// "MainAbility"
|
||||
// ],
|
||||
// "when": "always"
|
||||
// }
|
||||
// },
|
||||
// {
|
||||
// "name": "ohos.permission.WRITE_MEDIA",
|
||||
// "reason": "$string:module_desc",
|
||||
// "usedScene": {
|
||||
// "abilities": [
|
||||
// "MainAbility"
|
||||
// ],
|
||||
// "when": "always"
|
||||
// }
|
||||
// },
|
||||
// {
|
||||
// "name": "ohos.permission.READ_MEDIA",
|
||||
// "reason": "$string:module_desc",
|
||||
// "usedScene": {
|
||||
// "abilities": [
|
||||
// "MainAbility"
|
||||
// ],
|
||||
// "when": "always"
|
||||
// }
|
||||
// },
|
||||
// {
|
||||
// "name": "ohos.permission.WRITE_MEDIA",
|
||||
// "reason": "$string:module_desc",
|
||||
// "usedScene": {
|
||||
// "abilities": [
|
||||
// "MainAbility"
|
||||
// ],
|
||||
// "when": "always"
|
||||
// }
|
||||
// },
|
||||
{
|
||||
"name": "ohos.permission.FILE_ACCESS_MANAGER",
|
||||
"reason": "$string:module_desc",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user