Compare commits
	
		
			No commits in common. "379f4c8778d7f2cbbe72fbc450ffa7844f4b3d3c" and "c796add419646ff9d9260052b1269b975e1daaef" have entirely different histories.
		
	
	
		
			379f4c8778
			...
			c796add419
		
	
		
| @ -444,7 +444,6 @@ function openChuankouFn(callback) { | |||||||
|     if(carInfo.kscx == 'C1'){ |     if(carInfo.kscx == 'C1'){ | ||||||
|       testNapi.SerialOpenAsync(devPath, (fd) => { |       testNapi.SerialOpenAsync(devPath, (fd) => { | ||||||
|         globalThis.fd = fd; |         globalThis.fd = fd; | ||||||
|         globalThis.ChounkouInit = true; |  | ||||||
|         globalThis.num = 0 |         globalThis.num = 0 | ||||||
|         let parity = 0x4e; // 'N'
 |         let parity = 0x4e; // 'N'
 | ||||||
|         let ret = testNapi.SerialSetAsync(globalThis.fd, 115200, 0, 8, 1, parity, (ret) => { |         let ret = testNapi.SerialSetAsync(globalThis.fd, 115200, 0, 8, 1, parity, (ret) => { | ||||||
|  | |||||||
| @ -32,7 +32,6 @@ import { GlobalConfig } from '../../config/index'; | |||||||
| import prompt from '@ohos.promptAction' | import prompt from '@ohos.promptAction' | ||||||
| import DB, { ColumnType } from '../database/DbSql'; | import DB, { ColumnType } from '../database/DbSql'; | ||||||
| import { MA_SYS_SET_COLUMN } from '../../model/Table'; | import { MA_SYS_SET_COLUMN } from '../../model/Table'; | ||||||
| import { getChuankouFn } from '../service/indexService' |  | ||||||
| 
 | 
 | ||||||
| // @ts-nocheck
 | // @ts-nocheck
 | ||||||
| //读表
 | //读表
 | ||||||
| @ -456,10 +455,6 @@ export async function upDataZhongxinginitialization(param) { | |||||||
|             resolve(false) |             resolve(false) | ||||||
|           } |           } | ||||||
|         } |         } | ||||||
|         // 初始化串口
 |  | ||||||
|         if(!globalThis.ChounkouInit){ |  | ||||||
|           getChuankouFn() |  | ||||||
|         } |  | ||||||
|         resolve(true) |         resolve(true) | ||||||
|       }).catch((Error) => { |       }).catch((Error) => { | ||||||
|         console.log("init table5", JSON.stringify(Error)) |         console.log("init table5", JSON.stringify(Error)) | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user