Kaynağa Gözat

feat 修复地图选择设备的bug

lihao1 3 yıl önce
ebeveyn
işleme
190349bbcd

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

@@ -58,10 +58,10 @@ public class ObjectRelationDialog extends Dialog implements View.OnClickListener
 
         for (RelConfigEntityPackClass.TargetRelType type : configEntity.targetTypes) {
             if (type.targetCode.equals(equip.getClassCode())) {
-                if (type.canFrom) {
+                if (type.canTo) {
                     toleft.setVisibility(View.VISIBLE);
                 }
-                if (type.canTo) {
+                if (type.canFrom) {
                     toright.setVisibility(View.VISIBLE);
                 }
                 if (type.connect) {

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

@@ -449,7 +449,7 @@ class EquipDetailVM(
                 group.entity = cfg
                 groups.add(group)
             }
-            val cfgTarget = if (targetAsTo) cfg.classCodeTo else cfg.classCodeFrom
+            val cfgTarget = if (!targetAsTo) cfg.classCodeTo else cfg.classCodeFrom
             var tartgetType: RelConfigEntityPackClass.TargetRelType? = null
             for (t in group.targetTypes) {
                 if (t.targetCode.equals(cfgTarget)) {

+ 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.15
+SAGA_ANDROID_VERSION=1.0.16
 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=27
+SAGA_CODE=28
 MAVEN_REPO_SNAPSHOT_URL=http\://dev.dp.sagacloud.cn\:8082/repository/maven-snapshots/
 NEXUS_USERNAME=saga
 DEVELOPER_ID=Andy.Sybotan