From ed0858a5c0c28b533691feeff489e3c5990ef163 Mon Sep 17 00:00:00 2001 From: Surenjun Date: Thu, 16 May 2024 11:19:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ets/common/service/terminalService.ts | 3 +- entry/src/main/ets/config/global.ts | 3 +- entry/src/main/ets/pages/Judge.ets | 2 +- entry/src/main/ets/pages/Settings.ets | 2 +- entry/src/main/ets/pages/TerminalInfo.ets | 169 ------------------ .../{TeminalInfos.ets => TerminalInfos.ets} | 0 entry/src/main/module.json5 | 3 - .../resources/base/profile/main_pages.json | 2 +- 8 files changed, 6 insertions(+), 178 deletions(-) delete mode 100644 entry/src/main/ets/pages/TerminalInfo.ets rename entry/src/main/ets/pages/{TeminalInfos.ets => TerminalInfos.ets} (100%) diff --git a/entry/src/main/ets/common/service/terminalService.ts b/entry/src/main/ets/common/service/terminalService.ts index 548dfc9c..3532294d 100644 --- a/entry/src/main/ets/common/service/terminalService.ts +++ b/entry/src/main/ets/common/service/terminalService.ts @@ -6,7 +6,8 @@ import { getSyncData } from '../../common/service/initable' //获取设备信息 export async function getDeviceInfo() { - globalThis.deviceNo = 'WI202306089136'; //设备489mac + globalThis.deviceNo = 'HM-AC76'; //科目三设备 + // globalThis.deviceNo = 'J43405J003101'; //科目二设备 // globalThis.deviceNo = '00-E2-69-0A-9F-6E'; //设备mac // // globalThis.deviceNo = 'FE-FC-FE-7C-5C-77'; //设备mac // globalThis.diskId = '1231231231'; //硬盘号 diff --git a/entry/src/main/ets/config/global.ts b/entry/src/main/ets/config/global.ts index ce96a923..78982eb0 100644 --- a/entry/src/main/ets/config/global.ts +++ b/entry/src/main/ets/config/global.ts @@ -7,9 +7,8 @@ * @Email: shutdown0630@163.com */ export const GlobalConfig={ - comoonfileWriteAddress:'/mnt/hmdfs/100/account/device_view/localfiles/files', + comoonfileWriteAddress:'/mnt/hmdfs/100/account/device_view/local/files', picSavePath:'/storage/cloud/100/files/Photo/', videoSavePath:'/storage/cloud/100/files/Videos/', - // host:'http://192.168.36.2:8083' host:'http://112.80.35.83:11052' } \ No newline at end of file diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index 9eec31c1..fd74671c 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -841,7 +841,7 @@ struct Index { @State cdsbInfoObj: CDSBInfo = {} @State timer: number = 0 @State judgeConfig: {[k:string]:string}[] = [] - @State judgeConfigObj: {[k:string]:string} = defaultJudgeConfigObj + @State judgeConfigObj: {[k:string]:any} = defaultJudgeConfigObj //流水号 @State lsh: string = '' diff --git a/entry/src/main/ets/pages/Settings.ets b/entry/src/main/ets/pages/Settings.ets index 7d2ba739..01ce4a16 100644 --- a/entry/src/main/ets/pages/Settings.ets +++ b/entry/src/main/ets/pages/Settings.ets @@ -30,7 +30,7 @@ struct Index { },router.RouterMode.Single); }) Image($r('app.media.setting_xtts')).width('30.5%').height('74%').onClick(()=>{ - this.url='pages/TeminalInfos' + this.url='pages/TerminalInfos' router.pushUrl({ url: this.url, },router.RouterMode.Single); diff --git a/entry/src/main/ets/pages/TerminalInfo.ets b/entry/src/main/ets/pages/TerminalInfo.ets deleted file mode 100644 index c49d70ce..00000000 --- a/entry/src/main/ets/pages/TerminalInfo.ets +++ /dev/null @@ -1,169 +0,0 @@ -import router from '@ohos.router' -import TopLogo from './compontents/topLogo' -import ethernet from '@ohos.net.ethernet'; -import prompt from '@ohos.prompt' -import { upDateTableByArray} from '../common/service/initable' -import { getSyncData} from '../common/service/initable' -import { voiceService } from '../common/service/voiceService' -import { GlobalConfig } from '../config/index' -@Entry -@Component -struct Index { - @State textList1: string[] = ['中心服务器IP：','中心响应端口','前置机IP','响应端口', '子网掩码','默认网关','用户名：', '密码：','dns','差分服务器IP: ', '响应端口：','后置机IP','响应端口','tcp客户端端口'] - // @State textList2: string[] = [] - @State ratio: number = 1700 / 960 - @State inputFontSize:number=12 //12 - // - // @State inputTextList1: string[] = ['192.168.7.170','8084','192.168.7.170','20122','255.255.255.0','192.168.7.1','','','114.114.114.114','112.80.35.83','11055' + - // '',] - // @State inputTextList2: string[] = ['192.168.7.124','20022'] - - - @State inputTextList1: string[] = ['122.80.35.83','8083','192.168.7.170','20122','255.255.255.0','192.168.7.1','','','114.114.114.114','192.168.7.1','8000','192.168.7.124','20022','8083'] - // @State inputTextList2: string[] = [] - // 112.80.35.83 11052 - // @State inputTextList1: string[] = ['192.168.36.2','8084','192.168.36.200','20122','255.255.255.0','192.168.36.1','','','114.114.114.114','192.168.36.139','8000'] - // @State inputTextList2: string[] = ['192.168.36.139','20022'] - - - - - @State @Watch('outClick') outFlag: boolean = false; - private vocObj = null; - scroller: Scroller = new Scroller() - build() { - Column() { - TopLogo({outFlag:$outFlag}) - Column() { - Column() { - Scroll(this.scroller){ - Flex({'wrap':FlexWrap.Wrap}) { - ForEach(this.textList1, (item:string, index:number) => { - Row() { - Text(item) - .width('40%') - .height('100%') - .fontColor('#E5CBA1') - .padding({'left': '35px'}) - .fontSize(this.inputFontSize*this.ratio) - TextInput({'text':this.inputTextList1[index]?this.inputTextList1[index]: ''}) - .width('50%') - .height('60%') - .fontColor('#fff') - .borderColor('#E6E0D8') - .borderRadius('10px') - .borderWidth('2px') - .fontSize(this.inputFontSize*this.ratio) - .padding({top:0,bottom:0}) - .linearGradient({ - angle: 0, - colors: [[0x403C36, 0.0], [0x4D473D, 0.34], [0x3D3A34, 1.0]] - }).onChange((value: string) => { - this.inputTextList1[index]=value - - }) - } - .width('50%') - .height('16.7%') - }) - - } - } - .width('95%') - .height('90%') - .margin({'top': '2%'}) - .backgroundColor('#282828') - .borderRadius('15px') - } - .width('100%') - .height('80%') - .borderRadius('25px') - Column() { - Image($r('app.media.terminal_save')).width('20.5%').height('74%').onClick(()=>{ - upDateTableByArray('IpConfigTable',[{udplocalIp:this.inputTextList1[2],udplocalIpPort:this.inputTextList1[3],udpOppositeIp:this.inputTextList1[0],udpOppositeIpPort:this.inputTextList1[1],tcplocalIp:this.inputTextList1[2],tcplocalIpPort:this.inputTextList1[1],tcpOppositeIp:this.inputTextList1[0],tcpOppositePort:this.inputTextList1[10],netMask:this.inputTextList1[4],gateway:this.inputTextList1[5],dnsServers:this.inputTextList1[8]}]) - ethernet.setIfaceConfig("eth0", { - mode: 0, - ipAddr:this.inputTextList1[2], - route: "0.0.0.0", - gateway: this.inputTextList1[5],//value.gateway网关 - netMask: this.inputTextList1[4],//value.netMask网络掩码 - dnsServers: this.inputTextList1[8], - // domain: "" - }, (error) => { - if (error) { - prompt.showToast({ - message: '设置失败'+JSON.stringify(error), - duration: 3000 - }); - } else { - prompt.showToast({ - message: '设置成功', - duration: 3000 - }); - } - }); - }) - } - .backgroundColor('#CCC4B8') - .width('100%') - .height('20%') - .borderRadius({'bottomLeft':'25px','bottomRight':'25px'}) - .justifyContent(FlexAlign.SpaceAround) - } - .width('75%') - .height('69.4%') - .backgroundColor('#E6E3DF') - .borderRadius('25px') - .margin({'top':'7%'}) - .justifyContent(FlexAlign.SpaceAround) - - } - .width('100%') - .height('100%') - .backgroundImagePosition({x: 0, y: 0}) - .backgroundImage($r('app.media.index_bg')) - .backgroundImageSize({ width: '100%', height: '100%' }) - } - aboutToAppear() { - getSyncData('IpConfigTable').then((result:Array)=>{ - console.log('result222',JSON.stringify(result)) - if(result.length){ - console.log('tagtag',JSON.stringify(result)) - this.inputTextList1[2]=result[0].udplocalIp - this.inputTextList1[3]=result[0].udplocalIpPort - this.inputTextList1[11]=result[0].udpOppositeIp - this.inputTextList1[12]=result[0].udpOppositeIpPort - - // this.inputTextList1[0]=result[0].tcplocalIp - this.inputTextList1[13]=result[0].tcplocalIpPort - this.inputTextList1[9]=result[0].tcpOppositeIp - this.inputTextList1[10]=result[0].tcpOppositePort - this.inputTextList1[5]=result[0].gateway - this.inputTextList1[4]=result[0].netMask - this.inputTextList1[8]=result[0].dnsServers - this.inputTextList1[0]=result[0].centerIp - this.inputTextList1[1]=result[0].centerPort - } - }) - ethernet.getIfaceConfig("eth0", (error, value) => { - if (error) { - // that.errorMsg='error' - console.log("boot_up getIp_new callback error = " + JSON.stringify(error)); - } else { - console.log("boot_up getIp_new callback ipAddr = " + JSON.stringify(value.ipAddr)); // - console.log(" boot_up getIp_new callback mode = " + JSON.stringify(value.mode)); - console.log("boot_up getIp_new callback route = " + JSON.stringify(value.route)); - console.log("boot_up getIp_new callback gateway = " + JSON.stringify(value.gateway)); - console.log("boot_up getIp_new callback netMask = " + JSON.stringify(value.netMask)); - console.log("boot_up getIp_new callback dnsServers = " + JSON.stringify(value.dnsServers)); - } - }) - - } - onPageShow() { - console.info('Index onPageShow'); - } - outClick(){ - - } -} \ No newline at end of file diff --git a/entry/src/main/ets/pages/TeminalInfos.ets b/entry/src/main/ets/pages/TerminalInfos.ets similarity index 100% rename from entry/src/main/ets/pages/TeminalInfos.ets rename to entry/src/main/ets/pages/TerminalInfos.ets diff --git a/entry/src/main/module.json5 b/entry/src/main/module.json5 index 764c1043..f32cc5b7 100644 --- a/entry/src/main/module.json5 +++ b/entry/src/main/module.json5 @@ -39,9 +39,6 @@ { "name": "ohos.permission.INTERNET" }, - { - "name": "ohos.permission.GET_NETWORK_INFO" - }, { "name": "ohos.permission.CAMERA", }, diff --git a/entry/src/main/resources/base/profile/main_pages.json b/entry/src/main/resources/base/profile/main_pages.json index ab117227..c596b8d5 100644 --- a/entry/src/main/resources/base/profile/main_pages.json +++ b/entry/src/main/resources/base/profile/main_pages.json @@ -6,7 +6,7 @@ "pages/UserInfo", "pages/register", "pages/Settings", - "pages/TerminalInfo", + "pages/TerminalInfos", "pages/VideoConfig", "pages/SignDisplay", "pages/RealTime",