From b642a88b35271f37e411a603c29a57875111730c Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 10 七月 2023 18:18:34 +0800
Subject: [PATCH] App读卡功能问题修改
---
igds-app/js/admin/inout-in-handle-list.js | 94 ++++++++++++++++------
igds-app/js/admin/inout-real.js | 2
igds-app/inout-out-handle-list.html | 2
igds-app/js/admin/inout-in-handle.js | 3
igds-app/js/admin/work-record.js | 2
igds-app/js/admin/inout-out-handle-list.js | 96 +++++++++++++++++------
igds-app/unpackage/release/apk/H580320F9__20230710180446.apk | 0
igds-app/inout-out-handle.html | 2
8 files changed, 142 insertions(+), 59 deletions(-)
diff --git a/igds-app/inout-out-handle-list.html b/igds-app/inout-out-handle-list.html
index cd2219b..75a8fec 100644
--- a/igds-app/inout-out-handle-list.html
+++ b/igds-app/inout-out-handle-list.html
@@ -29,7 +29,7 @@
<input id="plateNum" type="search" class="mui-input-clear" placeholder="璇疯緭鍏ヨ溅鐗屼俊鎭绱�" value="">
</div>
<div class="s-btn"><img src="images/icons/g-i22.png" alt="" onclick="readCard()">璇诲崱</div>
- <button type="button" class="mui-btn" onclick="getOutHandleList()">鏌ヨ</button>
+ <button type="button" class="mui-btn">鏌ヨ</button>
</div>
</form>
</div>
diff --git a/igds-app/inout-out-handle.html b/igds-app/inout-out-handle.html
index e84d3cc..7a459c7 100644
--- a/igds-app/inout-out-handle.html
+++ b/igds-app/inout-out-handle.html
@@ -69,7 +69,7 @@
<div class="m-box_zc1">
<div class="mui-input-row">
<label>鍊间粨鎵ｉ噸:</label>
- <input id="number" type="text" class="mui-input-clear" placeholder="璇疯緭鍏ラ噸閲�">
+ <input id="number" type="text" class="mui-input-clear" placeholder="璇疯緭鍏ラ噸閲�" value="0" disabled>
<span class="unit">KG</span>
</div>
</div>
diff --git a/igds-app/js/admin/inout-in-handle-list.js b/igds-app/js/admin/inout-in-handle-list.js
index 7d327fd..bdfa53f 100644
--- a/igds-app/js/admin/inout-in-handle-list.js
+++ b/igds-app/js/admin/inout-in-handle-list.js
@@ -100,6 +100,13 @@
}
$("#handleList").html(html);
}
+//鏌ヨ
+mui(".g-sobox").on("tap", ".row button", function() {
+ var plateNum = mui("#plateNum")[0].value
+ data.data.plateNum = plateNum;
+ getInHandleList();
+
+})
//鍔熻兘妯″潡璺宠浆
mui(".mui-scroll-wrapper").on("tap", ".mui-scroll ul li a", function() {
@@ -165,7 +172,6 @@
var NdefRecord;
var NdefMessage;
var count = 0;
-
//鐩戝惉NFC鐘舵��
function listenNFCStatus() {
try {
@@ -176,11 +182,13 @@
var IntentFilter = plus.android.importClass('android.content.IntentFilter');
NfcAdapter = plus.android.importClass('android.nfc.NfcAdapter');
var nfcAdapter = NfcAdapter.getDefaultAdapter(main);
+
//鍒ゆ柇璁惧鏄惁鏀寔NFC鍔熻兘
if (nfcAdapter == null) {
mui.alert("璁惧涓嶆敮鎸丯FC鍔熻兘锛�", '鎻愮ず', ["纭畾"], function() {}, "div");
return;
}
+
//鍒ゆ柇璁惧鏄惁寮�鍚疦FC鍔熻兘
if (!nfcAdapter.isEnabled()) {
mui.alert("璇峰湪绯荤粺璁剧疆涓惎鐢∟FC鍔熻兘锛�", '鎻愮ず', ["纭畾"], function() {}, "div");
@@ -189,13 +197,15 @@
waiting = plus.nativeUI.showWaiting("璇峰皢NFC鏍囩闈犺繎锛�");
//鍊掕鏃�10绉掞紝璇诲彇涓嶅埌鍚庢彁绀烘槸鍚﹂噸鏂拌鍗�
- var interval = setInterval(function() { //瀹氫箟瀹氭椂鍣�
+ var interval = setInterval(function() {
+ //瀹氫箟瀹氭椂鍣�
count++;
if (count == 10 && readyRead) {
readyRead = false;
count = 0;
waiting.close();
- clearInterval(interval); //娓呴櫎瀹氭椂鍣�
+ //娓呴櫎瀹氭椂鍣�
+ clearInterval(interval);
var btnArray = ["閲嶈瘯", "鍙栨秷"];
mui.confirm("宸茶秴鏃讹紝鏄惁閲嶆柊璇诲崱锛�", "鎻愮ず", btnArray, function(e) {
if (e.index == 0) {
@@ -226,17 +236,20 @@
function() {
setTimeout(readData, 1000);
}, false);
- document.addEventListener("pause", function(e) {
- if (nfcAdapter) {
- nfcAdapter.disableForegroundDispatch(main);
- }
- }, false);
- document.addEventListener("resume", function(e) {
- if (nfcAdapter) {
- nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
- }
- }, false);
+ document.addEventListener("pause",
+ function(e) {
+ if (nfcAdapter) {
+ nfcAdapter.disableForegroundDispatch(main);
+ }
+ }, false);
+ document.addEventListener("resume",
+ function(e) {
+ if (nfcAdapter) {
+ nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
+ }
+ }, false);
nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
+
} catch (e) {
mui.toast("璇诲崱澶辫触锛岃閲嶈瘯锛�");
waiting.close();
@@ -249,8 +262,7 @@
NdefMessage = plus.android.importClass("android.nfc.NdefMessage");
var main = plus.android.runtimeMainActivity();
var intent = main.getIntent();
- // if ("android.nfc.action.TAG_DISCOVERED" == intent.getAction()) { //鐪熸満璋冭瘯
- if ("android.nfc.action.TECH_DISCOVERED" == intent.getAction()) { //鎵撳寘
+ if ("android.nfc.action.TECH_DISCOVERED" == intent.getAction()) { //鎵撳寘鏃�
if (readyRead) {
readyRead = false;
@@ -262,7 +274,7 @@
var id = ByteArrayToHexString(byteId);
//鍏抽棴绛夊緟鍦嗗湀
waiting.close();
-
+ id = tran_LH8(id);
//璇诲彇id鎴愬姛锛岃祴鍊煎苟鍙戦�佽姹傛煡璇�
data1.data.intelCard = id;
getInoutDetail();
@@ -280,33 +292,33 @@
dataType: "json",
crossDomain: true,
contentType: "application/json;charset=utf-8",
- data: JSON.stringify(data1),
+ data: JSON.stringify(data),
success: function(result) {
if (result.code == "0000") {
//寮圭獥淇℃伅锛氬崟瀛愯溅鐗岃窡浠撳簱锛屽幓鍊间粨鍒欒繘鍏ュ�间粨椤甸潰锛屼紶閫掑崟瀛恑d锛�
var btnArray = ["鍘诲�间粨", "鍙栨秷"];
- var text = '鍊间粨浠撳簱:' + result.data.depotName + '<br/>杞︾墝鍙凤細' + result.data.plateNum +
- '<br/>淇濈鍛橈細' + result.data.plateNum
+ var text = '鍊间粨浠撳簱:' + result.data[0].depotName + '<br/>杞︾墝鍙凤細' + result.data[0].plateNum +
+ '<br/>淇濈鍛橈細' + result.data[0].storeKeeperName
mui.confirm(text, "妫�娴嬪埌寰呭�间粨淇℃伅濡備笅", btnArray, function(e) {
if (e.index == 0) {
//鍏堝垽鏂崟瀛愭槸鍚﹀湪鍊间粨鐘舵��
- if (result.data.progress == "HANDLE") {
+ if (result.data[0].progress == "HANDLE") {
//鍘诲�间粨鏃跺垽鏂崟瀛愮被鍨嬫槸鍚︽槸鍏ュ簱锛屼笉鏄粰鍑烘彁閱掞紱
- if (result.data.type == "IN") {
+ if (result.data[0].type == "IN") {
mui.openWindow({
url: "inout-in-handle.html",
id: "inout-in-handle",
extras: {
data: {
- serialNumber: result.data.id,
- plateNum: result.data.plateNum,
- depotName: result.data.depotName,
- storeKeeperName: result.data.storeKeeperName
+ serialNumber: result.data[0].id,
+ plateNum: result.data[0].plateNum,
+ depotName: result.data[0].depotName,
+ storeKeeperName: result.data[0].storeKeeperName
}
}
})
} else {
- mui.alert("璇ュ崱淇℃伅涓嶆槸鍑哄簱绫诲瀷锛岃鏍稿锛�", "鎻愮ず", ["纭畾"], function() {}, "div")
+ mui.alert("璇ュ崱淇℃伅涓嶆槸鍏ュ簱绫诲瀷锛岃鏍稿锛�", "鎻愮ず", ["纭畾"], function() {}, "div")
}
} else {
mui.alert("褰撳墠鍗′笉鍦ㄥ�间粨鐘舵�侊紝璇锋牳鏌ワ紒", "鎻愮ず", ["纭畾"], function() {}, "div")
@@ -322,7 +334,6 @@
}
})
}
-
//灏嗗瓧鑺傛暟缁勮浆涓�16杩涘埗瀛楃涓�
function ByteArrayToHexString(inarray) {
var i, j, inn;
@@ -338,7 +349,36 @@
return out;
}
+//16杩涘埗瀛楃涓� 楂樹綆鎹綅 8涓瓧绗�
+function tran_LH8(info) {
+ var tag = tran_LH(info.substring(4)) + tran_LH(info.substring(0, 4));
+ return hex2int(tag);
+}
+//16杩涘埗瀛楃涓� 楂樹綆鎹綅 4涓瓧绗�
+function tran_LH(info) {
+ return info.substring(2) + info.substring(0, 2);
+}
+
+function hex2int(hex) {
+ var len = hex.length,
+ a = new Array(len),
+ code;
+ for (var i = 0; i < len; i++) {
+ code = hex.charCodeAt(i);
+ if (48 <= code && code < 58) {
+ code -= 48;
+ } else {
+ code = (code & 0xdf) - 65 + 10;
+ }
+ a[i] = code;
+ }
+
+ return a.reduce(function(acc, c) {
+ acc = 16 * acc + c;
+ return acc;
+ }, 0);
+}
//婊戝姩
mui('.mui-scroll-wrapper').scroll({
indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
diff --git a/igds-app/js/admin/inout-in-handle.js b/igds-app/js/admin/inout-in-handle.js
index 4d9aaca..c2a2043 100644
--- a/igds-app/js/admin/inout-in-handle.js
+++ b/igds-app/js/admin/inout-in-handle.js
@@ -261,8 +261,11 @@
wt.close();
}
});
+
//鎼哄甫杞︾墝鍙傛暟
task.addData("plateNum", depotData.plateNum);
+ //涓氬姟绫诲瀷
+ task.addData("bizType", "01");
//鍥剧墖淇℃伅
task.addFile(path, {
key: "uploadkey"
diff --git a/igds-app/js/admin/inout-out-handle-list.js b/igds-app/js/admin/inout-out-handle-list.js
index 387cc5a..b776db7 100644
--- a/igds-app/js/admin/inout-out-handle-list.js
+++ b/igds-app/js/admin/inout-out-handle-list.js
@@ -93,7 +93,14 @@
$("#handleList").html(html);
}
-
+//鏌ヨ
+mui(".g-sobox").on("tap", ".row button", function() {
+ var plateNum = mui("#plateNum")[0].value
+ data.data.plateNum = plateNum;
+ console.log(plateNum)
+ getInHandleList();
+
+})
//鍔熻兘妯″潡璺宠浆
mui(".mui-scroll-wrapper").on("tap", ".mui-scroll ul li a", function() {
var id = this.getAttribute("id");
@@ -142,6 +149,7 @@
})
});
+
/*---------------NFC璇诲崱鍔熻兘-------------------*/
var waiting;
var readyRead = false;
@@ -155,7 +163,6 @@
var NdefRecord;
var NdefMessage;
var count = 0;
-
//鐩戝惉NFC鐘舵��
function listenNFCStatus() {
try {
@@ -166,11 +173,13 @@
var IntentFilter = plus.android.importClass('android.content.IntentFilter');
NfcAdapter = plus.android.importClass('android.nfc.NfcAdapter');
var nfcAdapter = NfcAdapter.getDefaultAdapter(main);
+
//鍒ゆ柇璁惧鏄惁鏀寔NFC鍔熻兘
if (nfcAdapter == null) {
mui.alert("璁惧涓嶆敮鎸丯FC鍔熻兘锛�", '鎻愮ず', ["纭畾"], function() {}, "div");
return;
}
+
//鍒ゆ柇璁惧鏄惁寮�鍚疦FC鍔熻兘
if (!nfcAdapter.isEnabled()) {
mui.alert("璇峰湪绯荤粺璁剧疆涓惎鐢∟FC鍔熻兘锛�", '鎻愮ず', ["纭畾"], function() {}, "div");
@@ -179,13 +188,15 @@
waiting = plus.nativeUI.showWaiting("璇峰皢NFC鏍囩闈犺繎锛�");
//鍊掕鏃�10绉掞紝璇诲彇涓嶅埌鍚庢彁绀烘槸鍚﹂噸鏂拌鍗�
- var interval = setInterval(function() { //瀹氫箟瀹氭椂鍣�
+ var interval = setInterval(function() {
+ //瀹氫箟瀹氭椂鍣�
count++;
if (count == 10 && readyRead) {
readyRead = false;
count = 0;
waiting.close();
- clearInterval(interval); //娓呴櫎瀹氭椂鍣�
+ //娓呴櫎瀹氭椂鍣�
+ clearInterval(interval);
var btnArray = ["閲嶈瘯", "鍙栨秷"];
mui.confirm("宸茶秴鏃讹紝鏄惁閲嶆柊璇诲崱锛�", "鎻愮ず", btnArray, function(e) {
if (e.index == 0) {
@@ -216,17 +227,20 @@
function() {
setTimeout(readData, 1000);
}, false);
- document.addEventListener("pause", function(e) {
- if (nfcAdapter) {
- nfcAdapter.disableForegroundDispatch(main);
- }
- }, false);
- document.addEventListener("resume", function(e) {
- if (nfcAdapter) {
- nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
- }
- }, false);
+ document.addEventListener("pause",
+ function(e) {
+ if (nfcAdapter) {
+ nfcAdapter.disableForegroundDispatch(main);
+ }
+ }, false);
+ document.addEventListener("resume",
+ function(e) {
+ if (nfcAdapter) {
+ nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
+ }
+ }, false);
nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
+
} catch (e) {
mui.toast("璇诲崱澶辫触锛岃閲嶈瘯锛�");
waiting.close();
@@ -239,8 +253,7 @@
NdefMessage = plus.android.importClass("android.nfc.NdefMessage");
var main = plus.android.runtimeMainActivity();
var intent = main.getIntent();
- // if ("android.nfc.action.TAG_DISCOVERED" == intent.getAction()) { //鐪熸満璋冭瘯
- if ("android.nfc.action.TECH_DISCOVERED" == intent.getAction()) { //鎵撳寘
+ if ("android.nfc.action.TECH_DISCOVERED" == intent.getAction()) { //鎵撳寘鏃�
if (readyRead) {
readyRead = false;
@@ -252,7 +265,7 @@
var id = ByteArrayToHexString(byteId);
//鍏抽棴绛夊緟鍦嗗湀
waiting.close();
-
+ id = tran_LH8(id);
//璇诲彇id鎴愬姛锛岃祴鍊煎苟鍙戦�佽姹傛煡璇�
data1.data.intelCard = id;
getInoutDetail();
@@ -270,27 +283,28 @@
dataType: "json",
crossDomain: true,
contentType: "application/json;charset=utf-8",
- data: JSON.stringify(data1),
+ data: JSON.stringify(data),
success: function(result) {
if (result.code == "0000") {
//寮圭獥淇℃伅锛氬崟瀛愯溅鐗岃窡浠撳簱锛屽幓鍊间粨鍒欒繘鍏ュ�间粨椤甸潰锛屼紶閫掑崟瀛恑d锛�
var btnArray = ["鍘诲�间粨", "鍙栨秷"];
- var text = '鍊间粨浠撳簱:' + result.data.depotName + '<br/>杞︾墝鍙凤細' + result.data.plateNum;
+ var text = '鍊间粨浠撳簱:' + result.data[0].depotName + '<br/>杞︾墝鍙凤細' + result.data[0].plateNum +
+ '<br/>淇濈鍛橈細' + result.data[0].storeKeeperName
mui.confirm(text, "妫�娴嬪埌寰呭�间粨淇℃伅濡備笅", btnArray, function(e) {
if (e.index == 0) {
//鍏堝垽鏂崟瀛愭槸鍚﹀湪鍊间粨鐘舵��
- if (result.data.progress == "HANDLE") {
+ if (result.data[0].progress == "HANDLE") {
//鍘诲�间粨鏃跺垽鏂崟瀛愮被鍨嬫槸鍚︽槸鍏ュ簱锛屼笉鏄粰鍑烘彁閱掞紱
- if (result.data.type == "OUT") {
+ if (result.data[0].type == "OUT") {
mui.openWindow({
url: "inout-out-handle.html",
id: "inout-out-handle",
extras: {
data: {
- serialNumber: result.data.id,
- plateNum: result.data.plateNum,
- depotName: result.data.depotName,
- storeKeeperName: result.data.storeKeeperName
+ serialNumber: result.data[0].id,
+ plateNum: result.data[0].plateNum,
+ depotName: result.data[0].depotName,
+ storeKeeperName: result.data[0].storeKeeperName
}
}
})
@@ -311,7 +325,6 @@
}
})
}
-
//灏嗗瓧鑺傛暟缁勮浆涓�16杩涘埗瀛楃涓�
function ByteArrayToHexString(inarray) {
var i, j, inn;
@@ -327,6 +340,37 @@
return out;
}
+//16杩涘埗瀛楃涓� 楂樹綆鎹綅 8涓瓧绗�
+function tran_LH8(info) {
+ var tag = tran_LH(info.substring(4)) + tran_LH(info.substring(0, 4));
+ return hex2int(tag);
+}
+
+//16杩涘埗瀛楃涓� 楂樹綆鎹綅 4涓瓧绗�
+function tran_LH(info) {
+ return info.substring(2) + info.substring(0, 2);
+}
+
+function hex2int(hex) {
+ var len = hex.length,
+ a = new Array(len),
+ code;
+ for (var i = 0; i < len; i++) {
+ code = hex.charCodeAt(i);
+ if (48 <= code && code < 58) {
+ code -= 48;
+ } else {
+ code = (code & 0xdf) - 65 + 10;
+ }
+ a[i] = code;
+ }
+
+ return a.reduce(function(acc, c) {
+ acc = 16 * acc + c;
+ return acc;
+ }, 0);
+}
+
mui('.mui-scroll-wrapper').scroll({
indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
diff --git a/igds-app/js/admin/inout-real.js b/igds-app/js/admin/inout-real.js
index 2d41e34..3703003 100644
--- a/igds-app/js/admin/inout-real.js
+++ b/igds-app/js/admin/inout-real.js
@@ -37,7 +37,6 @@
data: JSON.stringify(data),
success: function(result) {
if (result.code == "0000") {
- console.log(JSON.stringify(result))
recordData = result.data;
renderData();
} else {
@@ -54,7 +53,6 @@
//娓叉煋椤甸潰
function renderData() {
var html = '';
- console.log(JSON.stringify(recordData))
if (recordData) {
$("#inSumNum").html(recordData.inSumNum);
$("#inCompleteNum").html(recordData.inCompleteNum);
diff --git a/igds-app/js/admin/work-record.js b/igds-app/js/admin/work-record.js
index caae15f..acc668a 100644
--- a/igds-app/js/admin/work-record.js
+++ b/igds-app/js/admin/work-record.js
@@ -92,8 +92,6 @@
html += '<li><a href="" class="con"style="background-image: url(images/icons/a-bg13.png);">';
html += '<div class="tit">鍏宠仈浠撳簱:</div><div class="name">--</div></a></li></ul>';
html += '<div class="time"><p>鏈夋晥寮�濮嬫椂闂�: <span>' + dateTime + '</span></p><p>鏈夋晥缁撴潫鏃堕棿: <span>' + dateTime + '</span></p></div>';
- // html +=
- // '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 18px;">鏆傛棤鐢宠璁板綍淇℃伅</div></div></li>';
}
$("#handleList").html(html);
}
diff --git a/igds-app/unpackage/release/apk/H580320F9__20230710180446.apk b/igds-app/unpackage/release/apk/H580320F9__20230710180446.apk
new file mode 100644
index 0000000..a09af70
--- /dev/null
+++ b/igds-app/unpackage/release/apk/H580320F9__20230710180446.apk
Binary files differ
--
Gitblit v1.9.3