Browse Source

@task: relation

bai 3 years ago
parent
commit
74fb0fba4d

+ 34 - 1
demo/src/main/java/com/sybotan/android/demo/activities/poc/RelationActivity.kt

@@ -2,11 +2,44 @@ package com.sybotan.android.demo.activities.poc
 
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
+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.entitiies.Build
+import com.sybotan.android.demo.entitiies.EqEntity
+import com.sybotan.android.demo.retrofit.BaseViewModelInterface
+import com.sybotan.android.demo.viewmodel.BuildVM
+import com.sybotan.android.demo.viewmodel.RelationVM
+
+class RelationActivity : BaseActivity() {
+    private lateinit var mSpaceId: String
+    private lateinit var mMajorTv: TextView
+    private lateinit var mMinorTv: TextView
+
+    private lateinit var mMajorLv: ListView
+    private lateinit var mMinorLv: ListView
+
 
-class RelationActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_relation)
+
+        initViewModel()
     }
+
+
+    private lateinit var mBuilds: List<EqEntity>
+    private fun initViewModel() {
+        val vm = RelationVM(BaseViewModelInterface { name, params ->
+            mBuilds = params as List<EqEntity>
+            /* val floors = sep(mBuilds)
+             val adapter = ExpandAdapter(this, mBuilds, floors)
+             expandLv.setAdapter(adapter)*/
+
+        }, this)
+        vm.getEqs(mSpaceId)
+    }
+
 }

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

@@ -19,7 +19,7 @@ class SpaceActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_space)
 
-        expandLv = findViewById<ExpandableListView>(R.id.expandLv)
+        expandLv = findViewById(R.id.expandLv)
         expandLv.setGroupIndicator(null)
         expandLv.divider = null
 

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

@@ -16,7 +16,6 @@ class DeviceTypeAdapter(
     val block: (type: DeviceType) -> Unit
 ) : BaseAdapter() {
 
-
     private var checkType: DeviceType? = null
     private val holders = mutableListOf<Holder>()
     override fun getCount(): Int {

+ 74 - 0
demo/src/main/java/com/sybotan/android/demo/adapter/RelationAdapter.kt

@@ -0,0 +1,74 @@
+package com.sybotan.android.demo.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.CheckBox
+import com.sybotan.android.demo.R
+import com.sybotan.android.demo.entitiies.DeviceType
+import com.sybotan.android.demo.entitiies.EqEntity
+
+class RelationAdapter(
+    val eqs: List<EqEntity>,
+    val context: Context,
+    val block: (eq: EqEntity) -> Unit
+) : BaseAdapter() {
+    private val holders = mutableListOf<Holder>()
+
+    override fun getCount(): Int {
+        return eqs.size
+    }
+
+    override fun getItem(position: Int): EqEntity {
+        return eqs[position]
+    }
+
+    override fun getItemId(position: Int): Long {
+        return position.toLong()
+    }
+
+    override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
+        var view = convertView
+        val holder: Holder
+        if (view == null) {
+            holder = Holder()
+            view = LayoutInflater.from(context).inflate(R.layout.item_relation, parent, false)
+            holder.relationCb = view.findViewById(R.id.relationCb)
+
+            view.tag = holder
+        } else {
+            holder = view.tag as Holder
+        }
+        holders.add(holder)
+        val eq = eqs[position]
+        holder.relationCb.text = eq.name
+        holder.relationCb.setOnClickListener {
+            holders.forEach { h ->
+                h.relationCb.isSelected = false
+                h.relationCb.isChecked = false
+            }
+            val cb = it as CheckBox
+            if (!cb.isSelected) {
+                cb.isSelected = true
+                cb.isChecked = true
+               // checkType = type
+                //  checkTypes.add(type)
+
+            } else {
+                cb.isSelected = false
+                cb.isChecked = false
+                //checkType = type
+                //   checkTypes.remove(type)
+            }
+
+            //block(checkType!!)
+        }
+        return view!!
+    }
+
+    inner class Holder {
+        lateinit var relationCb: CheckBox
+    }
+}

+ 9 - 0
demo/src/main/java/com/sybotan/android/demo/entitiies/EqEntity.kt

@@ -0,0 +1,9 @@
+package com.sybotan.android.demo.entitiies
+
+data class EqEntity(
+    val deviceId: String,
+    val name: String,
+    val position: String,
+    val spaceId: String,
+    val type: String
+)

+ 4 - 0
demo/src/main/java/com/sybotan/android/demo/retrofit/API.java

@@ -21,9 +21,11 @@ import com.sybotan.android.demo.bean.result.SpaceJobModel;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.sybotan.android.demo.entitiies.EqEntity;
 import io.reactivex.Observable;
 import okhttp3.RequestBody;
 import retrofit2.http.Body;
+import retrofit2.http.GET;
 import retrofit2.http.POST;
 
 /**
@@ -188,4 +190,6 @@ public interface API {
     @POST("clmt/dict/pipe_list")
     Observable<BaseModel<ArrayList<PipeListModel>>> pipeList(@Body RequestBody body);
 
+    @POST("clmt/query/space_eq")
+    Observable<BaseModel<List<EqEntity>>> getEqs(@Body RequestBody body);
 }

+ 68 - 0
demo/src/main/java/com/sybotan/android/demo/viewmodel/RelationVM.kt

@@ -0,0 +1,68 @@
+package com.sybotan.android.demo.viewmodel
+
+import com.sybotan.android.demo.activities.BaseActivity
+import com.sybotan.android.demo.entitiies.EqEntity
+import com.sybotan.android.demo.retrofit.BaseObserver
+import com.sybotan.android.demo.retrofit.BaseViewModelInterface
+import com.sybotan.android.demo.retrofit.RetrofitFactory
+
+class RelationVM(b: BaseViewModelInterface, a: BaseActivity) : BaseViewModel(b, a) {
+    companion object {
+        // 设备服务于空间
+        const val EQ_SP_SERVE = "EQ_SP_SERVE"
+
+        // 设备 阀门 设备
+        const val EQ_EQ_VV = "EQ_EQ_VV"
+
+        // 设备 控制 设备
+        const val EQ_EQ_CTRL = "EQ_EQ_CTRL"
+
+        // 设备 电量 设备
+        const val EQ_EQ_POWER = "EQ_EQ_POWER"
+
+        // 设备 测量 设备
+        const val EQ_EQ_SS = "EQ_EQ_SS"
+
+        // 设备连接管道
+        const val EQ_PIPE_CNCT = "EQ_PIPE_CNCT"
+    }
+
+    fun getEqs(spaceId: String) {
+        val observable = RetrofitFactory.getInstance().getEqs(getRequestBody(spaceId))
+        this.sendRequest(observable, object : BaseObserver<List<EqEntity>>(mActivity, this) {
+            override fun onSuccess(t: List<EqEntity>?) {
+                mEmitter.SendDircetive(EQ_SP_SERVE,t)
+            }
+
+        }, true)
+    }
+
+    fun addEqSpService() {
+
+        val observable = RetrofitFactory.getInstance().requestBuildJob()
+    }
+
+    /**
+    val bean = ReqSpaceJob()
+    bean.buildingId = buildingId
+    bean.floorId = floorId
+    if ("space" == from) {
+    bean.jobStatus.add("01")
+    bean.jobStatus.add("02")
+    bean.jobStatus.add("03")
+    } else {
+    bean.jobStatus.add("04")
+    }
+
+
+     */
+    /*
+       val observable = RetrofitFactory.getInstance().requestBuildJob()
+        this.sendRequest(observable, object : BaseObserver<List<Build>>(mActivity, this) {
+            override fun onSuccess(t: List<Build>?) {
+                mEmitter.SendDircetive(BUILD_TYPE, t)
+            }
+
+        }, true)
+     */
+}

+ 111 - 10
demo/src/main/res/layout/activity_relation.xml

@@ -7,17 +7,118 @@
         android:layout_height="match_parent"
         tools:context=".activities.poc.RelationActivity">
 
-    <TextView
-            android:id="@+id/majorTv"
-            android:layout_width="wrap_content"
+    <android.support.constraint.ConstraintLayout
+            android:id="@+id/topBarTv"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:background="@color/blue_500"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+                android:id="@+id/backIv"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginStart="16dp"
+                android:contentDescription="back"
+                android:src="@drawable/ic_round_arrow_back_24"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"/>
+
+        <TextView
+                android:id="@+id/titleTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="空间结构核查"
+                android:textColor="@color/black_272727"
+                android:textSize="18sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"/>
+
+    </android.support.constraint.ConstraintLayout>
+
+    <android.support.constraint.ConstraintLayout
+            android:id="@+id/relationCl"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintTop_toBottomOf="@id/topBarTv"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/addBtn"
+    >
+
+        <TextView
+                android:id="@+id/majorTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="major"
+                android:textSize="20sp"
+                android:textColor="@color/black_272727"
+                app:layout_constraintBottom_toTopOf="@id/majorLv"
+                android:layout_marginTop="16dp"
+                android:layout_marginStart="16dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+        />
+
+        <ListView
+                android:id="@+id/majorLv"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                app:layout_constraintStart_toStartOf="@id/majorTv"
+                app:layout_constraintTop_toBottomOf="@id/majorTv"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/minorTv"
+                tools:listitem="@layout/item_relation"
+        />
+
+        <TextView
+                android:id="@+id/minorTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="minor"
+                android:textSize="20sp"
+                android:textColor="@color/black_272727"
+                app:layout_constraintStart_toStartOf="@id/majorLv"
+                app:layout_constraintTop_toBottomOf="@id/majorLv"
+                app:layout_constraintBottom_toTopOf="@+id/minorLv"
+        />
+
+        <ListView
+                android:id="@+id/minorLv"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                app:layout_constraintStart_toStartOf="@id/minorTv"
+                app:layout_constraintTop_toBottomOf="@id/minorTv"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                tools:listitem="@layout/item_relation"
+        />
+    </android.support.constraint.ConstraintLayout>
+
+    <Button
+            android:id="@+id/addBtn"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="major"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginBottom="16dp"
+            android:layout_marginTop="16dp"
+            android:text="添加"
             android:textSize="18sp"
             android:textColor="@color/black_272727"
-            android:layout_marginTop="16dp"
-            android:layout_marginStart="16dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"/>
-
-    
+            app:layout_constraintTop_toBottomOf="@id/relationCl"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+    />
 </android.support.constraint.ConstraintLayout>

+ 26 - 0
demo/src/main/res/layout/item_relation.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                             android:layout_width="match_parent"
+                                             android:layout_height="wrap_content"
+                                             xmlns:app="http://schemas.android.com/apk/res-auto">
+    <CheckBox
+            android:id="@+id/relationCb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="当前设备"
+            android:textSize="20sp"
+            android:layout_marginTop="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginBottom="16dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+    />
+    <View android:layout_width="0dp" android:layout_height="1dp"
+          app:layout_constraintStart_toStartOf="@+id/relationCb"
+          android:background="@color/black_272727"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintEnd_toEndOf="parent"
+          android:layout_marginEnd="16dp"
+    />
+</android.support.constraint.ConstraintLayout>