Ver código fonte

add poc2.0第一天测试需求

lihao1 3 anos atrás
pai
commit
3492760048

+ 1 - 1
cadengine/src/main/java/cn/sagacloud/android/cadengine/items/TunableSpaceItem.kt

@@ -216,7 +216,7 @@ class TunableSpaceItem(val data: TunableSpace, parent: SGraphyItem? = null) : SG
                 }
             }
             outPaint.color = Color.parseColor("#7E96FF")
-            canvas.drawPath(spacePath!!, outPaint)
+//            canvas.drawPath(spacePath!!, outPaint)
             canvas.drawPath(spacePath!!, paint)
         }
         super.onDraw(canvas)

+ 8 - 8
demo/src/main/java/com/sybotan/android/demo/adapter/StaticInfoAdapter.java

@@ -302,14 +302,14 @@ public class StaticInfoAdapter extends BaseRecyclerViewAdapter<Infos> {
 
     @SuppressLint("ClickableViewAccessibility")
     private void initEditTextTouch(EditText editText, Infos info) {
-        editText.setOnTouchListener((v, event) -> {
-            if (MotionEvent.ACTION_DOWN == event.getAction()) {
-                v.getParent().requestDisallowInterceptTouchEvent(true);
-            } else if (MotionEvent.ACTION_UP == event.getAction()) {
-                v.getParent().requestDisallowInterceptTouchEvent(false);
-            }
-            return false;
-        });
+//        editText.setOnTouchListener((v, event) -> {
+//            if (MotionEvent.ACTION_DOWN == event.getAction()) {
+//                v.getParent().requestDisallowInterceptTouchEvent(true);
+//            } else if (MotionEvent.ACTION_UP == event.getAction()) {
+//                v.getParent().requestDisallowInterceptTouchEvent(false);
+//            }
+//            return false;
+//        });
         TextWatcher textWatcher = new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/bean/ApkVersionBean.java

@@ -4,7 +4,7 @@ package com.sybotan.android.demo.bean;
  * 2020/7/17.
  */
 public class ApkVersionBean {
-    public String appId = "e467fe4f-8ff5-4526-aef1-f852f4aa14fa";
+    public String appId = "7dd92019-d11d-46f1-9272-189caa4464b9";
     public String appTypeId = "android";
 
     public ApkVersionBean() {

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

@@ -82,17 +82,30 @@ class GraphyVM(
                 spaceJobModel.localName = objectEntity!!.localName
                 spaceJobModel.name = objectEntity.name
                 spaceJobModel.projectId = projectId
-                if (spaceEntity.archState == 1) {
-                    spaceJobModel.job = "01"
-                } else if (spaceEntity.archState == 2 && spaceEntity.equipState == 1) {
-                    if (from.equals("space")) {
-                        spaceJobModel.job = "03"
+                if (from.equals("space")) {
+                    if (spaceEntity.archState == 1) {
+                        spaceJobModel.job = "01"
                     } else {
+                        spaceJobModel.job = "03"
+                    }
+                } else {
+                    if (spaceEntity.equipState == 1) {
                         spaceJobModel.job = "04"
+                    } else {
+                        spaceJobModel.job = "05"
                     }
-                } else if (spaceEntity.archState == 2 && spaceEntity.equipState == 2) {
-                    spaceJobModel.job = "05"
                 }
+//                if (spaceEntity.archState == 1) {
+//                    spaceJobModel.job = "01"
+//                } else if (spaceEntity.archState == 2 && spaceEntity.equipState == 1) {
+//                    if (from.equals("space")) {
+//                        spaceJobModel.job = "03"
+//                    } else {
+//                        spaceJobModel.job = "04"
+//                    }
+//                } else if (spaceEntity.archState == 2 && spaceEntity.equipState == 2) {
+//                    spaceJobModel.job = "05"
+//                }
                 val strInfo = gson.fromJson(objectEntity.strInfos, StrInfos::class.java)
 
                 spaceJobModel.outline = strInfo.outline
@@ -834,29 +847,47 @@ class GraphyVM(
             for (config in fromList) {
                 val relsFrom = repo.getRelByCodeFrom(config.graphCode!!, config.relCode!!, equipId)
                 if (!CommonUtils.IsNull(relsFrom)) {
-                    for (rel in relsFrom) {
+                    var relRealFrom = ArrayList<RelationEntity>()
+                    relRealFrom.addAll(relsFrom)
+                    for (rel in relRealFrom) {
                         val objFrom = repo.getObject(rel.objFrom!!)
                         val objTo = repo.getObject(rel.objTo!!)
                         if (objFrom == null) {
                             rel.objFromLocalId = "该设备"
+                            if (!entity.code.equals(config.classCodeFrom)) {
+                                relRealFrom.remove(rel)
+                                continue
+                            }
                         } else {
                             if (TextUtils.isEmpty(objFrom.localId)) {
                                 rel.objFromLocalId = objFrom.localName
                             } else {
                                 rel.objFromLocalId = objFrom.localId
                             }
+                            if (!objFrom.classCode.equals(config.classCodeFrom)) {
+                                relRealFrom.remove(rel)
+                                continue
+                            }
                         }
                         if (objTo == null) {
                             rel.objToLocalId = "该设备"
+                            if (!entity.code.equals(config.classCodeTo)) {
+                                relRealFrom.remove(rel)
+                                continue
+                            }
                         } else {
                             if (TextUtils.isEmpty(objTo.localId)) {
                                 rel.objToLocalId = objTo.localName
                             } else {
                                 rel.objToLocalId = objTo.localId
                             }
+                            if (!objTo.classCode.equals(config.classCodeTo)) {
+                                relRealFrom.remove(rel)
+                                continue
+                            }
                         }
                     }
-                    relList.add(relsFrom)
+                    relList.add(relRealFrom)
                 } else {
                     relList.add(ArrayList<RelationEntity>())
                 }
@@ -884,29 +915,47 @@ class GraphyVM(
             for (config in toList) {
                 val relsTo = repo.getRelByCodeTo(config.graphCode!!, config.relCode!!, equipId)
                 if (!CommonUtils.IsNull(relsTo)) {
-                    for (rel in relsTo) {
+                    var relRealTo = ArrayList<RelationEntity>()
+                    relRealTo.addAll(relsTo)
+                    for (rel in relRealTo) {
                         val objFrom = repo.getObject(rel.objFrom!!)
                         val objTo = repo.getObject(rel.objTo!!)
                         if (objFrom == null) {
                             rel.objFromLocalId = "该设备"
+                            if (!entity.code.equals(config.classCodeFrom)) {
+                                relRealTo.remove(rel)
+                                continue
+                            }
                         } else {
                             if (TextUtils.isEmpty(objFrom.localId)) {
                                 rel.objFromLocalId = objFrom.localName
                             } else {
                                 rel.objFromLocalId = objFrom.localId
                             }
+                            if (!objFrom.classCode.equals(config.classCodeFrom)) {
+                                relRealTo.remove(rel)
+                                continue
+                            }
                         }
                         if (objTo == null) {
                             rel.objToLocalId = "该设备"
+                            if (!entity.code.equals(config.classCodeTo)) {
+                                relRealTo.remove(rel)
+                                continue
+                            }
                         } else {
                             if (TextUtils.isEmpty(objTo.localId)) {
                                 rel.objToLocalId = objTo.localName
                             } else {
                                 rel.objToLocalId = objTo.localId
                             }
+                            if (!objTo.classCode.equals(config.classCodeTo)) {
+                                relRealTo.remove(rel)
+                                continue
+                            }
                         }
                     }
-                    relList.add(relsTo)
+                    relList.add(relRealTo)
                 } else {
                     relList.add(ArrayList<RelationEntity>())
                 }
@@ -946,29 +995,47 @@ class GraphyVM(
                 val pipeFrom =
                     repo.getPipeByIdFrom(equipId, config.pipeType!!, config.pipeSubType!!)
                 if (!CommonUtils.IsNull(pipeFrom)) {
-                    for (rel in pipeFrom) {
+                    var pipeRealFrom = ArrayList<PipeEntity>()
+                    pipeRealFrom.addAll(pipeFrom)
+                    for (rel in pipeRealFrom) {
                         val objFrom = repo.getObject(rel.objFrom!!)
                         val objTo = repo.getObject(rel.objTo!!)
                         if (objFrom == null) {
                             rel.objFromLocalId = "该设备"
+                            if (!entity.code.equals(config.classCodeFrom)) {
+                                pipeRealFrom.remove(rel)
+                                continue
+                            }
                         } else {
                             if (TextUtils.isEmpty(objFrom.localId)) {
                                 rel.objFromLocalId = objFrom.localName
                             } else {
                                 rel.objFromLocalId = objFrom.localId
                             }
+                            if (!objFrom.classCode.equals(config.classCodeFrom)) {
+                                pipeRealFrom.remove(rel)
+                                continue
+                            }
                         }
                         if (objTo == null) {
                             rel.objToLocalId = "该设备"
+                            if (!entity.code.equals(config.classCodeTo)) {
+                                pipeRealFrom.remove(rel)
+                                continue
+                            }
                         } else {
                             if (TextUtils.isEmpty(objTo.localId)) {
                                 rel.objToLocalId = objTo.localName
                             } else {
                                 rel.objToLocalId = objTo.localId
                             }
+                            if (!objTo.classCode.equals(config.classCodeTo)) {
+                                pipeRealFrom.remove(rel)
+                                continue
+                            }
                         }
                     }
-                    pipeChildren.add(pipeFrom)
+                    pipeChildren.add(pipeRealFrom)
                 } else {
                     pipeChildren.add(ArrayList<PipeEntity>())
                 }
@@ -985,29 +1052,47 @@ class GraphyVM(
             for (config in pipeToList) {
                 val pipeFrom = repo.getPipeByIdTo(equipId, config.pipeType!!, config.pipeSubType!!)
                 if (!CommonUtils.IsNull(pipeFrom)) {
-                    for (rel in pipeFrom) {
+                    var pipeRealFrom = ArrayList<PipeEntity>()
+                    pipeRealFrom.addAll(pipeFrom)
+                    for (rel in pipeRealFrom) {
                         val objFrom = repo.getObject(rel.objFrom!!)
                         val objTo = repo.getObject(rel.objTo!!)
                         if (objFrom == null) {
                             rel.objFromLocalId = "该设备"
+                            if (!entity.code.equals(config.classCodeFrom)) {
+                                pipeRealFrom.remove(rel)
+                                continue
+                            }
                         } else {
                             if (TextUtils.isEmpty(objFrom.localId)) {
                                 rel.objFromLocalId = objFrom.localName
                             } else {
                                 rel.objFromLocalId = objFrom.localId
                             }
+                            if (!objFrom.classCode.equals(config.classCodeFrom)) {
+                                pipeRealFrom.remove(rel)
+                                continue
+                            }
                         }
                         if (objTo == null) {
                             rel.objToLocalId = "该设备"
+                            if (!entity.code.equals(config.classCodeTo)) {
+                                pipeRealFrom.remove(rel)
+                                continue
+                            }
                         } else {
                             if (TextUtils.isEmpty(objTo.localId)) {
                                 rel.objToLocalId = objTo.localName
                             } else {
                                 rel.objToLocalId = objTo.localId
                             }
+                            if (!objTo.classCode.equals(config.classCodeTo)) {
+                                pipeRealFrom.remove(rel)
+                                continue
+                            }
                         }
                     }
-                    pipeChildren.add(pipeFrom)
+                    pipeChildren.add(pipeRealFrom)
                 } else {
                     pipeChildren.add(ArrayList<PipeEntity>())
                 }
@@ -1218,7 +1303,9 @@ class GraphyVM(
             observable,
             object : BaseObserver<java.util.ArrayList<AutoUpDateBean.Content>>(mActivity, this) {
                 override fun onSuccess(models: ArrayList<AutoUpDateBean.Content>) {
-                    mEmitter.SendDircetive(UPDATE_APP, models.get(0))
+                    if (!CommonUtils.IsNull(models)) {
+                        mEmitter.SendDircetive(UPDATE_APP, models.get(0))
+                    }
                 }
             },
             true