Browse Source

feat 数字化交付编码功能完善

lihao1 3 years ago
parent
commit
a4c9c542fe

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

@@ -201,7 +201,9 @@ class TunableSpaceItem(val data: TunableSpace, parent: SGraphyItem? = null) : SG
      */
     override fun onDraw(canvas: Canvas) {
         if (null != spacePath) {
-            if (paint.color == Opt.spaceChoseColor) {
+            if (data.isShow) {
+                paint.color = Color.parseColor("#FFDAAD")
+            } else if (paint.color == Opt.spaceChoseColor) {
                 paint.color = Opt.spaceChoseColor
             } else {
                 if (data.jobStatus.equals("01") || data.jobStatus.equals("04")) {

+ 1 - 0
cadengine/src/main/java/cn/sagacloud/android/cadengine/types/TunableSpace.kt

@@ -15,6 +15,7 @@ class TunableSpace() :Parcelable {
     var floorName: String? = null
     var floorId: String? = null
     var objectEntity: String? = null
+    var isShow: Boolean = false
 
     /**
      *  {

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/dao/ObjectDao.kt

@@ -77,7 +77,7 @@ interface ObjectDao {
     /**
      * 返回所有建筑 ObjectEntity
      */
-    @Query("select * from object where obj_type = 'space' and floor_id =:floorId")
+    @Query("select * from object where obj_type = 'space' and class_code ='GeneralZone' and floor_id =:floorId")
     suspend fun getSpaceByFloorId(floorId: String): List<ObjectEntity>
 
     /**

+ 52 - 34
demo/src/main/java/com/sybotan/android/demo/activities/ChooseSpaceActivity.kt

@@ -32,8 +32,6 @@ import cn.sagacloud.android.cadengine.FloorScene
 import cn.sagacloud.android.cadengine.Lasso
 import cn.sagacloud.android.cadengine.items.*
 import cn.sagacloud.android.cadengine.types.*
-import cn.sagacloud.android.cadengine.types.Space
-import com.framework.mvvm.model.db.entity.task.InfosforBuild
 import com.framework.mvvm.model.db.entity.task.ObjectEntity
 import com.google.gson.Gson
 import com.sybotan.android.demo.R
@@ -44,6 +42,7 @@ import com.sybotan.android.demo.bean.result.*
 import com.sybotan.android.demo.entitiies.Floor
 import com.sybotan.android.demo.retrofit.Constant
 import com.sybotan.android.demo.tools.CommonUtils
+import com.sybotan.android.demo.tools.ObjectNameUtils
 import com.sybotan.android.demo.tools.ToastUtils
 import com.sybotan.android.demo.view.SelectListSinglePopupWindow
 import com.sybotan.android.demo.viewmodel.ChooseSpaceVM
@@ -78,7 +77,7 @@ class ChooseSpaceActivity : BaseActivity(), DIAware {
     private lateinit var area: ServeAreaItem
     private lateinit var centerPoint: PointF
     private lateinit var position: Position
-    var tunableSpaceList = ArrayList<TunableSpaceItem>()
+    var chooseSpaceList = ArrayList<TunableSpaceItem>()
     var spaceIdList = ArrayList<String>()
 
     /** 楼层地图 */
@@ -94,6 +93,7 @@ class ChooseSpaceActivity : BaseActivity(), DIAware {
     private lateinit var save: TextView
     private lateinit var floorTv: TextView
     private lateinit var spaceName: TextView
+    private lateinit var direction: TextView
     private lateinit var root: LinearLayout
     private lateinit var spaces: ArrayList<ObjectEntity>
 
@@ -129,6 +129,7 @@ class ChooseSpaceActivity : BaseActivity(), DIAware {
         floorTv = findViewById(R.id.floorTv)
         root = findViewById(R.id.root)
         spaceName = findViewById(R.id.spaceName)
+        direction = findViewById(R.id.direction)
     }
 
     /**
@@ -151,6 +152,20 @@ class ChooseSpaceActivity : BaseActivity(), DIAware {
         val equipItem = EquipItem(this, p)
         equipItem.zOrder = 100000f
         scene.addItem(equipItem)
+        if (groupRelConfigEntity.targetTypes[0].canFrom) {
+            direction.text = "<-"
+        } else {
+            direction.text = "->"
+        }
+        if (groupRelConfigEntity.targetTypes[0].canFrom && groupRelConfigEntity.targetTypes[0].canTo) {
+            direction.setOnClickListener {
+                if (direction.text.equals("->")) {
+                    direction.text = "<-"
+                } else {
+                    direction.text = "->"
+                }
+            }
+        }
     }
 
 
@@ -162,26 +177,18 @@ class ChooseSpaceActivity : BaseActivity(), DIAware {
             @SuppressLint("SetJavaScriptEnabled")
             override fun onSingUp(x: Float, y: Float) {
 
-                for (space in tunableSpaceList) {
+                for (space in chooseSpaceList) {
                     val isContain = Lasso.isPolygonContainsPoint(space.mPoints, android.graphics.Point(x.toInt(), -y.toInt()))
                     if (isContain && space.data.floorName == floorTv.text.toString()) {
                         scene.removeItem(space)
-                        tunableSpaceList.remove(space)
+                        chooseSpaceList.remove(space)
+                        spaceIdList.remove(space.data.id)
                         initSpaceName()
-                        for (sp in spaces) {
-                            val info = gson.fromJson(sp.infos, SpaceInfo::class.java)
-                            val isContains = Lasso.isPolygonContainsPointZ(info.outline!![0][0], android.graphics.Point(x.toInt(), -y.toInt()))
-                            if (isContains) {
-                                if (spaceIdList.contains(sp.id)) {
-                                    spaceIdList.remove(sp.id)
-                                    return
-                                }
-                            }
-                        }
+                        return
                     }
                 }
 
-                for (space in scene.spaceList) {
+                for (space in scene.tunableSpaceList) {
                     val isContain = Lasso.isPolygonContainsPoint(space.mPoints, android.graphics.Point(x.toInt(), -y.toInt()))
                     if (isContain) {
                         val tunableSpace = TunableSpace()
@@ -191,20 +198,10 @@ class ChooseSpaceActivity : BaseActivity(), DIAware {
                         tunableSpace.floorId = floorId
                         val item = TunableSpaceItem(tunableSpace)
                         item.zOrder = 99996f
-                        tunableSpaceList.add(item)
+                        chooseSpaceList.add(item)
                         scene.addItem(item)
+                        spaceIdList.add(space.data.id!!)
                         initSpaceName()
-                        for (sp in spaces) {
-                            val obj = sp.infos!!.asJsonObject
-                            val info = gson.fromJson(obj, SpaceInfo::class.java)
-                            if (!obj.keySet().isEmpty()) {
-                                val isContains = Lasso.isPolygonContainsPointZ(info!!.outline!![0][0], android.graphics.Point(x.toInt(), -y.toInt()))
-                                if (isContains) {
-                                    spaceIdList.add(sp.id)
-                                    break
-                                }
-                            }
-                        }
                         break
                     }
                 }
@@ -227,16 +224,15 @@ class ChooseSpaceActivity : BaseActivity(), DIAware {
                 floorTv.text = floor.localName
                 floorId = floor.id
                 chooseSpaceVM.getFloorMap(floorId)
-                chooseSpaceVM.getSpaces(floorId)
             }
         }
         close.setOnClickListener { finish() }
         save.setOnClickListener {
-            if (CommonUtils.IsNull(tunableSpaceList)) {
+            if (CommonUtils.IsNull(chooseSpaceList)) {
                 ToastUtils.showMyToast("请绘制服务区域")
                 return@setOnClickListener
             }
-            chooseSpaceVM.insRel(deviceId, spaceIdList, groupRelConfigEntity)
+            chooseSpaceVM.insRel(deviceId, spaceIdList, groupRelConfigEntity, direction.text.toString())
         }
     }
 
@@ -269,7 +265,7 @@ class ChooseSpaceActivity : BaseActivity(), DIAware {
                         if (space.floorId == floorId) {
                             scene.addItem(item)
                         }
-                        tunableSpaceList.add(item)
+                        chooseSpaceList.add(item)
                     }
                     initSpaceName()
                 }
@@ -290,17 +286,39 @@ class ChooseSpaceActivity : BaseActivity(), DIAware {
                         scene.loadData(floorOfflineData!!)
                         uiThread {
                             initSingleTopUp()
-                            for (space in tunableSpaceList) {
+                            for (space in chooseSpaceList) {
                                 if (space.data.floorId == floorId) {
                                     scene.addItem(space)
                                 }
                             }
                             initSpaceName()
+                            chooseSpaceVM.getSpaces(floorId)
+                            graphyView.fitSceneToView()
                         }
                     }
                 }
                 ChooseSpaceVM.SPACES -> {
                     spaces = params as ArrayList<ObjectEntity>
+                    for (item in scene.tunableSpaceList) {
+                        scene.removeItem(item)
+                    }
+                    scene.tunableSpaceList.clear()
+                    for (space in spaces) {
+                        if (space.infos != null && space.infos!!.asJsonObject.keySet().isNotEmpty()) {
+                            val info = gson.fromJson(space.infos, SpaceInfo::class.java)
+                            if (!CommonUtils.IsNull(info.outline)) {
+                                val tunableSpace = TunableSpace()
+                                tunableSpace.outLine = info.outline[0]
+                                tunableSpace.isShow = true
+                                tunableSpace.id = space.id
+                                tunableSpace.name = ObjectNameUtils.getEquipName(space.infos)
+                                val item = TunableSpaceItem(tunableSpace)
+                                item.zOrder = 99995f
+                                scene.tunableSpaceList.add(item)
+                                scene.addItem(item)
+                            }
+                        }
+                    }
                 }
 
             }
@@ -313,7 +331,7 @@ class ChooseSpaceActivity : BaseActivity(), DIAware {
         val sb = StringBuilder()
         val others = ArrayList<SpaceNameModel>()
         sb.append(floorTv.text.toString()).append(":")
-        for (space in tunableSpaceList) {
+        for (space in chooseSpaceList) {
             if (space.data.floorName == floorTv.text.toString()) {
                 sb.append(space.data.name).append("、")
             } else {

+ 2 - 1
demo/src/main/java/com/sybotan/android/demo/activities/SpaceDeliveryCodeActivity.kt

@@ -8,6 +8,7 @@ import android.widget.TextView
 import androidx.core.widget.addTextChangedListener
 import com.framework.mvvm.model.db.entity.task.ObjectEntity
 import com.sybotan.android.demo.R
+import com.sybotan.android.demo.tools.ObjectNameUtils
 import com.sybotan.android.demo.viewmodel.SpaceDeliveryCodeVM
 import org.kodein.di.DI
 import org.kodein.di.DIAware
@@ -105,7 +106,7 @@ class SpaceDeliveryCodeActivity : BaseActivity(), DIAware {
                         } else {
                             tv1.text = "??????"
                         }
-                        titleTv.text = ("物业分区-${floorEntity.localName}")
+                        titleTv.text = ("物业分区-${ObjectNameUtils.getEquipName(floorEntity.infos)}")
                     }
                 }
                 SpaceDeliveryCodeVM.SERIAL_NUMBER -> {

+ 3 - 5
demo/src/main/java/com/sybotan/android/demo/adapter/PersonalSelectSingleAdapter.java

@@ -62,11 +62,9 @@ public class PersonalSelectSingleAdapter extends RecyclerView.Adapter<PersonalSe
         }
         if (type.equals(Constant.TYPE2)) {
             ObjectEntity options = (ObjectEntity) item;
-            if (options.getObjType().equals("space")) {
-                holder.choice_name.setText(options.getClassCode() + ":" + options.getLocalName());
-            } else {
-                holder.choice_name.setText(ObjectNameUtils.Companion.getEquipName(options.getInfos()));
-            }
+
+            holder.choice_name.setText(ObjectNameUtils.Companion.getEquipName(options.getInfos()));
+
         }
         if (type.equals(Constant.TYPE3)) {
             MajorEntity options = (MajorEntity) item;

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

@@ -53,11 +53,9 @@ public class ObjectRelationDialog extends Dialog implements View.OnClickListener
 
         relationTitle.setText(configEntity.entity.getGraphName() + "/" + configEntity.entity.getRelName());
         leftName.setText(localId);
-        if (equip.getObjType().equals("equipment")) {
-            rightName.setText(ObjectNameUtils.Companion.getEquipName(equip.getInfos()));
-        } else {
-            rightName.setText(equip.getLocalName());
-        }
+
+        rightName.setText(ObjectNameUtils.Companion.getEquipName(equip.getInfos()));
+
         for (RelConfigEntityPackClass.TargetRelType type : configEntity.targetTypes) {
             if (type.targetCode.equals(equip.getClassCode())) {
                 if (type.canFrom) {

+ 1 - 1
demo/src/main/java/com/sybotan/android/demo/view/SelectListSinglePopupWindow.java

@@ -131,7 +131,7 @@ public class SelectListSinglePopupWindow extends PopupWindow {
                     String s = searchEdt.getText().toString().trim();
                     itemList.clear();
                     for (int i = 0; i < dataList.size(); i++) {
-                        if ((Objects.requireNonNull(ObjectNameUtils.Companion.getEquipName(dataList.get(i).getInfos())).contains(s)) || (!TextUtils.isEmpty(dataList.get(i).getLocalName()) && Objects.requireNonNull(dataList.get(i).getLocalName()).contains(s)) || dataList.get(i).getClassCode().contains(s)) {
+                        if ((Objects.requireNonNull(ObjectNameUtils.Companion.getEquipName(dataList.get(i).getInfos())).contains(s)) || (!TextUtils.isEmpty(dataList.get(i).getClassCode()) && Objects.requireNonNull(dataList.get(i).getClassCode()).contains(s)) || Objects.requireNonNull(dataList.get(i).getClassCode()).contains(s)) {
                             itemList.add(dataList.get(i));
                         }
                     }

+ 10 - 9
demo/src/main/java/com/sybotan/android/demo/viewmodel/ChooseSpaceVM.kt

@@ -25,6 +25,7 @@ import com.sybotan.android.demo.entitiies.Info
 import com.sybotan.android.demo.entitiies.Statistics
 import com.sybotan.android.demo.retrofit.BaseViewModelInterface
 import com.sybotan.android.demo.tools.CommonUtils
+import com.sybotan.android.demo.tools.ObjectNameUtils
 import com.sybotan.android.demo.tools.ToastUtils
 import com.sybotan.base.utils.SJsonUtil
 import kotlinx.coroutines.launch
@@ -192,7 +193,8 @@ class ChooseSpaceVM(
     fun insRel(
         deviceId: String,
         spaceIds: ArrayList<String>,
-        groupRelConfigEntity: RelConfigEntityPackClass
+        groupRelConfigEntity: RelConfigEntityPackClass,
+        direction: String
     ) {
         viewModelScope.launch {
             val rels = getRelations(groupRelConfigEntity, deviceId)
@@ -203,12 +205,12 @@ class ChooseSpaceVM(
             for (id in spaceIds) {
                 val objFrom: String
                 val objto: String
-                if (groupRelConfigEntity.targetTypes[0].canFrom) {
-                    objto = deviceId
-                    objFrom = id
-                } else {
+                if (direction == "->") {
                     objFrom = deviceId
                     objto = id
+                } else {
+                    objto = deviceId
+                    objFrom = id
                 }
                 val en = repo.getRelByGraphCodeAndRelCodeAndObjFromAndObjTo(
                     groupRelConfigEntity.entity.graphCode!!,
@@ -262,7 +264,7 @@ class ChooseSpaceVM(
 
                 val tunableSpace = TunableSpace()
                 tunableSpace.outLine = info.outline[0]
-                tunableSpace.name = objEntity.localName
+                tunableSpace.name = ObjectNameUtils.getEquipName(objEntity.infos)
                 tunableSpace.id = objEntity.id
                 val floor = repo.getFloorById(objEntity.floorId!!)
                 tunableSpace.floorName = floor.localName
@@ -327,14 +329,13 @@ class ChooseSpaceVM(
             if (from == null) {
                 rel.objFromLocalId = "该设备"
             } else {
-                rel.objFromLocalId =
-                    if (from!!.id.startsWith("Eq")) from!!.localId else from!!.localName
+                rel.objFromLocalId = ObjectNameUtils.getEquipName(from.infos)
             }
             val to = repo.getObject(rel.objTo!!)
             if (to == null) {
                 rel.objToLocalId = "该设备"
             } else {
-                rel.objToLocalId = if (to!!.id.startsWith("Eq")) to!!.localId else to!!.localName
+                rel.objToLocalId = ObjectNameUtils.getEquipName(to.infos)
             }
         }
     }

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

@@ -307,14 +307,13 @@ class EquipDetailVM(
         if (from == null) {
             floorPipe.objFromLocalId = "该设备"
         } else {
-            floorPipe.objFromLocalId =
-                if (from!!.id.startsWith("Eq")) ObjectNameUtils.getEquipName(from.infos!!) else from!!.localName
+            floorPipe.objFromLocalId = ObjectNameUtils.getEquipName(from.infos)
         }
         val to = repo.getObject(floorPipe.objTo!!)
         if (to == null) {
             floorPipe.objToLocalId = "该设备"
         } else {
-            floorPipe.objToLocalId = if (to!!.id.startsWith("Eq")) ObjectNameUtils.getEquipName(to.infos!!) else to!!.localName
+            floorPipe.objToLocalId = ObjectNameUtils.getEquipName(to.infos)
         }
     }
 
@@ -401,14 +400,13 @@ class EquipDetailVM(
             if (from == null) {
                 rel.objFromLocalId = "该设备"
             } else {
-                rel.objFromLocalId =
-                    if (from!!.id.startsWith("Eq")) ObjectNameUtils.getEquipName(from.infos) else from!!.localName
+                rel.objFromLocalId =ObjectNameUtils.getEquipName(from.infos)
             }
             val to = repo.getObject(rel.objTo!!)
             if (to == null) {
                 rel.objToLocalId = "该设备"
             } else {
-                rel.objToLocalId = if (to!!.id.startsWith("Eq")) ObjectNameUtils.getEquipName(to.infos) else to!!.localName
+                rel.objToLocalId = ObjectNameUtils.getEquipName(to.infos)
             }
         }
     }

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

@@ -35,6 +35,7 @@ import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
 import com.sybotan.android.demo.bean.*
+import com.sybotan.android.demo.tools.ObjectNameUtils
 import com.sybotan.base.extensions.toInt
 import java.io.File
 
@@ -79,7 +80,7 @@ class GraphyVM(
                 objectEntity?.let {
                     spaceJobModel.buildingId = buildingId
                     spaceJobModel.id = spaceEntity.spaceId
-                    spaceJobModel.localName = objectEntity!!.localName
+                    spaceJobModel.localName =  ObjectNameUtils.getEquipName(objectEntity.infos)
                     spaceJobModel.name = objectEntity.name
                     spaceJobModel.projectId = projectId
                     val infos = gson.fromJson(objectEntity.infos, InfosForObj::class.java)

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

@@ -22,6 +22,7 @@ import com.sybotan.android.demo.activities.BaseActivity
 import com.sybotan.android.demo.bean.result.*
 import com.sybotan.android.demo.retrofit.BaseViewModelInterface
 import com.sybotan.android.demo.tools.CommonUtils
+import com.sybotan.android.demo.tools.ObjectNameUtils
 import com.sybotan.android.demo.tools.ToastUtils
 import com.sybotan.base.utils.SJsonUtil
 import kotlinx.coroutines.launch
@@ -68,7 +69,7 @@ class SpaceMapVM(
                 if (objectEntity != null) {
                     spaceJobModel.buildingId = buildingId
                     spaceJobModel.id = spaceEntity.spaceId
-                    spaceJobModel.localName = objectEntity!!.localName
+                    spaceJobModel.localName = ObjectNameUtils.getEquipName(objectEntity.infos)
                     spaceJobModel.name = objectEntity.name
                     spaceJobModel.projectId = projectId
                     val infos = gson.fromJson(objectEntity.infos, InfosForObj::class.java)

+ 7 - 0
demo/src/main/res/drawable/bg_edittext.xml

@@ -0,0 +1,7 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FFFFFF" />
+    <corners android:radius="3dip"/>
+    <stroke
+        android:width="1dip"
+        android:color="#BDC7D8" />
+</shape>

+ 17 - 1
demo/src/main/res/layout/activity_choose_space.xml

@@ -49,14 +49,30 @@
             android:layout_marginLeft="16dp"
             android:layout_marginTop="16dp"
             android:background="@color/grey_200"
+            android:drawableRight="@mipmap/icon_push_down"
+            android:gravity="center"
             android:paddingLeft="10dp"
             android:paddingTop="5dp"
             android:paddingRight="10dp"
             android:paddingBottom="5dp"
-            android:text="12F"
+            android:text=""
             android:textColor="@color/black_272727"
             android:textSize="16sp" />
 
+        <TextView
+            android:id="@+id/direction"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="20dp"
+            android:background="@color/grey_200"
+            android:padding="8dp"
+            android:text="->"
+            android:textColor="@color/black_272727"
+            android:textSize="18sp" />
+
     </RelativeLayout>
 
     <androidx.appcompat.widget.LinearLayoutCompat

+ 13 - 9
demo/src/main/res/layout/activity_equip_delivery_code.xml

@@ -97,9 +97,9 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:background="@drawable/bg_round_search"
-                    android:enabled="false"
                     android:alpha="0.5"
+                    android:background="@drawable/bg_gray_f2f3f6"
+                    android:enabled="false"
                     android:gravity="center"
                     android:hint=""
                     android:maxLength="6"
@@ -120,7 +120,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:background="@drawable/bg_round_search"
+                    android:background="@drawable/bg_edittext"
                     android:gravity="center"
                     android:hint="请输入"
                     android:inputType="number"
@@ -177,7 +177,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:background="@drawable/bg_round_search"
+                    android:background="@drawable/bg_edittext"
                     android:drawableRight="@mipmap/icon_push_down"
                     android:gravity="center"
                     android:textColor="@color/black_272727"
@@ -197,7 +197,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:background="@drawable/bg_round_search"
+                    android:background="@drawable/bg_edittext"
                     android:gravity="center"
                     android:hint="请输入"
                     android:inputType="number"
@@ -277,10 +277,12 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:background="@drawable/bg_grey_e6e6e6"
+                    android:background="@drawable/bg_blue_3bacb2"
                     android:gravity="center"
+                    android:paddingTop="5dp"
+                    android:paddingBottom="5dp"
                     android:text="ACAAAP"
-                    android:textColor="@color/black_272727"
+                    android:textColor="@color/white_ffffff"
                     android:textSize="16sp" />
 
                 <TextView
@@ -289,10 +291,12 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="40dp"
                     android:layout_weight="1"
-                    android:background="@drawable/bg_grey_e6e6e6"
+                    android:background="@drawable/bg_blue_3bacb2"
                     android:gravity="center"
+                    android:paddingTop="5dp"
+                    android:paddingBottom="5dp"
                     android:text="B1-RM89"
-                    android:textColor="@color/black_272727"
+                    android:textColor="@color/white_ffffff"
                     android:textSize="16sp" />
             </LinearLayout>
 

+ 10 - 6
demo/src/main/res/layout/activity_space_delivery_code.xml

@@ -95,7 +95,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:background="@drawable/bg_round_search"
+                    android:background="@drawable/bg_edittext"
                     android:gravity="center"
                     android:hint="请输入"
                     android:maxLength="6"
@@ -116,7 +116,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:background="@drawable/bg_round_search"
+                    android:background="@drawable/bg_edittext"
                     android:gravity="center"
                     android:hint="请输入"
                     android:inputType="number"
@@ -196,10 +196,12 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:background="@drawable/bg_grey_e6e6e6"
+                    android:background="@drawable/bg_blue_3bacb2"
                     android:gravity="center"
+                    android:paddingTop="5dp"
+                    android:paddingBottom="5dp"
                     android:text="RF"
-                    android:textColor="@color/black_272727"
+                    android:textColor="@color/white_ffffff"
                     android:textSize="16sp" />
 
                 <TextView
@@ -208,10 +210,12 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="40dp"
                     android:layout_weight="1"
-                    android:background="@drawable/bg_grey_e6e6e6"
+                    android:background="@drawable/bg_blue_3bacb2"
                     android:gravity="center"
+                    android:paddingTop="5dp"
+                    android:paddingBottom="5dp"
                     android:text="98"
-                    android:textColor="@color/black_272727"
+                    android:textColor="@color/white_ffffff"
                     android:textSize="16sp" />
             </LinearLayout>
 

+ 1 - 1
gradle.properties

@@ -17,7 +17,7 @@ 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=0.2.2
+SAGA_ANDROID_VERSION=1.0.0
 JUNIT_VERSION=5.3.1
 KOTLIN_VERSION=1.5.31
 SAGA_GROUP=cn.sagacloud