Merge branch 'dev' into lv_chengmai

entry/src/main/ets/common/service/initable.ts

@@ -90,7 +90,7 @@ function sqlInsertCommonFn(tableName, resultArr, context?, delFlag = true) {
         console.log('teststet3',)
 
         // console.log('表长度',result.length,tableName)
-        if (result.length == 0) {
+        if (result.length == 0||!delFlag) {
           console.log('sqlsqlinsert',resultArr.length)
           if(resultArr.length==0){
             resolve(true)
@@ -100,7 +100,7 @@ function sqlInsertCommonFn(tableName, resultArr, context?, delFlag = true) {
             + " (" + map[tableName].ACCOUNT_TABLE.columns.toString() + ") VALUES "
 
           resultArr.map((data, i) => {
-            data.id = `${i}`
+            data.id = !delFlag?`${i+result.length }`:`${i}`
             let str = '('
             map[tableName].ACCOUNT_TABLE.columns.map((res, index) => {
               if (map[tableName].ACCOUNT_TABLE.columns.length - 1 == index) {
@@ -166,10 +166,10 @@ export async function getDataBaseTable(params, reqParam) {
     }
     if (params.tableName == 'MA_SYSSET') {
       res.body[params.tableName] = res.body[params.tableName].filter(res => {
-        return res['v_no'] >= 300 && res['v_no'] <= 700
+        return res['v_no'] < 300 || res['v_no'] > 700
       })
     }
-    sqlInsertCommonFn(param.tableName, res.body[params.tableName]).then((val) => {
+    sqlInsertCommonFn(param.tableName, res.body[params.tableName],reqParam.context).then((val) => {
       reslove(val)
     })
   })
@@ -245,7 +245,7 @@ export async function getMySystemSetTable(params, reqParam) {
       }
       if (params.tableName == 'MA_SYSSET') {
         res.body[params.tableName] = res.body[params.tableName].filter(res => {
-          return res['v_no'] < 300 || res['v_no'] > 700
+          return res['v_no'] >= 300 && res['v_no'] <= 700
         })
       }
       sqlInsertCommonFn(params.tableName, res.body[params.tableName], reqParam.context, false).then((result) => {

entry/src/main/ets/pages/compontents/SignDisplayCom.ets

@@ -4,6 +4,8 @@ import FileLog from '../judgeSDK/utils/fileLog';
 import RealTime from '../compontents/judge/RealTime';
 import { GPSData, SignalData } from '../../mock';
 import { SignalDataType } from '../../model';
+// import { getSyncData } from '../../common/service/initable';
+import common from '@ohos.app.ability.common';
 
 @Component
 export default struct SignDisplayCom {
@@ -20,10 +22,15 @@ export default struct SignDisplayCom {
   @State interval: number = 0
   @State @Watch('outClick') outFlag: boolean = false;
   @State url: string = ''
+  @State date: string = ''
+  @State time: string = ''
+  // @State sd: string = ''
+  @State param350Str: string = ''
   private timer = null
   private udpClient: UdpClient = null
   private FileLog: FileLog
   private vocObj = null;
+  private context = getContext(this) as common.UIAbilityContext;
 
   constructor() {
     super()
@@ -166,7 +173,7 @@ export default struct SignDisplayCom {
             }.justifyContent(FlexAlign.Start).padding({ left: 10 * this.ratio }).margin({ top: 8 * this.ratio })
 
             Row() {
-              Text("本机IP：" + this.signArr[53] || '0')
+              Text("后置机IP：" + this.signArr[53] || '0')
                 .fontColor('#FFF5E5')
                 .fontSize(14 * this.ratio)
                 .width('25%')
@@ -215,11 +222,11 @@ export default struct SignDisplayCom {
                 .fontColor('#FFB433')
                 .fontSize(14 * this.ratio)
                 .height(18 * this.ratio)
-              Text('年月日:' + this.signArr[93]).fontColor('#FFB433').fontSize(14 * this.ratio).height(18 * this.ratio)
+              Text('年月日:' + this.date).fontColor('#FFB433').fontSize(14 * this.ratio).height(18 * this.ratio)
-              Text('时分秒:' + this.signArr[94]).fontColor('#FFB433').fontSize(14 * this.ratio).height(18 * this.ratio)
+              Text('时分秒:' + this.time).fontColor('#FFB433').fontSize(14 * this.ratio).height(18 * this.ratio)
               Text('经度:' + this.signArr[95]).fontColor('#FFB433').fontSize(14 * this.ratio).height(18 * this.ratio)
               Text('纬度:' + this.signArr[96]).fontColor('#FFB433').fontSize(14 * this.ratio).height(18 * this.ratio)
-              Text('速度:' + this.signArr[97]).fontColor('#FFB433').fontSize(14 * this.ratio).height(18 * this.ratio)
+              Text('速度:' + (Number(this.signArr[97])*1.852).toFixed(2)).fontColor('#FFB433').fontSize(14 * this.ratio).height(18 * this.ratio)
             }
             .backgroundColor('#1A1A1A')
             .width(170 * this.ratio)
@@ -346,8 +353,6 @@ export default struct SignDisplayCom {
   }
 
   onPageShow() {
-    console.info('SURENJUN', 123)
-
     const getSignal = this.getSignal;
     const that = this
     const showBack = this.showBack;
@@ -411,9 +416,21 @@ export default struct SignDisplayCom {
       this.GPSColum[t].value = this.signArr[i]
       t++
     }
+    this.GPSColum[97].value= ((Number(this.GPSColum[97])*1.852).toFixed(2)).toString()
     this.sjxhColum = JSON.parse(JSON.stringify((this.sjxhColum)))
     that.signArr = JSON.parse(JSON.stringify((this.signArr)))
     that.GPSColum = JSON.parse(JSON.stringify((this.GPSColum)))
+    if(this.signArr.length) {
+      this.date = this.signArr[93].substr(4, 2) + this.signArr[93].substr(2, 2) + this.signArr[93].substr(0, 2)
+      const hours = (Number(this.signArr[94].substr(0, 2)) + 8).toString()
+      if (hours.length < 2) {
+        this.time = '0' + hours + this.signArr[93].substr(2, this.signArr[93].length)
+      } else {
+        this.time = hours + this.signArr[93].substr(2, this.signArr[93].length)
+      }
+    }
+    // this.sd=this.param350Str=='0'? this.signArr[97]: this.signArr[23]
+
   }
 
   outClick() {