|
@@ -1,6 +1,7 @@
|
|
|
package com.zzliaoyuan.power_sensor.fragment;
|
|
|
|
|
|
import android.os.Environment;
|
|
|
+import android.util.Log;
|
|
|
|
|
|
import com.rscja.deviceapi.entity.UHFTAGInfo;
|
|
|
import com.zzliaoyuan.power_sensor.MainApplication;
|
|
@@ -58,12 +59,13 @@ public class UHFReadTagFragment {
|
|
|
private void readTag() {
|
|
|
// wsdd 点击开始按钮后,开始执行扫描
|
|
|
// wsdd 单步读取的数据
|
|
|
- UHFTAGInfo strUII = mContext.mReader.inventorySingleTag();
|
|
|
+ UHFTAGInfo strUII = mContext.mReader.inventorySingleTag();
|
|
|
if (strUII != null) {
|
|
|
-// String strTid = "E28011052000715CA32D0A1C"; //strUII.getTid();
|
|
|
+// String strTid = "E280382120006023010B9F99"; //strUII.getTid();
|
|
|
// String strUser = "2F83FE1758F601C6E70BECF1DCCC491866D30D5D5178FA48CFD18A87A7709D42A5EC8599882C8EDF3E3D6DA0E6EB1FE0"; //strUII.getUser();
|
|
|
- String strTid = strUII.getTid();
|
|
|
- String strUser = strUII.getUser();
|
|
|
+// String strUser = "69D4C3673275DD699DFB891227F8598EC0D74E05DAD1845F92F8745C0990908CDBB47D0491D8642D744ABF804352E796"; //strUII.getUser();
|
|
|
+ String strTid = strUII.getTid();
|
|
|
+ String strUser = strUII.getUser();
|
|
|
if (strUser != null && strTid != null) {
|
|
|
String Data = "{\"userData\":\"" + strUser + "\""; // 读取的用户区数据
|
|
|
byte[] szBuffer = LibCore.HexStringToByteArray(strUser);
|
|
@@ -90,6 +92,7 @@ public class UHFReadTagFragment {
|
|
|
Data += ",\"voltageFactor\":\"" + product.voltageFactor + "\""; // 电压因数
|
|
|
Data += ",\"version\":\"" + product.version + "\""; // 版本
|
|
|
Data += ",\"powerFactor\":\"" + product.powerFactor + "\""; // 功率因数
|
|
|
+ Data += ",\"reserve1\":\"" + product.reserve1 + "\""; // 备用1
|
|
|
writeAssets(product.assetID);
|
|
|
// wsdd 添加读取的数据,此处应该返回数据strEPC到RN
|
|
|
// 返回给RN的数据格式 {"userData":"6a173f0fd2a140cf20204fbaa6d1c0158518031da248f306535dc6d10026a7c985671ae611afb4c151feb5712eba3d52","assetID":"4330012800000002178203 ","model":"002型","manufacturer":"北京***公司","kind":"电压互感器"}
|
|
@@ -98,6 +101,7 @@ public class UHFReadTagFragment {
|
|
|
Data += ",\"error_msg\":\"格式错误(" + strUser.length() + "):" + strUser + "\"";
|
|
|
}
|
|
|
Data += "}";
|
|
|
+// Log.i("++++++++Data", Data);
|
|
|
MainApplication.GetReactPackage().reactModule.sendMsgToRN("MsgFromAndroid", Data);
|
|
|
mContext.playSound(1);
|
|
|
} else {
|