Quellcode durchsuchen

照明设备按本地编码显示

lihao vor 3 Jahren
Ursprung
Commit
4bef65386c

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/activities/ChooseSpaceActivity.kt

@@ -311,7 +311,7 @@ class ChooseSpaceActivity : BaseActivity(), DIAware {
                                 tunableSpace.outLine = info.outline[0]
                                 tunableSpace.isShow = true
                                 tunableSpace.id = space.id
-                                tunableSpace.name = ObjectNameUtils.getEquipName(space.infos)
+                                tunableSpace.name = ObjectNameUtils.getEquipName(space)
                                 val item = TunableSpaceItem(tunableSpace)
                                 item.zOrder = 99995f
                                 scene.tunableSpaceList.add(item)

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/activities/SpaceDeliveryCodeActivity.kt

@@ -109,7 +109,7 @@ class SpaceDeliveryCodeActivity : BaseActivity(), DIAware {
                         } else {
                             tv1.text = "??????"
                         }
-                        titleTv.text = ("物业分区-${ObjectNameUtils.getEquipName(floorEntity.infos)}")
+                        titleTv.text = ("物业分区-${ObjectNameUtils.getEquipName(floorEntity)}")
                     }
                 }
                 SpaceDeliveryCodeVM.SERIAL_NUMBER -> {

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/adapter/ContainerExpandAdapter.kt

@@ -95,7 +95,7 @@ class ContainerExpandAdapter(
         }
         val itemTv = holder?.findViewById(R.id.title) as TextView
         val item = mItems[groupPosition][childPosition]
-        itemTv.text = ObjectNameUtils.getEquipName(item.infos)
+        itemTv.text = ObjectNameUtils.getEquipName(item)
         holder.findViewById<TextView>(R.id.delete).setOnClickListener {
             deleteRel?.ondelete(item)
         }

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/adapter/PersonalSelectSingleAdapter.java

@@ -64,7 +64,7 @@ public class PersonalSelectSingleAdapter extends RecyclerView.Adapter<PersonalSe
         if (type.equals(Constant.TYPE2)) {
             ObjectEntity options = (ObjectEntity) item;
 
-            holder.choice_name.setText(ObjectNameUtils.Companion.getEquipName(options.getInfos()));
+            holder.choice_name.setText(ObjectNameUtils.Companion.getEquipName(options));
 
         }
         if (type.equals(Constant.TYPE3)) {

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/adapter/SelectPopListAdapter.java

@@ -64,7 +64,7 @@ public class SelectPopListAdapter extends RecyclerView.Adapter<SelectPopListAdap
             if (options.getObjType().equals("space")) {
                 holder.choice_name.setText(options.getClassCode() + ":" + options.getLocalName());
             } else {
-                holder.choice_name.setText(ObjectNameUtils.Companion.getEquipName(options.getInfos()));
+                holder.choice_name.setText(ObjectNameUtils.Companion.getEquipName(options));
             }
         }
         if (selectPosition > 0 && selectPosition - 1 == position) {

+ 8 - 3
demo/src/main/java/com/sybotan/android/demo/tools/ObjectNameUtils.kt

@@ -1,5 +1,7 @@
 package com.sybotan.android.demo.tools
 
+import android.text.TextUtils
+import com.framework.mvvm.model.db.entity.task.ObjectEntity
 import com.google.gson.JsonElement
 
 /**
@@ -9,11 +11,14 @@ import com.google.gson.JsonElement
 class ObjectNameUtils {
 
     companion object {
-        fun getEquipName(jsonElement: JsonElement?): String {
-            if (jsonElement == null) {
+        fun getEquipName(objectEntity: ObjectEntity?): String {
+            if (objectEntity != null && objectEntity.infos == null) {
                 return "--"
             }
-            val infos = jsonElement.asJsonObject
+            if (objectEntity?.classCode!!.contains("SELTCC") || objectEntity?.name!!.contains("照明回路")) {
+                return if (TextUtils.isEmpty(objectEntity.localId)) "--" else objectEntity.localId.toString()
+            }
+            val infos = objectEntity?.infos?.asJsonObject
             return if (infos?.get("digitalDeliveryID") == null) "--" else infos.get("digitalDeliveryID").toString()
         }
     }

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/view/ObjectRelationDialog.java

@@ -54,7 +54,7 @@ public class ObjectRelationDialog extends Dialog implements View.OnClickListener
         relationTitle.setText(configEntity.entity.getGraphName() + "/" + configEntity.entity.getRelName());
         leftName.setText(localId);
 
-        rightName.setText(ObjectNameUtils.Companion.getEquipName(equip.getInfos()));
+        rightName.setText(ObjectNameUtils.Companion.getEquipName(equip));
 
         for (RelConfigEntityPackClass.TargetRelType type : configEntity.targetTypes) {
             if (type.targetCode.equals(equip.getClassCode())) {

+ 2 - 2
demo/src/main/java/com/sybotan/android/demo/view/PipeDialog.java

@@ -57,10 +57,10 @@ public class PipeDialog extends Dialog implements View.OnClickListener {
 
         if (Objects.equals(configEntity.entity.getClassCodeFrom(), equip.getClassCode())) {
             leftName.setText(localId);
-            rightName.setText(ObjectNameUtils.Companion.getEquipName(equip.getInfos()));
+            rightName.setText(ObjectNameUtils.Companion.getEquipName(equip));
         } else {
             rightName.setText(localId);
-            leftName.setText(ObjectNameUtils.Companion.getEquipName(equip.getInfos()));
+            leftName.setText(ObjectNameUtils.Companion.getEquipName(equip));
         }
         for (PipeConfigEntityPackClass.TargetPipeType type : configEntity.targetTypes) {
             if (type.targetCode.equals(equip.getClassCode())) {

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/view/SelectListSinglePopupWindow.java

@@ -131,7 +131,7 @@ public class SelectListSinglePopupWindow extends PopupWindow {
                     String s = searchEdt.getText().toString().trim();
                     itemList.clear();
                     for (int i = 0; i < dataList.size(); i++) {
-                        if ((Objects.requireNonNull(ObjectNameUtils.Companion.getEquipName(dataList.get(i).getInfos())).contains(s)) || (!TextUtils.isEmpty(dataList.get(i).getClassCode()) && Objects.requireNonNull(dataList.get(i).getClassCode()).contains(s)) || Objects.requireNonNull(dataList.get(i).getClassCode()).contains(s)) {
+                        if ((Objects.requireNonNull(ObjectNameUtils.Companion.getEquipName(dataList.get(i))).contains(s)) || (!TextUtils.isEmpty(dataList.get(i).getClassCode()) && Objects.requireNonNull(dataList.get(i).getClassCode()).contains(s)) || Objects.requireNonNull(dataList.get(i).getClassCode()).contains(s)) {
                             itemList.add(dataList.get(i));
                         }
                     }

+ 3 - 3
demo/src/main/java/com/sybotan/android/demo/viewmodel/ChooseSpaceVM.kt

@@ -264,7 +264,7 @@ class ChooseSpaceVM(
 
                 val tunableSpace = TunableSpace()
                 tunableSpace.outLine = info.outline[0]
-                tunableSpace.name = ObjectNameUtils.getEquipName(objEntity.infos)
+                tunableSpace.name = ObjectNameUtils.getEquipName(objEntity)
                 tunableSpace.id = objEntity.id
                 val floor = repo.getFloorById(objEntity.floorId!!)
                 tunableSpace.floorName = floor.localName
@@ -329,13 +329,13 @@ class ChooseSpaceVM(
             if (from == null) {
                 rel.objFromLocalId = "该设备"
             } else {
-                rel.objFromLocalId = ObjectNameUtils.getEquipName(from.infos)
+                rel.objFromLocalId = ObjectNameUtils.getEquipName(from)
             }
             val to = repo.getObject(rel.objTo!!)
             if (to == null) {
                 rel.objToLocalId = "该设备"
             } else {
-                rel.objToLocalId = ObjectNameUtils.getEquipName(to.infos)
+                rel.objToLocalId = ObjectNameUtils.getEquipName(to)
             }
         }
     }

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/viewmodel/ContainerVM.kt

@@ -53,7 +53,7 @@ class ContainerVM(
                 children.add(child)
             }
             val hashMap = HashMap<String, Any>()
-            hashMap.put("title", ObjectNameUtils.getEquipName(equip.infos!!))
+            hashMap.put("title", ObjectNameUtils.getEquipName(equip!!))
             hashMap.put("parent", parent)
             hashMap.put("child", children)
             mEmitter.SendDirective(CONTAINER, hashMap)

+ 4 - 4
demo/src/main/java/com/sybotan/android/demo/viewmodel/EquipDetailVM.kt

@@ -322,13 +322,13 @@ class EquipDetailVM(
         if (from == null) {
             floorPipe.objFromLocalId = "该设备"
         } else {
-            floorPipe.objFromLocalId = ObjectNameUtils.getEquipName(from.infos)
+            floorPipe.objFromLocalId = ObjectNameUtils.getEquipName(from)
         }
         val to = repo.getObject(floorPipe.objTo!!)
         if (to == null) {
             floorPipe.objToLocalId = "该设备"
         } else {
-            floorPipe.objToLocalId = ObjectNameUtils.getEquipName(to.infos)
+            floorPipe.objToLocalId = ObjectNameUtils.getEquipName(to)
         }
     }
 
@@ -415,13 +415,13 @@ class EquipDetailVM(
             if (from == null) {
                 rel.objFromLocalId = "该设备"
             } else {
-                rel.objFromLocalId = ObjectNameUtils.getEquipName(from.infos)
+                rel.objFromLocalId = ObjectNameUtils.getEquipName(from)
             }
             val to = repo.getObject(rel.objTo!!)
             if (to == null) {
                 rel.objToLocalId = "该设备"
             } else {
-                rel.objToLocalId = ObjectNameUtils.getEquipName(to.infos)
+                rel.objToLocalId = ObjectNameUtils.getEquipName(to)
             }
         }
     }

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/viewmodel/GraphyVM.kt

@@ -80,7 +80,7 @@ class GraphyVM(
                 objectEntity?.let {
                     spaceJobModel.buildingId = buildingId
                     spaceJobModel.id = spaceEntity.spaceId
-                    spaceJobModel.localName = ObjectNameUtils.getEquipName(objectEntity.infos)
+                    spaceJobModel.localName = ObjectNameUtils.getEquipName(objectEntity)
                     spaceJobModel.name = objectEntity.name
                     spaceJobModel.projectId = projectId
                     val infos = gson.fromJson(objectEntity.infos, InfosForObj::class.java)

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/viewmodel/SpaceMapVM.kt

@@ -69,7 +69,7 @@ class SpaceMapVM(
                 if (objectEntity != null) {
                     spaceJobModel.buildingId = buildingId
                     spaceJobModel.id = spaceEntity.spaceId
-                    spaceJobModel.localName = ObjectNameUtils.getEquipName(objectEntity.infos)
+                    spaceJobModel.localName = ObjectNameUtils.getEquipName(objectEntity)
                     spaceJobModel.name = objectEntity.name
                     spaceJobModel.projectId = projectId
                     val infos = gson.fromJson(objectEntity.infos, InfosForObj::class.java)

+ 2 - 2
gradle.properties

@@ -17,14 +17,14 @@ SAGA_SERVICE_VERSION=1.4.140
 MAVEN_REPO_RELEASE_URL=http\://dev.dp.sagacloud.cn\:8082/repository/maven-releases/
 EVENTBUS_VERSION=3.1.1
 EASYPERMISSIONS_VERSION=1.2.0
-SAGA_ANDROID_VERSION=1.0.2
+SAGA_ANDROID_VERSION=1.0.3
 JUNIT_VERSION=5.3.1
 KOTLIN_VERSION=1.5.31
 SAGA_GROUP=cn.sagacloud
 SYBOTAN_KOTLIN_VERSION=1.2.42
 android.useAndroidX=true
 LICENSE_NAME=The Apache Software License, Version 2.0
-SAGA_CODE=14
+SAGA_CODE=15
 MAVEN_REPO_SNAPSHOT_URL=http\://dev.dp.sagacloud.cn\:8082/repository/maven-snapshots/
 NEXUS_USERNAME=saga
 DEVELOPER_ID=Andy.Sybotan