|
@@ -1,6 +1,5 @@
|
|
|
package com.sybotan.android.demo.activities.poc
|
|
|
|
|
|
-import android.support.v7.app.AppCompatActivity
|
|
|
import android.os.Bundle
|
|
|
import android.view.View
|
|
|
import android.widget.Button
|
|
@@ -9,16 +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.ExpandAdapter
|
|
|
+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.bean.request.ReqEqToEqRel
|
|
|
import com.sybotan.android.demo.bean.request.ReqEqToRel
|
|
|
-import com.sybotan.android.demo.bean.result.SpaceEqModel
|
|
|
-import com.sybotan.android.demo.entitiies.Build
|
|
|
-import com.sybotan.android.demo.entitiies.EqEntity
|
|
|
import com.sybotan.android.demo.entitiies.RelationEq
|
|
|
import com.sybotan.android.demo.retrofit.BaseViewModelInterface
|
|
|
-import com.sybotan.android.demo.viewmodel.BuildVM
|
|
|
import com.sybotan.android.demo.viewmodel.RelationVM
|
|
|
|
|
|
|
|
@@ -92,7 +88,7 @@ class RelationActivity : BaseActivity() {
|
|
|
mSpaceId = bundle?.getString("spaceId") ?: ""
|
|
|
type = bundle?.getString("type") ?: ""
|
|
|
code = bundle?.getString("code") ?: ""
|
|
|
-
|
|
|
+ println("code: $code")
|
|
|
when (code) {
|
|
|
EQ_SP_SERVE -> {
|
|
|
mMinorTv.visibility = View.GONE
|
|
@@ -154,7 +150,20 @@ class RelationActivity : BaseActivity() {
|
|
|
EQ_SP_SERVE -> {
|
|
|
val list = serverRelEqs.map { it.deviceId }
|
|
|
val rel = ReqEqToRel(eq_id = list, target_id = mSpaceId, rel = EQ_SP_SERVE)
|
|
|
- mVm.addEq(rel)
|
|
|
+ mVm.addEqToSer(rel)
|
|
|
+ }
|
|
|
+
|
|
|
+ EQ_EQ_SS, EQ_EQ_VV, EQ_EQ_CTRL, EQ_EQ_POWER -> {
|
|
|
+ val rel = ReqEqToEqRel(
|
|
|
+ eq_id = mMajorEqToEq?.deviceId ?: "",
|
|
|
+ target_id = mMinorEqToEq?.deviceId ?: "",
|
|
|
+ rel = code
|
|
|
+ )
|
|
|
+ mVm.addEqToEq(rel)
|
|
|
+ }
|
|
|
+
|
|
|
+ EQ_PIPE_CNCT -> {
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -162,7 +171,6 @@ class RelationActivity : BaseActivity() {
|
|
|
mBackIv.setOnClickListener {
|
|
|
finish()
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
|
|
@@ -170,6 +178,9 @@ class RelationActivity : BaseActivity() {
|
|
|
private var serverRelEqs = mutableListOf<RelationEq>()
|
|
|
|
|
|
private lateinit var mVm: RelationVM
|
|
|
+ private var mMajorEqToEq: RelationEq? = null
|
|
|
+ private var mMinorEqToEq: RelationEq? = null
|
|
|
+
|
|
|
private fun initViewModel() {
|
|
|
mVm = RelationVM(BaseViewModelInterface { name, params ->
|
|
|
mEqs = params as List<RelationEq>
|
|
@@ -182,10 +193,25 @@ class RelationActivity : BaseActivity() {
|
|
|
}
|
|
|
mMajorLv.setAdapter(adapter)
|
|
|
}
|
|
|
+
|
|
|
+ EQ_EQ_SS, EQ_EQ_VV, EQ_EQ_CTRL, EQ_EQ_POWER -> {
|
|
|
+ val majorAdapter = RelationAdapter(mEqs, this@RelationActivity) { eq ->
|
|
|
+ mMajorEqToEq = eq
|
|
|
+ }
|
|
|
+ mMajorLv.adapter = majorAdapter
|
|
|
+ val minorAdapter = RelationAdapter(mEqs, this@RelationActivity) { eq ->
|
|
|
+ mMinorEqToEq = eq
|
|
|
+ }
|
|
|
+ mMinorLv.adapter = minorAdapter
|
|
|
+
|
|
|
+ }
|
|
|
+ EQ_PIPE_CNCT -> {
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
}, this)
|
|
|
- mVm.getEqs(mSpaceId)
|
|
|
+ mVm.getEqs(mSpaceId, code)
|
|
|
}
|
|
|
|
|
|
}
|