<首页修改>

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/FrameApi.kt

@@ -10,7 +10,6 @@ import retrofit2.http.Path
  */
 interface FrameApi{
 
-    @GET("/ncs/frame/{part_id}")
-//  @GET("goods/categories/{parent_id}/children")
-    fun getFramePartVO(@Path("part_id") partId:Int): Observable<ResponseBody>
+    @GET("/deviceNurse/getFramePart/{partId}")
+    fun getFramePartVO(@Path("partId") partId:Int): Observable<ResponseBody>
 }

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/nursehome/FramePartContract.kt

@@ -21,6 +21,6 @@ interface FramePartContract {
      *加载 病房 病床 数据
      */
     interface Presenter : BaseContract.BasePresenter{
-        fun loadData()
+        fun loadData(partId: Int)
     }
 }

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/nursehome/FramePartPresenter.kt

@@ -64,9 +64,9 @@ class FramePartPresenter @Inject constructor() :RxPresenter<FramePartContract.Vi
     /**
      * 获取病房 病床数据
      */
-    override fun loadData() {
+    override fun loadData(partId: Int) {
         //待处理
-        frameApi.getFramePartVO(2)
+        frameApi.getFramePartVO(partId)
                 .map {
                     var framePartVO = FramePartVO()
                     var gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/vo/FrameBedVO.java

@@ -21,7 +21,7 @@ public class FrameBedVO{
     private Integer customerAge;
     private String customerAgeUnit;
     private String nurseConfigName;
-    private String nurseColorRGB;
+    private String nurseColorRgb;
     private String deviceSipId;
     private Integer bedDeviceId;
 
@@ -98,12 +98,12 @@ public class FrameBedVO{
         this.nurseConfigName = nurseConfigName;
     }
 
-    public String getNurseColorRGB() {
-        return nurseColorRGB;
+    public String getNurseColorRgb() {
+        return nurseColorRgb;
     }
 
-    public void setNurseColorRGB(String nurseColorRGB) {
-        this.nurseColorRGB = nurseColorRGB;
+    public void setNurseColorRgb(String nurseColorRgb) {
+        this.nurseColorRgb = nurseColorRgb;
     }
 
     public String getDeviceSipId() {

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/adapter/CallRecordsItemAdapter.kt

@@ -7,6 +7,7 @@ import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
 import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.databinding.AdapterCallRecordsItemBinding
+import com.wdkl.ncs.android.component.nursehome.util.TimeTransition
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.middleware.model.dos.CallingHistoryDO
@@ -57,6 +58,7 @@ class CallRecordsItemAdapter(val data:ArrayList<InteractionVO>) : BaseDelegateAd
         holder?.bind { binding ->
             val itemData = getItem(position)
 
+            Log.i("callRecord","actionDirectionType: " + itemData.actionDirectionType);
             //判断是呼入还是呼出 1 分机到主机 2主机到分机
             if (itemData.actionDirectionType == 1) {
                 binding.sickbedTv.text = itemData.toFrameFullName
@@ -65,6 +67,8 @@ class CallRecordsItemAdapter(val data:ArrayList<InteractionVO>) : BaseDelegateAd
                 binding.sickbedTv.text = itemData.fromFrameFullName
                 binding.nameTv.text = itemData.fromMemberName
             }
+
+            binding.callDurationTv.text = TimeTransition().stampToTime(itemData.actionStart * 1000)
         }
     }
 

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/adapter/FrameBedVosConfinementAdapter.kt

@@ -0,0 +1,114 @@
+package com.wdkl.ncs.android.component.nursehome.adapter
+
+import android.graphics.Color
+import android.text.TextUtils
+import android.util.Log
+import android.view.View
+import android.view.ViewGroup
+import com.alibaba.android.vlayout.LayoutHelper
+import com.alibaba.android.vlayout.layout.GridLayoutHelper
+import com.wdkl.ncs.android.component.nursehome.R
+import com.wdkl.ncs.android.component.nursehome.databinding.AdapterHospitalFramePartBinding
+import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
+import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
+import com.wdkl.ncs.android.lib.utils.then
+import com.wdkl.ncs.android.middleware.model.vo.FrameBedVO
+
+
+class FrameBedVosConfinementAdapter(val data: ArrayList<FrameBedVO>) : BaseDelegateAdapter<BaseRecyclerViewHolder<AdapterHospitalFramePartBinding>, FrameBedVO>() {
+    var TAG = FrameBedVosConfinementAdapter::class.java.getSimpleName()
+
+    /**
+     * 数据提供者
+     */
+    override fun dataProvider(): Any {
+        return data
+    }
+
+    /**
+     * Item坐标
+     */
+    override fun itemFilter(position: Int): Boolean {
+        return true
+    }
+
+    /**
+     * 获取Item总数
+     */
+    override fun getItemCount(): Int {
+        return data.size
+    }
+
+    /**
+     * 创建LayoutHelper
+     */
+    override fun onCreateLayoutHelper(): LayoutHelper {
+        Log.i("FrameBedVosAdapter", "" + data.size)
+//        return LinearLayoutHelper(0,data.size)
+        return GridLayoutHelper(3).then { self ->
+            /**取消自动填充*/
+            self.setAutoExpand(false)
+
+            /**设置左右间距*/
+            self.hGap = 10
+
+            /**设置上下间距*/
+            self.vGap = 10
+
+            /**设置Margin*/
+            self.setMargin(0, 10, 0, 0)
+        }
+    }
+
+    /**
+     * 创建ViewHolder
+     */
+    override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): BaseRecyclerViewHolder<AdapterHospitalFramePartBinding> {
+        return BaseRecyclerViewHolder.build(parent, R.layout.adapter_hospital_frame_part)
+    }
+
+    /**
+     * 绑定数据
+     */
+    override fun onBindViewHolder(holder: BaseRecyclerViewHolder<AdapterHospitalFramePartBinding>?, position: Int) {
+        holder?.bind { binding ->
+            val itemData = getItem(position)
+            if (itemData.customerName != null) {
+                binding.baoMotherNameTv.text = itemData.customerName
+            } else {
+                binding.baoMotherImagev.setImageResource(R.drawable.kong_chuang)
+                binding.baoMotherNameTv.text = "空床位"
+            }
+
+            //binding.babyNameTv.text = ""
+            if (itemData.customerAge != null) {
+                binding.patientAgeTv.text = itemData.customerAge.toString()
+            } else {
+                binding.patientAgeTv.text = "--"
+            }
+            binding.tvNurseName.text = itemData.nurseConfigName
+            if (!TextUtils.isEmpty(itemData.nurseColorRgb)) {
+                binding.tvNurseColor.visibility = View.VISIBLE
+                binding.tvNurseColor.setBackgroundColor(Color.parseColor("#" + itemData.nurseColorRgb))
+            } else {
+                binding.tvNurseColor.visibility = View.INVISIBLE
+            }
+            if (itemData.customerSex != null) {
+                if (itemData.customerSex == 1) {
+                    binding.sexImagev.setImageResource(R.drawable.man)
+                    binding.baoMotherImagev.setImageResource(R.drawable.bing_ren_xiang_qing_man)
+                } else {
+                    binding.sexImagev.setImageResource(R.drawable.nv)
+                    binding.baoMotherImagev.setImageResource(R.drawable.bing_ren_xiang_qing)
+                }
+            } else {
+                binding.sexImagev.visibility = View.GONE
+            }
+            binding.roomNumberTv.text = itemData.frameBed.name + "床"
+            Log.e("FrameBedVosAdapter ", "FrameBedVosAdapter...." + itemData.customerName)
+//            binding.nameTv.text = itemData.frameRoom.name
+
+
+        }
+    }
+}

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/CallRecordsFragment.kt

@@ -8,6 +8,7 @@ import com.enation.javashop.net.engine.model.NetState
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.adapter.CallRecordsItemAdapter
+import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.component.nursehome.databinding.FragmentCallRecordsBinding
 import com.wdkl.ncs.android.component.nursehome.launch.NurseHomeLaunch
 import com.wdkl.ncs.android.lib.base.BaseFragment
@@ -97,7 +98,7 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
         listView.layoutManager = virtualLayoutManager
         listView.adapter = delegateAdapter
 
-        presenter.loadFloor(1, 30, 2, 1,eventName)
+        presenter.loadFloor(1, 30, Constants.part_id, 0,eventName)
         presenter.getEventdata()
 
     }
@@ -240,8 +241,12 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
 
         if (data.size >0){
             adapter.data.clear()
-            adapter.data.addAll(data)
-            Log.i("abc1"," " + data.size);
+            for (item in data) {
+                if (item.actionDirectionType == 1 || item.actionDirectionType == 2 || item.actionDirectionType == 3) {
+                    adapter.data.add(item)
+                }
+            }
+            Log.i("abc1"," " + adapter.data.size);
             adapter.notifyDataSetChanged()
         }
         refresh.finishLoadMore()

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/FramePartFragment.kt

@@ -1,15 +1,19 @@
 package com.wdkl.ncs.android.component.nursehome.fragment
 
 import android.util.Log
+import android.view.View
 import com.alibaba.android.vlayout.DelegateAdapter
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.enation.javashop.net.engine.model.NetState
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.adapter.FrameBedVosAdapter
+import com.wdkl.ncs.android.component.nursehome.adapter.FrameBedVosConfinementAdapter
 import com.wdkl.ncs.android.component.nursehome.adapter.FramePartItemAdapter
+import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.component.nursehome.databinding.FragmentFramePartBinding
 import com.wdkl.ncs.android.component.nursehome.launch.NurseHomeLaunch
+import com.wdkl.ncs.android.component.nursehome.util.TimeTransition
 import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.debugLog
 import com.wdkl.ncs.android.lib.utils.errorLog
@@ -23,6 +27,7 @@ import com.wdkl.ncs.android.middleware.model.vo.FrameRoomVO
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import kotlinx.android.synthetic.main.fragment_frame_part.*
+import kotlinx.android.synthetic.main.right_basic_information.*
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
@@ -35,8 +40,9 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
 //    private val adapter = FramePartItemAdapter(FramePartFragment,ArrayList())
     private val frameBedVosAdapter = FrameBedVosAdapter(ArrayList())
 
-    private var adapter: FramePartItemAdapter? = null
+    private var adapter: FrameBedVosConfinementAdapter? = null
 
+    var fragment = FrameBedVO()
 
     /**
      * @Name  virtualLayoutManager
@@ -90,7 +96,7 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
         /**初始化适配器*/
         delegateAdapter = DelegateAdapter(virtualLayoutManager)
 
-       adapter = FramePartItemAdapter(this.activity,mListener,ArrayList())
+       adapter = FrameBedVosConfinementAdapter(ArrayList())
         delegateAdapter.addAdapter(adapter)
         mViewDataBinding.refresh.setRefreshFooter(ClassicsFooter(activity))
 
@@ -98,7 +104,7 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
         listView.layoutManager = virtualLayoutManager
         listView.adapter = delegateAdapter
 
-        presenter.loadData()
+        presenter.loadData(Constants.part_id)
 
     }
     /**
@@ -108,7 +114,38 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
      * @Note   绑定事件
      */
     override fun bindEvent() {
-//
+        adapter?.setOnItemClickListener { data, position ->
+            fragment = data
+            if (data.customerName != null) {
+                name_tv.text = data.customerName
+                age_tv.text = "" + data.customerAge
+                //roomNumber.text = data.frameBed.name + "床"
+                roomNumber.text = data.frameBed.fullName
+                if (data.customerSex != null) {
+                    if (data.customerSex == 1) {
+                        head_portrait_imagev.setImageResource(R.drawable.bing_ren_xiang_qing_man)
+                        gender_imagev.setImageResource(R.drawable.man)
+                    } else {
+                        head_portrait_imagev.setImageResource(R.drawable.bing_ren_xiang_qing)
+                        gender_imagev.setImageResource(R.drawable.nv)
+                    }
+                } else {
+                    gender_imagev.visibility = View.GONE
+                    head_portrait_imagev.setImageResource(R.drawable.kong_chuang)
+                }
+                time_tv.text = TimeTransition().stampToDate(data.frameBed.createTime * 1000)
+
+            } else {
+                name_tv.text = "空床位"
+                age_tv.text = "无"
+                roomNumber.text = "无"
+                gender_imagev.visibility = View.GONE
+                time_tv.text = "无"
+                mobile_tv.text = "无"
+                head_portrait_imagev.setImageResource(R.drawable.kong_chuang)
+            }
+
+        }
 
         configRefresh()
     }
@@ -157,22 +194,18 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
         if (data!=null){
             var frameRoomVos = ArrayList<FrameRoomVO>()
             frameRoomVos = data.frameRoomVos as ArrayList<FrameRoomVO>
+            var frameBedVO = ArrayList<FrameBedVO>()
 
-
-//            for(frameRoomVo in frameRoomVos){
-//              var frameBedVOs =  frameRoomVo.frameBedVOs
-//                if(frameBedVOs.size>0){
-//                    adapter.data.clear()
-//                    frameBedVosAdapter.data.addAll(frameBedVOs)
-//                    Log.i("abc1"," " + frameBedVOs.size);
-//                    frameBedVosAdapter.notifyDataSetChanged()
-//                }
-//
-//            }
+            for (frameRoomVo in frameRoomVos) {
+                var frameBedVOs = frameRoomVo.frameBedVos
+                if (frameBedVOs.size > 0) {
+                    frameBedVO.addAll(frameBedVOs)
+                }
+            }
 
             adapter!!.data.clear()
-            adapter!!.data.addAll(frameRoomVos)
-            Log.i("abc1"," " + frameRoomVos.size);
+            adapter!!.data.addAll(frameBedVO)
+            Log.i("abc2", " " + frameRoomVos.size);
             adapter!!.notifyDataSetChanged()
         }
         refresh.finishLoadMore()

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/util/TimeTransition.kt

@@ -9,7 +9,7 @@ class TimeTransition {
 
     fun stampToDate(s:Long):String{
 //        return TimeStampToTime(s,"yyyy-MM-dd HH:mm:ss")
-        return getDateTime(s,"MM-dd HH:mm:ss")
+        return getDateTime(s,"yyyy-MM-dd")
     }
 
     /**

nursehome/src/main/res/layout/activity_nurse_home.xml

@@ -245,6 +245,7 @@
                             android:textColor="#FFFFFF"
                             android:text="广播"
                             android:textSize="16px"
+                            android:visibility="invisible"
                              />
                         <!--                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton-->
                         <!--                            android:id="@+id/broadcast_radio_bt"-->
@@ -271,6 +272,7 @@
                             android:textColor="#FFFFFF"
                             android:text="探视管理"
                             android:textSize="16px"
+                            android:visibility="invisible"
                              />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
@@ -284,6 +286,7 @@
                             android:textColor="#FFFFFF"
                             android:text="医生机"
                             android:textSize="16px"
+                            android:visibility="invisible"
                              />
 
 
@@ -298,6 +301,7 @@
                             android:textColor="#FFFFFF"
                             android:text="病区"
                             android:textSize="16px"
+                            android:visibility="invisible"
                              />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
@@ -311,6 +315,7 @@
                             android:textColor="#FFFFFF"
                             android:text="病床"
                             android:textSize="16px"
+                            android:visibility="invisible"
                              />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
@@ -324,6 +329,7 @@
                             android:textColor="#FFFFFF"
                             android:text="护士移动"
                             android:textSize="16px"
+                            android:visibility="invisible"
                              />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
@@ -337,6 +343,7 @@
                             android:textColor="#FFFFFF"
                             android:text="其它主机"
                             android:textSize="16px"
+                            android:visibility="invisible"
                              />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
@@ -350,6 +357,7 @@
                             android:textColor="#FFFFFF"
                             android:text="托管"
                             android:textSize="16px"
+                            android:visibility="invisible"
                              />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton

nursehome/src/main/res/layout/adapter_call_records_item.xml

@@ -3,14 +3,16 @@
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="54dp"
+        android:padding="6dp">
 
         <ImageView
             android:id="@+id/tab_imagev"
             android:layout_width="6dp"
             android:layout_height="6dp"
             android:layout_centerVertical="true"
-            android:background="#000000" />
+            android:background="#000000"
+            android:visibility="gone"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -23,15 +25,15 @@
                 android:id="@+id/sickbed_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="05房01床"
-                android:textSize="6dp" />
+                android:text="---"
+                android:textSize="16sp" />
 
             <TextView
                 android:id="@+id/name_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="姓名:哈啊哈哈"
-                android:textSize="6dp" />
+                android:text="--"
+                android:textSize="12sp" />
 
         </LinearLayout>
 
@@ -41,7 +43,13 @@
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_alignParentRight="true"
-            android:text="12:00"
-            android:textSize="6dp" />
+            android:text="--"
+            android:textSize="12sp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/color_white"
+            android:layout_alignParentBottom="true"/>
     </RelativeLayout>
 </layout>

nursehome/src/main/res/layout/adapter_hospital_frame_part.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="154px"
+        android:layout_height="80px"
+        android:background="#ffffff"
+        android:padding="6dp">
+
+        <LinearLayout
+            android:id="@+id/rl_nurse_item"
+            android:layout_width="match_parent"
+            android:layout_height="16dp"
+            android:layout_alignParentBottom="true">
+            <TextView
+                android:id="@+id/tv_nurse_name"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2"
+                android:text="--"
+                android:textColor="#B4B4B4"
+                android:textSize="16px"/>
+
+            <TextView
+                android:id="@+id/tv_nurse_color"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@color/color_gray" />
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/rl_nurse_item"
+            android:layout_marginBottom="4dp">
+            <ImageView
+                android:id="@+id/bao_mother_imagev"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/kong_chuang" />
+
+            <TextView
+                android:id="@+id/bao_mother_name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/bao_mother_imagev"
+                android:layout_marginLeft="4dp"
+                android:text="--"
+                android:textSize="16px"
+                android:textColor="@color/black"/>
+
+            <ImageView
+                android:id="@+id/sex_imagev"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/bao_mother_imagev"
+                android:layout_below="@id/bao_mother_name_tv"
+                android:layout_marginLeft="4dp"
+                android:src="@drawable/nv" />
+
+            <TextView
+                android:id="@+id/patient_age_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/sex_imagev"
+                android:layout_below="@id/bao_mother_name_tv"
+                android:layout_marginLeft="4dp"
+                android:text="--"
+                android:textSize="14px" />
+
+            <TextView
+                android:id="@+id/baby_name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/sex_imagev"
+                android:text="名字"
+                android:textSize="14px"
+                android:visibility="gone"/>
+
+            <!--<ImageView
+                android:id="@+id/standard_room_imagev"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginRight="6px"
+                android:src="@drawable/bing_fang" />-->
+
+            <TextView
+                android:id="@+id/room_number_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="2房"
+                android:textSize="14px"
+                android:textColor="#2F9DF1"/>
+
+        </RelativeLayout>
+
+    </RelativeLayout>
+</layout>

nursehome/src/main/res/layout/fragment_call_records.xml

@@ -22,7 +22,8 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="gone">
                 <TextView
                     android:id="@+id/no_answer_calls_tv"
                     android:layout_width="wrap_content"
@@ -50,7 +51,7 @@
                     android:id="@+id/call_records_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="历史通话"
+                    android:text="历史记录"
                     android:textSize="14px" />
                 <ImageView
                     android:id="@+id/call_records_imagev"
@@ -68,7 +69,8 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/other_tv"

nursehome/src/main/res/layout/fragment_frame_part.xml

@@ -4,31 +4,150 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/javashop_color_white">
+        android:background="#EAF2F9">
 
-        <com.scwang.smartrefresh.layout.SmartRefreshLayout
-            android:id="@+id/refresh"
-            android:layout_width="match_parent"
+        <RadioGroup
+            android:id="@+id/indexes_radiog"
+            android:layout_width="22px"
             android:layout_height="match_parent"
-            bind:srlEnableRefresh="true"
-            bind:srlEnableLoadMore="false">
+            android:background="@drawable/sp_indexes_bg">
 
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/listView"
+            <RadioButton
+                android:id="@+id/one_radiob"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="#900000">
+                android:layout_height="0px"
+                android:layout_weight="1"
+                android:background="@drawable/selt_check_box_bg"
+                android:button="@null"
+                android:gravity="center"
+                android:text="1"
+                android:textSize="14px" />
+
+            <RadioButton
+                android:id="@+id/two_radiob"
+                android:layout_width="match_parent"
+                android:layout_height="0px"
+                android:layout_weight="1"
+                android:background="@drawable/selt_check_box_bg"
+                android:button="@null"
+                android:gravity="center"
+                android:text="6"
+                android:textSize="14px" />
+
+            <RadioButton
+                android:id="@+id/three_radiob"
+                android:layout_width="match_parent"
+                android:layout_height="0px"
+                android:layout_weight="1"
+                android:background="@drawable/selt_check_box_bg"
+                android:button="@null"
+                android:gravity="center"
+                android:text="16"
+                android:textSize="14px" />
 
-            </android.support.v7.widget.RecyclerView>
+            <RadioButton
+                android:id="@+id/four_radiob"
+                android:layout_width="match_parent"
+                android:layout_height="0px"
+                android:layout_weight="1"
+                android:background="@drawable/selt_check_box_bg"
+                android:button="@null"
+                android:gravity="center"
+                android:text="21"
+                android:textSize="14px" />
+
+            <RadioButton
+                android:id="@+id/five_radiob"
+                android:layout_width="match_parent"
+                android:layout_height="0px"
+                android:layout_weight="1"
+                android:background="@drawable/selt_check_box_bg"
+                android:button="@null"
+                android:gravity="center"
+                android:text="26"
+                android:textSize="14px" />
 
-        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+            <RadioButton
+                android:id="@+id/six_radiob"
+                android:layout_width="match_parent"
+                android:layout_height="0px"
+                android:layout_weight="1"
+                android:background="@drawable/selt_check_box_bg"
+                android:button="@null"
+                android:gravity="center"
+                android:text="31"
+                android:textSize="14px" />
+
+            <RadioButton
+                android:id="@+id/seven_radiob"
+                android:layout_width="match_parent"
+                android:layout_height="0px"
+                android:layout_weight="1"
+                android:background="@drawable/selt_check_box_bg"
+                android:button="@null"
+                android:gravity="center"
+                android:text="36"
+                android:textSize="14px" />
 
-        <TextView
+            <RadioButton
+                android:id="@+id/eight_radiob"
+                android:layout_width="match_parent"
+                android:layout_height="0px"
+                android:layout_weight="1"
+                android:background="@drawable/selt_check_box_bg"
+                android:button="@null"
+                android:gravity="center"
+                android:text="41"
+                android:textSize="14px" />
+
+            <RadioButton
+                android:id="@+id/nine_radiob"
+                android:layout_width="match_parent"
+                android:layout_height="0px"
+                android:layout_weight="1"
+                android:background="@drawable/selt_check_box_bg"
+                android:button="@null"
+                android:gravity="center"
+                android:text="46"
+                android:textSize="14px" />
+        </RadioGroup>
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:text="hahahh ">
+            android:layout_toRightOf="@+id/indexes_radiog"
+            android:orientation="horizontal">
+
+            <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                android:id="@+id/refresh"
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="8px"
+                android:layout_marginRight="8px"
+                android:layout_weight="0.74"
+                bind:srlEnableLoadMore="false"
+                bind:srlEnableRefresh="true">
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/listView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                </android.support.v7.widget.RecyclerView>
+
+            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginRight="6px"
+                android:layout_weight="0.26">
 
-        </TextView>
+                <include
+                    android:id="@+id/right_incident_relyout"
+                    layout="@layout/right_basic_information" />
+            </RelativeLayout>
+        </LinearLayout>
 
     </RelativeLayout>
 </layout>

nursehome/src/main/res/layout/right_basic_information.xml

@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#EAF2F9">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <RadioGroup
+                android:layout_width="match_parent"
+                android:layout_height="40px"
+                android:layout_marginTop="10px"
+                android:background="#ffffff"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <RadioButton
+                    android:id="@+id/basic_information_radiob"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:button="@null"
+                    android:checked="true"
+                    android:drawableBottom="@drawable/selt_call_records_icon"
+                    android:drawablePadding="1px"
+                    android:gravity="center"
+                    android:text="基础信息"
+                    android:textSize="14px" />
+
+                <RadioButton
+                    android:id="@+id/family_member_radiobw"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:button="@null"
+                    android:drawableBottom="@drawable/selt_call_records_icon"
+                    android:drawablePadding="1px"
+                    android:gravity="center"
+                    android:text="家庭成员"
+                    android:textSize="14px" />
+
+                <RadioButton
+                    android:id="@+id/interaction_radiobw"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:button="@null"
+                    android:drawableBottom="@drawable/selt_call_records_icon"
+                    android:drawablePadding="1px"
+                    android:gravity="center"
+                    android:text="交互"
+                    android:textSize="14px" />
+
+
+            </RadioGroup>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="168px"
+                android:layout_marginTop="6px"
+                android:background="#ffffff">
+
+                <ImageView
+                    android:id="@+id/head_portrait_imagev"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10px"
+                    android:layout_marginTop="10px"
+                    android:src="@drawable/kong_chuang" />
+
+                <RelativeLayout
+                    android:id="@+id/basic_information_relalyou"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="19px"
+                    android:layout_marginRight="10px"
+                    android:layout_marginLeft="10px"
+                    android:layout_toRightOf="@+id/head_portrait_imagev">
+
+                    <TextView
+                        android:id="@+id/name_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8px"
+                        android:text="---"
+                        android:textSize="16px" />
+
+                    <TextView
+                        android:id="@+id/age_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8px"
+                        android:layout_toRightOf="@+id/name_tv"
+                        android:textColor="#B4B4B4"
+                        android:textSize="12px" />
+
+                    <TextView
+                        android:id="@+id/roomNumber"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:text="--"
+                        android:textColor="#F78B8F"
+                        android:textSize="16px" />
+
+                </RelativeLayout>
+
+                <LinearLayout
+                    android:id="@+id/baby_information_linlayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/basic_information_relalyou"
+                    android:layout_alignLeft="@+id/basic_information_relalyou"
+                    android:layout_marginTop="4px">
+
+                    <ImageView
+                        android:id="@+id/gender_imagev"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical" />
+
+                    <TextView
+                        android:id="@+id/baby_name_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8px"
+                        android:layout_toRightOf="@+id/name_tv"
+                        android:text="--"
+                        android:textColor="#B4B4B4"
+                        android:textSize="12px"
+                        android:visibility="invisible"/>
+                </LinearLayout>
+
+                <RelativeLayout
+                    android:id="@+id/time_relalyout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10px"
+                    android:layout_below="@+id/baby_information_linlayout"
+                    android:layout_marginTop="20px">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8px"
+                        android:text="入住日期："
+                        android:textSize="14px" />
+
+                    <TextView
+                        android:id="@+id/time_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginLeft="8px"
+                        android:text="----"
+                        android:textColor="#B4B4B4"
+                        android:textSize="14px" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:layout_marginRight="10px"
+                    android:layout_below="@+id/time_relalyout"
+                    android:layout_marginTop="14px">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8px"
+                        android:text="手机号："
+                        android:textSize="14px" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="2px"
+                        android:layout_centerVertical="true"
+                        android:layout_toLeftOf="@+id/mobile_tv"
+                        android:src="@drawable/dian_hua" />
+
+                    <TextView
+                        android:id="@+id/mobile_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginLeft="8px"
+                        android:text="暂无"
+                        android:textColor="#B4B4B4"
+                        android:textSize="14px" />
+
+
+                </RelativeLayout>
+
+            </RelativeLayout>
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/right_remark_recyv"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#EAF2F9">
+
+            </android.support.v7.widget.RecyclerView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/call_the_voice_linlyout"
+            android:layout_width="match_parent"
+            android:layout_height="46px"
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="10px"
+            android:layout_marginRight="10px"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:layout_marginBottom="6px"
+            android:background="#ffffff">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/hu_jiao" />
+
+            <TextView
+                android:id="@+id/call_the_voice_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="16px"
+                android:layout_marginLeft="8px"
+                android:text="呼叫" />
+        </LinearLayout>
+    </RelativeLayout>
+</layout>