cd四川成都版本

android/app/src/main/java/com/zzliaoyuan/power_sensor/fragment/ProductInfo.java

@@ -4,54 +4,88 @@ public class ProductInfo {
     // 版本号
     public int version;
 
+	// 条形码
+	public String barcode;
+
+	// 单位类别
+	public String orgType;
+
     // 产品类型
     public String kind;
 
     // 型号
     public String model;
 
-    // 用户代码
-    public short district;
+    // 接线方式
+    public String  connection;
 
-    // 用户地区
-    public String districtText;
+    // 互感器原理
+    public String  transformer;
 
-    // 生产厂家
-    public String manufacturer;
+    // 绝缘方式
+    public String  insulation;
 
-    // 资产编号
-    public String assetID;
+    // 绕组配置
+    public int  windingCount;
 
-    // 安装场所
-    public String place;
+    // 出厂日期
+    public String  releaseDate;
 
-    // 电压等级
-    public String voltageLevel;
+    // 额定电压
+    public String  ratedVoltage;
 
-    // 二次绕组数量
-    public String secondWindingCount;
+    // 额定频率 - 安装场所
+    public String  ratedFrequencyAndPlace;
 
-    // 二次电压
-    public String secondVoltage;
+    // 功率因数
+    public String  powerFactor;
 
-    // 一次电流
-    public String firstCurrent;
+    // 额定电流变化比1
+    public String  ratedCurrent1;
 
-    // 二次电流
-    public String senondCurrent;
+    // 额定电流变化比2
+    public String  ratedCurrent2;
 
-    // 准确等级
-    public String accuracy;
+    // 额定电流变化比3
+    public String  ratedCurrent3;
 
-    // 额定负荷
-    public String ratedLoad;
+    // TA额定二次负荷
+    public String  ratedSecondLoadTA;
 
-    // 出厂日期
-    public String releaseDate;
+    // TA轻载负荷
+    public String  overlightLoadTA;
 
-    // 电压因数
-    public String voltageFactor;
+    // TA精度
+    public String  precisionTA;
+
+    // 电压变比
+    public String  voltageChangeRate;
+
+    // TV额定二次负荷
+    public String  ratedSecondLoadTV;
+
+    // TV轻载负荷
+    public String  overlightLoadTV;
+
+    // TV精度
+    public String  precisionTV;
+
+    // 新旧标志 - 设备计量产权
+    public String  flagAndRight;
+
+    // 加密方式
+    public String  encodeType;
+
+    // 仪表保安系数 - 额定一次电流扩大倍数
+    public String  securityAndExpansionFactor;
+
+    // 资产属性 - 资产归属
+    public String  assetProperty;
+
+    // 生产厂家
+    public String  manufacturer;
+
+    // 资产归属地
+    public String  assetAttribution;
 
-    // 功率因数
-    public String powerFactor;
 }

android/app/src/main/java/com/zzliaoyuan/power_sensor/fragment/UHFReadTagFragment.java

@@ -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;
@@ -51,7 +52,8 @@ public class UHFReadTagFragment {
     // wsdd userd
     public void setUserModel() {
         // 设置循环盘点同时读取 EPC、TID、USER 模式
-        mContext.mReader.setEPCAndTIDUserMode(0, 24);
+        // 设置用户区长度
+        mContext.mReader.setEPCAndTIDUserMode(0, 32);
         readAssets();
     }
 
@@ -66,31 +68,33 @@ public class UHFReadTagFragment {
             String strUser = strUII.getUser();
             if (strUser != null && strTid != null) {
                 String Data = "{\"userData\":\"" + strUser + "\""; // 读取的用户区数据
+                // Log.e("======strUser===", Data);
                 byte[] szBuffer = LibCore.HexStringToByteArray(strUser);
                 ProductInfo product = LibCore.decode(szBuffer, strTid);//
 
-                if (strUser.length() == 96 && product != null) {
+                if (strUser.length() > 96 && product != null) {
 
                     Data += ",\"error\":0"; // 错误提示
-                    Data += ",\"assetID\":\"" + product.assetID.replace("\\s*","").trim()  + "\""; // 资产编号
+                    Data += ",\"assetID\":\"" + product.barcode.replace("\\s*","").trim()  + "\""; // 资产编号-->条形码
                     Data += ",\"model\":\"" + product.model + "\""; // 型号
                     Data += ",\"manufacturer\":\"" + product.manufacturer + "\""; // 生产厂家
                     Data += ",\"kind\":\"" + product.kind + "\""; // 产品类型
-                    Data += ",\"district\":\"" + product.district + "\""; // 用户地区代码
-                    Data += ",\"districtText\":\"" + product.districtText + "\""; // 用户地区
-                    Data += ",\"place\":\"" + product.place + "\""; // 安装场所
-                    Data += ",\"voltageLevel\":\"" + product.voltageLevel + "\""; // 电压等级
-                    Data += ",\"secondWindingCount\":\"" + product.secondWindingCount + "\""; // 二次绕组数量
-                    Data += ",\"secondVoltage\":\"" + product.secondVoltage + "\""; // 二次电压
-                    Data += ",\"firstCurrent\":\"" + product.firstCurrent + "\""; // 一次电流
-                    Data += ",\"senondCurrent\":\"" + product.senondCurrent + "\""; // 二次电流
-                    Data += ",\"accuracy\":\"" + product.accuracy + "\""; // 准确等级
-                    Data += ",\"ratedLoad\":\"" + product.ratedLoad + "\""; // 额定负荷
+//                    Data += ",\"district\":\"" + product.district + "\""; // 用户地区代码
+                    Data += ",\"districtText\":\"" + product.assetAttribution + "\""; // 用户地区-->资产归属地
+                    Data += ",\"place\":\"" + product.ratedFrequencyAndPlace + "\""; // 安装场所
+                    Data += ",\"voltageLevel\":\"" + product.ratedVoltage + "\""; // 电压等级-->额定电压
+                    Data += ",\"secondWindingCount\":\"" + product.windingCount + "\""; // 二次绕组数量-->绕组配置
+                    Data += ",\"secondVoltage\":\"" + "" + "\""; // 二次电压 缺失
+                    Data += ",\"firstCurrent\":\"" + "" + "\""; // 一次电流 缺失
+                    Data += ",\"senondCurrent\":\"" + "" + "\""; // 二次电流 缺失
+                    Data += ",\"accuracy\":\"" + "" + "\""; // 准确等级 缺失
+                    Data += ",\"ratedLoad\":\"" + "" + "\""; // 额定负荷 缺失
                     Data += ",\"releaseDate\":\"" + product.releaseDate + "\""; // 出厂日期
-                    Data += ",\"voltageFactor\":\"" + product.voltageFactor + "\""; // 电压因数
+                    Data += ",\"voltageFactor\":\"" + "" + "\""; // 电压因数 缺失
                     Data += ",\"version\":\"" + product.version + "\""; // 版本
                     Data += ",\"powerFactor\":\"" + product.powerFactor + "\""; // 功率因数
-                    writeAssets(product.assetID);
+//                    writeAssets(product.assetID);
+                    writeAssets(product.barcode);
                     // wsdd 添加读取的数据,此处应该返回数据strEPC到RN
                     // 返回给RN的数据格式 {"userData":"6a173f0fd2a140cf20204fbaa6d1c0158518031da248f306535dc6d10026a7c985671ae611afb4c151feb5712eba3d52","assetID":"4330012800000002178203  ","model":"002型","manufacturer":"北京***公司","kind":"电压互感器"}
                 } else {

jscore/pages/Desktop/Home.js

@@ -102,13 +102,7 @@ class DesktopHome extends Component {
         const assetID = item.assetID.slice(parseInt(this.state.no_begin) - 1, parseInt(this.state.no_begin) + parseInt(this.state.no_length) - 1)
         const releaseDates = item.releaseDate.split('-')
         const releaseDate = releaseDates[0] + "年" + releaseDates[1] + "月"
-        let districtText = ''
-        if (parseInt(item.district) > 10000) {
-            districtText = item.districtText
-        } else {
-            const len1 = item.districtText.split('-')[1].length
-            districtText = "国网" + item.districtText.split('-')[1].slice(0, len1 - 1) + "电力"
-        }
+
         return (
             <View
                 key={item.userData}
@@ -169,7 +163,7 @@ class DesktopHome extends Component {
                             <View style={{
                                 flex: 1,
                             }}>
-                                <Text style={[styles.textColor, {textAlign: 'left'}]}>{districtText}</Text>
+                                <Text style={[styles.textColor, {textAlign: 'left'}]}>{item.districtText}</Text>
                             </View>
                             <Text style={[styles.textColor, {textAlign: 'right', paddingRight: 5}]}>NO.{assetID}</Text>
                         </View>
@@ -190,13 +184,7 @@ class DesktopHome extends Component {
         const assetID = item.assetID.slice(parseInt(this.state.no_begin) - 1, parseInt(this.state.no_begin) + parseInt(this.state.no_length) - 1)
         const releaseDates = item.releaseDate.split('-')
         const releaseDate = releaseDates[0] + "年" + releaseDates[1] + "月"
-        let districtText = ''
-        if (parseInt(item.district) > 10000) {
-            districtText = item.districtText
-        } else {
-            const len1 = item.districtText.split('-')[1].length
-            districtText = "国网" + item.districtText.split('-')[1].slice(0, len1 - 1) + "电力"
-        }
+        // todo districtText 长度待调试
         return (
             <View
                 key={item.userData}
@@ -257,7 +245,7 @@ class DesktopHome extends Component {
                             <View style={{
                                 flex: 1,
                             }}>
-                                <Text style={[styles.textColor, {textAlign: 'left'}]}>{districtText}</Text>
+                                <Text style={[styles.textColor, {textAlign: 'left'}]}>{item.districtText}</Text>
                             </View>
                             <Text style={[styles.textColor, {textAlign: 'right', paddingRight: 5}]}>NO.{assetID}</Text>
                         </View>
@@ -352,7 +340,8 @@ class DesktopHome extends Component {
 
 const styles = StyleSheet.create({
     container: {
-        flex: 1
+        flex: 1,
+        backgroundColor:'#fff'
     },
     button: {
         borderRadius: 5,

jscore/pages/Desktop/Set.js

@@ -73,7 +73,7 @@ class SetPower extends Component {
     render() {
         return (
             <Provider>
-                <View style={{margin: 10}}>
+                <View style={{padding: 10, backgroundColor:'#fff'}}>
                     <Text style={styles.font14}>当前功率：{this.state.power}</Text>
                     <Slider
                         value={this.state.power}