Merge pull request 'feat_surenjun' (#2) from feat_surenjun into main

Reviewed-on: #2

build-profile.json5

@@ -4,13 +4,13 @@
       {
         "name": "default",
         "material": {
-          "certpath": "/Users/wangzhongjie/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.cer",
-          "storePassword": "0000001AAD87A2F96608A7CC63E6F839F8911407DD89270AAF9DE1E71573F9635276984E1FAF888B3B65",
+          "certpath": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.cer",
+          "storePassword": "0000001B0C5B52D8C8C6F415D4216EAD2848AA4A376B36FD72006E4072C15BA3D11E6E65C0D1FFA92A6D86",
           "keyAlias": "debugKey",
-          "keyPassword": "0000001A4B890623B78CD2603888F1077C048A19AD5577A34A4A2C54492F54091134D30F5FC8DB4D2E1F",
-          "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"
         }
       }
     ],

entry/src/main/ets/api/judge.ts

@@ -1,7 +1,8 @@
 import request from "../common/utils/request"
 import {getCurrentTime} from '../common/utils/tools'
 
-const baseHost = 'http://192.168.36.2:8081';
+// const baseHost = 'http://192.168.36.2:8081';
+const baseHost = 'http://112.80.35.83:11051';
 
 // 下载模型
 export async function download(){

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'; //硬盘号

entry/src/main/ets/common/utils/FileConfig.ts

@@ -0,0 +1,5 @@
+export default {
+  comoonfileWriteAddress:'/mnt/hmdfs/100/account/device_view/local/files',
+  videoSavePath:'/mnt/hmdfs/100/account/device_view/local/files/Videos/',
+  picSavePath:'/mnt/hmdfs/100/account/device_view/local/files/Pictures/'
+}

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'
 }

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 = ''

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);

entry/src/main/ets/pages/TerminalInfo.ets

@@ -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<any>)=>{
-      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(){
-
-  }
-}

entry/src/main/module.json5

@@ -39,9 +39,6 @@
       {
         "name": "ohos.permission.INTERNET"
       },
-      {
-        "name": "ohos.permission.GET_NETWORK_INFO"
-      },
       {
         "name": "ohos.permission.CAMERA",
       },

entry/src/main/resources/base/profile/main_pages.json

@@ -6,11 +6,13 @@
     "pages/UserInfo",
     "pages/register",
     "pages/Settings",
-    "pages/TerminalInfo",
+    "pages/TerminalInfos",
     "pages/VideoConfig",
-    "pages/Judge",
     "pages/SignDisplay",
-    "pages/RealTime"
+    "pages/RealTime",
+    "pages/Roads",
+    "pages/Judge"
+
   ],
   "window": {
   }