|
@@ -8,12 +8,13 @@ import android.widget.ListView
|
|
|
import android.widget.TextView
|
|
|
import com.sybotan.android.demo.R
|
|
|
import com.sybotan.android.demo.activities.BaseActivity
|
|
|
-import com.sybotan.android.demo.adapter.EqToEqRelAdapter
|
|
|
import com.sybotan.android.demo.adapter.RelationAdapter
|
|
|
import com.sybotan.android.demo.adapter.ServerRelAdapter
|
|
|
+import com.sybotan.android.demo.adapter.SpacePipeAdapter
|
|
|
import com.sybotan.android.demo.bean.request.ReqEqToEqRel
|
|
|
import com.sybotan.android.demo.bean.request.ReqEqToRel
|
|
|
import com.sybotan.android.demo.entitiies.RelationEq
|
|
|
+import com.sybotan.android.demo.entitiies.SpacePipe
|
|
|
import com.sybotan.android.demo.retrofit.BaseViewModelInterface
|
|
|
import com.sybotan.android.demo.viewmodel.RelationVM
|
|
|
|
|
@@ -163,7 +164,12 @@ class RelationActivity : BaseActivity() {
|
|
|
}
|
|
|
|
|
|
EQ_PIPE_CNCT -> {
|
|
|
-
|
|
|
+ val rel = ReqEqToEqRel(
|
|
|
+ eq_id = mMajorEqToEq?.deviceId ?: "",
|
|
|
+ target_id = mPipe?.pipeId ?: "",
|
|
|
+ rel = EQ_PIPE_CNCT
|
|
|
+ )
|
|
|
+ mVm.addEqToEq(rel)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -174,18 +180,23 @@ class RelationActivity : BaseActivity() {
|
|
|
}
|
|
|
|
|
|
|
|
|
- private lateinit var mEqs: List<RelationEq>
|
|
|
+ private var mEqs = mutableListOf<RelationEq>()
|
|
|
+ private var mPipes = mutableListOf<SpacePipe>()
|
|
|
private var serverRelEqs = mutableListOf<RelationEq>()
|
|
|
|
|
|
private lateinit var mVm: RelationVM
|
|
|
private var mMajorEqToEq: RelationEq? = null
|
|
|
private var mMinorEqToEq: RelationEq? = null
|
|
|
-
|
|
|
+ private var mPipe: SpacePipe? = null
|
|
|
+ private var mPipeVM: RelationVM? = null
|
|
|
private fun initViewModel() {
|
|
|
mVm = RelationVM(BaseViewModelInterface { name, params ->
|
|
|
- mEqs = params as List<RelationEq>
|
|
|
+
|
|
|
when (name) {
|
|
|
EQ_SP_SERVE -> {
|
|
|
+ val eqs = params as List<RelationEq>
|
|
|
+ mEqs.clear()
|
|
|
+ mEqs.addAll(eqs)
|
|
|
val adapter = ServerRelAdapter(mEqs, this@RelationActivity) { eq ->
|
|
|
serverRelEqs.clear()
|
|
|
serverRelEqs.addAll(eq)
|
|
@@ -194,7 +205,10 @@ class RelationActivity : BaseActivity() {
|
|
|
mMajorLv.setAdapter(adapter)
|
|
|
}
|
|
|
|
|
|
- EQ_EQ_SS, EQ_EQ_VV, EQ_EQ_CTRL, EQ_EQ_POWER -> {
|
|
|
+ EQ_EQ_SS, EQ_EQ_VV, EQ_EQ_CTRL, EQ_EQ_POWER, EQ_PIPE_CNCT -> {
|
|
|
+ val eqs = params as List<RelationEq>
|
|
|
+ mEqs.clear()
|
|
|
+ mEqs.addAll(eqs)
|
|
|
val majorAdapter = RelationAdapter(mEqs, this@RelationActivity) { eq ->
|
|
|
mMajorEqToEq = eq
|
|
|
}
|
|
@@ -205,13 +219,29 @@ class RelationActivity : BaseActivity() {
|
|
|
mMinorLv.adapter = minorAdapter
|
|
|
|
|
|
}
|
|
|
- EQ_PIPE_CNCT -> {
|
|
|
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
}, this)
|
|
|
+
|
|
|
+
|
|
|
mVm.getEqs(mSpaceId, code)
|
|
|
- }
|
|
|
|
|
|
+ mPipeVM = RelationVM(BaseViewModelInterface { name, params ->
|
|
|
+ if (name == EQ_PIPE_CNCT) {
|
|
|
+ val pipes = params as List<SpacePipe>
|
|
|
+ println("pipes: $pipes")
|
|
|
+ mPipes.clear()
|
|
|
+ mPipes.addAll(pipes)
|
|
|
+ val pipeAdapter = SpacePipeAdapter(mPipes, this@RelationActivity) { pipe ->
|
|
|
+ mPipe = pipe
|
|
|
+ }
|
|
|
+ mMinorLv.adapter = pipeAdapter
|
|
|
+ }
|
|
|
+ }, this)
|
|
|
+
|
|
|
+ if (code == EQ_PIPE_CNCT) {
|
|
|
+ mPipeVM?.getPipes(mSpaceId, code)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|