From cd40c6f6f3a6138cb70b2e2d017cc7f34a887ef8 Mon Sep 17 00:00:00 2001
From: lgq <1015864684@qq.com>
Date: 星期五, 17 四月 2026 13:59:49 +0800
Subject: [PATCH] 1.更新vf107代码，更新自动上报通行记录接口、人员查询接口、人员添加接口
---
vf107/src/screen.js | 46 ++++++++++++++++++----------------------------
1 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/vf107/src/screen.js b/vf107/src/screen.js
index 4380ba9..08da513 100644
--- a/vf107/src/screen.js
+++ b/vf107/src/screen.js
@@ -65,7 +65,7 @@
screen.model = dxDriver.DRIVER.MODEL
screen.resourcePath = {
- imagePath: `/app/code/resource/image/${dxDriver.DRIVER.MODEL}/`
+ imagePath: `/app/code/resource/image/vf105/`
}
screen.dropdownSymbol = screen.resourcePath.imagePath + '/down.png'
@@ -179,28 +179,12 @@
function getClickPoint() {
const indev = NativeObject.APP.NativeComponents.NativeIndev
std.setInterval(() => {
- if (dxDriver.DRIVER.MODEL == "vf203") {
- clickPoint = {
- x: Math.abs(600 - indev.lvIndevGetPointVg().y),
- y: indev.lvIndevGetPointVg().x
- }
- } else if (dxDriver.DRIVER.MODEL == "vf202") {
- clickPoint = {
- x: indev.lvIndevGetPointVg().x,
- y: indev.lvIndevGetPointVg().y
- }
- } else if (dxDriver.DRIVER.MODEL == "vf114") {
- clickPoint = {
- x: indev.lvIndevGetPointVg().x,
- y: indev.lvIndevGetPointVg().y
- }
- } else if (dxDriver.DRIVER.MODEL == "vf105") {
- clickPoint = {
- x: indev.lvIndevGetPointVg().x,
- y: indev.lvIndevGetPointVg().y
- }
+
+ clickPoint = {
+ x: indev.lvIndevGetPointVg().x,
+ y: indev.lvIndevGetPointVg().y
}
-
+
if (lastClickPoint.x != clickPoint.x || lastClickPoint.y != clickPoint.y) {
changedClickPoint = clickPoint
} else {
@@ -1035,11 +1019,14 @@
let param = driver.net.getNetParam()
if (data == "connected" && param) {
- config.setAndSave("net.ip", param.ip)
- config.setAndSave("net.gateway", param.gateway)
- config.setAndSave("net.mask", param.netmask)
- config.setAndSave('net.dns', param.dns)
- config.setAndSave('net.mac', screen.getNetMac())
+ // 鍙湁鍦ㄧ綉缁滈厤缃〉闈笉鍙涓旂敤鎴蜂笉鍦ㄧ紪杈戦厤缃椂鎵嶈嚜鍔ㄤ繚瀛樼綉缁滃弬鏁�
+ if (!networkSettingView.isVisible && !networkSettingView.isEditing) {
+ config.setAndSave("net.ip", param.ip)
+ config.setAndSave("net.gateway", param.gateway)
+ config.setAndSave("net.mask", param.netmask)
+ config.setAndSave('net.dns', param.dns)
+ config.setAndSave('net.mac', screen.getNetMac())
+ }
topView.ethConnectState(true, type)
networkSettingView.netInfo[10].label.dataI18n = "networkSettingView.networkConnected"
if (mainView.ipInfoLbl) mainView.ipInfoLbl.text("IP:" + param.ip)
@@ -1054,7 +1041,10 @@
}
i18n.refreshObj(networkSettingView.netInfo[10].label)
networkSettingView.refresh()
- networkSettingView.changeNetType(type)
+ // 鍙湁鍦ㄧ敤鎴蜂笉鍦ㄧ紪杈戦厤缃椂鎵嶆墽琛岀綉缁滅被鍨嬪垏鎹�
+ if (!networkSettingView.isEditing) {
+ networkSettingView.changeNetType(type)
+ }
}
screen.fireNetStatus = function () {
--
Gitblit v1.9.3