Pārlūkot izejas kodu

地区显示修改

wushaodong 3 gadi atpakaļ
vecāks
revīzija
220e791230

+ 1 - 1
android/app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20,"versionName":"2.0.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"1.0.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

BIN
android/app/src/main/jniLibs/arm64-v8a/libcore.so


BIN
android/app/src/main/jniLibs/armeabi-v7a/libcore.so


BIN
android/app/src/main/jniLibs/corewrapper.aar


BIN
android/app/src/main/jniLibs/x86/libcore.so


+ 18 - 4
jscore/pages/Desktop/Home.js

@@ -81,9 +81,16 @@ class DesktopHome extends Component {
     }
 
     dianYaRender = (item, index) => {
-        const assetID = item.assetID.slice(parseInt(this.state.no_begin) -1, parseInt(this.state.no_begin)+parseInt(this.state.no_length)-1)
+        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={index}
@@ -144,7 +151,7 @@ class DesktopHome extends Component {
                             <View style={{
                                 flex: 1,
                             }}>
-                                <Text style={[styles.textColor, {textAlign: 'left'}]}>{item.districtText}</Text>
+                                <Text style={[styles.textColor, {textAlign: 'left'}]}>{districtText}</Text>
                             </View>
                             <Text style={[styles.textColor, {textAlign: 'right', paddingRight: 5}]}>NO.{assetID}</Text>
                         </View>
@@ -162,9 +169,16 @@ class DesktopHome extends Component {
     }
 
     dianLiuRender = (item, index) => {
-        const assetID = item.assetID.slice(parseInt(this.state.no_begin) -1, parseInt(this.state.no_begin)+parseInt(this.state.no_length)-1)
+        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={index}
@@ -225,7 +239,7 @@ class DesktopHome extends Component {
                             <View style={{
                                 flex: 1,
                             }}>
-                                <Text style={[styles.textColor, {textAlign: 'left'}]}>{item.districtText}</Text>
+                                <Text style={[styles.textColor, {textAlign: 'left'}]}>{districtText}</Text>
                             </View>
                             <Text style={[styles.textColor, {textAlign: 'right', paddingRight: 5}]}>NO.{assetID}</Text>
                         </View>