排版

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

@@ -21,10 +21,6 @@ import java.util.TimerTask;
 public class UHFReadTagFragment {
 
     private static UHFReadTagFragment mInstance;
-    private boolean isStart = true;
-
-    private boolean loopFlag = false;
-    private int inventoryFlag = 1; // 默认循环读取
     private MainActivity mContext;
 
     private Timer mTimer = null;
@@ -52,16 +48,8 @@ public class UHFReadTagFragment {
 
     // wsdd userd
     public void onCheckedChanged(int checkedId) {
-        // wsdd 选择单步，还是循环扫描
         // 设置循环盘点同时读取 EPC、TID、USER 模式
         mContext.mReader.setEPCAndTIDUserMode(0, 24);
-        if (checkedId == 0) {
-            // 单步识别
-            inventoryFlag = 0;
-        } else if (checkedId == 1) {
-            // 单标签循环识别
-            inventoryFlag = 1;
-        }
     }
 
     private void readTag() {
@@ -83,6 +71,7 @@ public class UHFReadTagFragment {
                     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 + "\""; // 电压等级

jscore/pages/Desktop/Home.js

@@ -57,9 +57,8 @@ class DesktopHome extends Component {
 
     dianYaRender = (item, index) => {
         const assetID = item.assetID.slice(7, 21)
-        const districtText = item.districtText.split('-')[0]
         const releaseDates = item.releaseDate.split('-')
-        const releaseDate = releaseDates[0]+"年"+releaseDates[1]+"月"
+        const releaseDate = releaseDates[0] + "年" + releaseDates[1] + "月"
         return (
             <View
                 key={index}
@@ -74,18 +73,28 @@ class DesktopHome extends Component {
                     <Text style={styles.textColor3}>绕组数量：{item.secondWindingCount}</Text>
                 </View>
                 <View style={styles.betweenView}>
-                    <Text style={styles.textColor3}>二次电压</Text>
+                    <Text style={styles.textColor4}>二次电压</Text>
                     <View style={styles.centerWidth}>
-                        <Text style={styles.textColor3}>准确等级</Text>
+                        <Text style={styles.textColor4}>准确等级</Text>
                     </View>
-                    <Text style={styles.textColor3}>生产日期</Text>
+                    <View style={styles.rightWidth}>
+                        <Text style={styles.textColor4}>功率因数</Text>
+                    </View>
+                    <Text style={styles.textColor4}>生产日期</Text>
                 </View>
                 <View style={styles.betweenView}>
-                    <Text style={styles.textColor3}>{item.secondVoltage}</Text>
+                    <View style={styles.centerView}>
+                        <Text style={styles.textColor4}>{item.secondVoltage}</Text>
+                    </View>
                     <View style={styles.centerWidth}>
-                        <Text style={styles.textColor3}>{item.accuracy}</Text>
+                        <Text style={styles.textColor4}>{item.accuracy}</Text>
+                    </View>
+                    <View style={styles.rightWidth}>
+                        <Text style={styles.textColor4}>{item.powerFactor}</Text>
+                    </View>
+                    <View style={styles.centerView}>
+                        <Text style={styles.textColor4}>{releaseDate}</Text>
                     </View>
-                    <Text style={styles.textColor3}>{releaseDate}</Text>
                 </View>
                 <View style={styles.betweenView}>
                     <Text style={styles.textColor3}>安装场所：{item.place}</Text>
@@ -95,7 +104,9 @@ class DesktopHome extends Component {
                     <Text style={styles.textColor3}>电压因数：{item.voltageFactor}</Text>
                 </View>
                 <View style={styles.betweenView}>
-                    <Text style={styles.textColor3}>{item.manufacturer}</Text>
+                    <View style={styles.centerView}>
+                        <Text style={styles.textColor3}>{item.manufacturer}</Text>
+                    </View>
                     <View style={{
                         width: (screenW - 10) / 3 * 2,
                         borderLeftWidth: 0.5,
@@ -108,15 +119,15 @@ 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'}]}>NO.{assetID}</Text>
+                            <Text style={[styles.textColor, {textAlign: 'right', paddingRight: 5}]}>NO.{assetID}</Text>
                         </View>
                         <View style={{
                             marginHorizontal: 5,
                         }}>
                             <Barcode value={item.assetID} format="CODE128" height={35} width={1.1}/>
-                            <Text style={[styles.textColor]}>{item.assetID}</Text>
+                            <Text style={styles.textColor}>{item.assetID}</Text>
                         </View>
                     </View>
                 </View>
@@ -127,9 +138,8 @@ class DesktopHome extends Component {
 
     dianLiuRender = (item, index) => {
         const assetID = item.assetID.slice(7, 21)
-        const districtText = item.districtText.split('-')[0]
         const releaseDates = item.releaseDate.split('-')
-        const releaseDate = releaseDates[0]+"年"+releaseDates[1]+"月"
+        const releaseDate = releaseDates[0] + "年" + releaseDates[1] + "月"
         return (
             <View
                 key={index}
@@ -144,18 +154,28 @@ class DesktopHome extends Component {
                     <Text style={styles.textColor3}>绕组数量：{item.secondWindingCount}</Text>
                 </View>
                 <View style={styles.betweenView}>
-                    <Text style={styles.textColor3}>一次电流</Text>
+                    <Text style={styles.textColor4}>一次电流</Text>
                     <View style={styles.centerWidth}>
-                        <Text style={styles.textColor3}>二次电流</Text>
+                        <Text style={styles.textColor4}>二次电流</Text>
+                    </View>
+                    <View style={styles.rightWidth}>
+                        <Text style={styles.textColor4}>功率因数</Text>
                     </View>
-                    <Text style={styles.textColor3}>生产日期</Text>
+                    <Text style={styles.textColor4}>生产日期</Text>
                 </View>
                 <View style={styles.betweenView}>
-                    <Text style={styles.textColor3}>{item.firstCurrent}</Text>
+                    <View style={styles.centerView}>
+                        <Text style={styles.textColor4}>{item.firstCurrent}</Text>
+                    </View>
                     <View style={styles.centerWidth}>
-                        <Text style={styles.textColor3}>{item.senondCurrent}</Text>
+                        <Text style={styles.textColor4}>{item.senondCurrent}</Text>
+                    </View>
+                    <View style={styles.rightWidth}>
+                        <Text style={styles.textColor4}>{item.powerFactor}</Text>
+                    </View>
+                    <View style={styles.centerView}>
+                        <Text style={styles.textColor4}>{releaseDate}</Text>
                     </View>
-                    <Text style={styles.textColor3}>{releaseDate}</Text>
                 </View>
                 <View style={styles.betweenView}>
                     <Text style={styles.textColor3}>安装场所：{item.place}</Text>
@@ -165,7 +185,9 @@ class DesktopHome extends Component {
                     <Text style={styles.textColor3}>准确等级：{item.accuracy}</Text>
                 </View>
                 <View style={styles.betweenView}>
-                    <Text style={styles.textColor3}>{item.manufacturer}</Text>
+                    <View style={styles.centerView}>
+                        <Text style={styles.textColor3}>{item.manufacturer}</Text>
+                    </View>
                     <View style={{
                         width: (screenW - 10) / 3 * 2,
                         borderLeftWidth: 0.5,
@@ -178,15 +200,15 @@ 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'}]}>NO.{assetID}</Text>
+                            <Text style={[styles.textColor, {textAlign: 'right', paddingRight: 5}]}>NO.{assetID}</Text>
                         </View>
                         <View style={{
                             marginHorizontal: 5,
                         }}>
                             <Barcode value={item.assetID} format="CODE128" height={35} width={1.1}/>
-                            <Text style={[styles.textColor]}>{item.assetID}</Text>
+                            <Text style={styles.textColor}>{item.assetID}</Text>
                         </View>
                     </View>
                 </View>
@@ -284,6 +306,12 @@ const styles = StyleSheet.create({
         textAlign: 'center',
         width: (screenW - 9) / 3,
 
+    },
+    textColor4: {
+        color: '#333',
+        textAlign: 'center',
+        width: (screenW - 8) / 4,
+
     },
     textColor2: {
         color: '#333',
@@ -300,13 +328,24 @@ const styles = StyleSheet.create({
         justifyContent: 'space-between',
         borderTopWidth: 0.5,
         borderTopColor: '#7b7b7b',
-        alignItems: 'center',
     },
     centerWidth: {
         borderLeftWidth: 0.5,
         borderRightWidth: 0.5,
         borderLeftColor: '#7b7b7b',
         borderRightColor: '#7b7b7b',
+        alignItems: 'center',
+        flexDirection: 'row',
+    },
+    centerView: {
+        alignItems: 'center',
+        flexDirection: 'row',
+    },
+    rightWidth: {
+        borderRightWidth: 0.5,
+        borderRightColor: '#7b7b7b',
+        alignItems: 'center',
+        flexDirection: 'row',
     },
 })