1.添加获取首页轮播图接口

evaluation/src/main/java/com/yingyangfly/evaluation/entity/SlideShowListBean.kt

@@ -4,6 +4,11 @@ package com.yingyangfly.evaluation.entity
  * 首页轮播图
  */
 data class SlideShowListBean(
+    val location: String,
+    val slideshows: List<SlideshowBean>
+)
+
+data class SlideshowBean(
     val createBy: String,
     val createTime: String,
     val equipmentType: String,

evaluation/src/main/java/com/yingyangfly/evaluation/hospital/GuidePageAdapter.java

@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.yingyangfly.baselib.utils.GlideImgUtil;
 import com.yingyangfly.baselib.utils.ViewTool;
 import com.yingyangfly.evaluation.R;
-import com.yingyangfly.evaluation.entity.SlideShowListBean;
+import com.yingyangfly.evaluation.entity.SlideshowBean;
 import com.youth.banner.adapter.BannerAdapter;
 
 import java.util.List;
@@ -23,16 +23,16 @@ import java.util.List;
  * @copyright (C) 2019-2022, XiaoLiu All Rights Reserved
  * @description 轮播图适配器
  */
-public class GuidePageAdapter extends BannerAdapter<SlideShowListBean, GuidePageAdapter.HomeBannerHolder> {
+public class GuidePageAdapter extends BannerAdapter<SlideshowBean, GuidePageAdapter.HomeBannerHolder> {
 
     private Context mContext;
 
-    public GuidePageAdapter(List<SlideShowListBean> datas, Context mContext) {
+    public GuidePageAdapter(List<SlideshowBean> datas, Context mContext) {
         this(datas);
         this.mContext = mContext;
     }
 
-    public GuidePageAdapter(List<SlideShowListBean> datas) {
+    public GuidePageAdapter(List<SlideshowBean> datas) {
         super(datas);
     }
 
@@ -44,7 +44,7 @@ public class GuidePageAdapter extends BannerAdapter<SlideShowListBean, GuidePage
     }
 
     @Override
-    public void onBindView(HomeBannerHolder holder, SlideShowListBean data, int position, int size) {
+    public void onBindView(HomeBannerHolder holder, SlideshowBean data, int position, int size) {
         GlideImgUtil.loadImg(mContext, data.getImgUrl(), holder.img);
     }
 

evaluation/src/main/java/com/yingyangfly/evaluation/hospital/HospitalActivity.kt

@@ -24,7 +24,7 @@ import com.yingyangfly.baselib.utils.RxBusCodes
 import com.yingyangfly.baselib.utils.User
 import com.yingyangfly.evaluation.R
 import com.yingyangfly.evaluation.databinding.ActivityHospitalBinding
-import com.yingyangfly.evaluation.entity.SlideShowListBean
+import com.yingyangfly.evaluation.entity.SlideshowBean
 import com.youth.banner.indicator.RectangleIndicator
 
 /**
@@ -35,7 +35,7 @@ class HospitalActivity : BaseTvMVVMActivity<ActivityHospitalBinding, HospitalVie
     View.OnTouchListener {
 
     private lateinit var adapterGuide: GuidePageAdapter
-    private var imageList = mutableListOf<SlideShowListBean>()
+    private var imageList = mutableListOf<SlideshowBean>()
 
     private var reviewTaskId = ""
     private var taskId = ""
@@ -206,16 +206,23 @@ class HospitalActivity : BaseTvMVVMActivity<ActivityHospitalBinding, HospitalVie
     /**
      * 获取轮播图
      */
-    @SuppressLint("NotifyDataSetChanged")
+    @SuppressLint("NotifyDataSetChanged", "SetTextI18n")
     private fun getSlideShowList() {
         viewModel.getSlideShowList(Build.SERIAL, fail = {
             it.toast()
         }, success = {
             imageList.clear()
-            if (it.isNullOrEmpty().not()) {
-                val data = it?.get(0)
-                binding.guide.setLoopTime(data!!.speed.toLong())
-                imageList.addAll(it)
+            if (it != null) {
+                if (it.slideshows.isNullOrEmpty().not()) {
+                    val data = it.slideshows[0]
+                    binding.guide.setLoopTime(data.speed.toLong())
+                    imageList.addAll(it.slideshows)
+                }
+                binding.tvLocation.text = "终端位置：" + if (TextUtils.isEmpty(it.location)) {
+                    ""
+                } else {
+                    it.location
+                }
             }
             adapterGuide.notifyDataSetChanged()
         })

evaluation/src/main/java/com/yingyangfly/evaluation/hospital/HospitalViewModel.kt

@@ -5,10 +5,7 @@ import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.mvvm.BaseViewModel
 import com.yingyangfly.baselib.net.XUtils
 import com.yingyangfly.baselib.utils.GsonUtil
-import com.yingyangfly.evaluation.entity.QuestionsTypeBean
-import com.yingyangfly.evaluation.entity.ReviewTask
-import com.yingyangfly.evaluation.entity.ReviewTaskListBean
-import com.yingyangfly.evaluation.entity.SlideShowListBean
+import com.yingyangfly.evaluation.entity.*
 import com.yingyangfly.evaluation.net.EVALUATION_API
 
 /**
@@ -77,7 +74,7 @@ class HospitalViewModel : BaseViewModel() {
     fun getSlideShowList(
         sn: String,
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<SlideShowListBean>?) -> Unit)? = null,
+        success: ((success: SlideShowListBean?) -> Unit)? = null,
     ) = launchFlow(true) {
         EVALUATION_API.getSlideShowList("B", sn)
     }.runUI(

evaluation/src/main/java/com/yingyangfly/evaluation/net/EvaluationApiService.kt

@@ -84,7 +84,7 @@ interface EvaluationApiService {
     @POST("slide-show/list")
     suspend fun getSlideShowList(
         @Query("equipmentType") equipmentType: String, @Query("sn") sn: String
-    ): BaseResp<List<SlideShowListBean>>
+    ): BaseResp<SlideShowListBean>
 
     /**
      * 其他测评报告详情

evaluation/src/main/res/layout/activity_hospital.xml

@@ -203,11 +203,11 @@
         </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvLocation"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/divider_41px"
             android:layout_marginBottom="@dimen/divider_19px"
-            android:text="终端位置：宣武医院一楼大厅"
             android:textColor="@color/color_B3FFFFFF"
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold"
@@ -220,7 +220,6 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/divider_31px"
             android:layout_marginBottom="@dimen/divider_19px"
-            android:text="终端号：00132"
             android:textColor="@color/color_B3FFFFFF"
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold"