#CHANGE

--1.优化床位及呼叫列表的显示
--2.修改床位未绑定分机时也能呼叫的问题

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/channel/DeviceChannel.java

@@ -25,7 +25,7 @@ public class DeviceChannel {
     public static TcpModel handleTcpReceived(final TcpModel tcpModel){
         TcpModel responseTcpModel = null;
 
-        Log.e(TAG,"DeviceChannel tcpType: "+tcpModel.getType() + ", action: " + tcpModel.getAction() + ", calling: " + calling);
+        Log.e(TAG,"DeviceChannel tcpModel: " + tcpModel.toJson() + ", calling: " + calling);
 
         switch (tcpModel.getType()){
             case CALLBACK:

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

@@ -74,15 +74,14 @@ class FrameBedVosConfinementAdapter(val data: ArrayList<FrameBedVO>) : BaseDeleg
         holder?.bind { binding ->
             val itemData = getItem(position)
             if (itemData.customerName != null) {
-                binding.baoMotherNameTv.text = itemData.customerName
+                binding.patientNameTv.text = itemData.customerName
             } else {
-                binding.baoMotherImagev.setImageResource(R.drawable.kong_chuang)
-                binding.baoMotherNameTv.text = "空床位"
+                binding.patientImagev.setImageResource(R.drawable.kong_chuang)
+                binding.patientNameTv.text = "空床位"
             }
 
-            //binding.babyNameTv.text = ""
             if (itemData.customerAge != null) {
-                binding.patientAgeTv.text = itemData.customerAge.toString()
+                binding.patientAgeTv.text = itemData.customerAge.toString() + itemData.customerAgeUnit
             } else {
                 binding.patientAgeTv.text = "--"
             }
@@ -104,19 +103,16 @@ class FrameBedVosConfinementAdapter(val data: ArrayList<FrameBedVO>) : BaseDeleg
             if (itemData.customerSex != null) {
                 if (itemData.customerSex == 1) {
                     binding.sexImagev.setImageResource(R.drawable.man)
-                    binding.baoMotherImagev.setImageResource(R.drawable.bing_ren_xiang_qing_man)
+                    binding.patientImagev.setImageResource(R.drawable.bing_ren_xiang_qing_man)
                 } else {
                     binding.sexImagev.setImageResource(R.drawable.nv)
-                    binding.baoMotherImagev.setImageResource(R.drawable.bing_ren_xiang_qing)
+                    binding.patientImagev.setImageResource(R.drawable.bing_ren_xiang_qing)
                 }
             } else {
                 binding.sexImagev.visibility = View.GONE
             }
             binding.roomNumberTv.text = itemData.frameBed.fullName
             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

@@ -23,6 +23,7 @@ import com.wdkl.ncs.android.middleware.model.vo.EventVO
 import com.wdkl.ncs.android.middleware.model.vo.FrameBedVO
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
+import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import kotlinx.android.synthetic.main.fragment_call_records.*
 import org.greenrobot.eventbus.Subscribe
@@ -44,11 +45,6 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
      */
     private lateinit var virtualLayoutManager: VirtualLayoutManager
 
-    /**
-     * @Name  delegateAdapter
-     * @Type  DelegateAdapter
-     * @Note  七巧板适配器
-     */
     private lateinit var delegateAdapter: DelegateAdapter
 
 
@@ -57,41 +53,21 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
     private var eventName = ""
 
     //加载历史记录条数
-    private val pageSize: Int = 10
+    private val pageSize: Int = 15
     //数据的初始页数
     private var page: Int = 1
     //查询历史记录类型
     private var listType: Int = 1
 
-
-    /**
-     * @author LDD
-     * @From   HomeFragment
-     * @Date   2018/1/19 下午5:32
-     * @Note   提供layoutID
-     * @return layoutId
-     */
     override fun getLayId(): Int {
         return R.layout.fragment_call_records
     }
 
 
-    /**
-     * @author LDD
-     * @From   HomeFragment
-     * @Date   2018/1/19 下午5:33
-     * @Note   初始化依赖注入
-     */
     override fun bindDagger() {
         NurseHomeLaunch.component.inject(this)
     }
 
-    /**
-     * @author LDD
-     * @From   HomeFragment
-     * @Date   2018/1/19 下午5:33
-     * @Note   初始化操作
-     */
     override fun init() {
         /**初始化LayoutMannager*/
         virtualLayoutManager = VirtualLayoutManager(this.activity)
@@ -116,7 +92,6 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
     override fun onClick(p0: View) {
         when(p0.id){
             R.id.no_answer_calls_linlyout -> {
-                //showMessage("点击了未接通话")
                 call_records_imagev.visibility = View.GONE
                 no_answer_calls_imagev.visibility = View.VISIBLE
                 page = 1
@@ -124,7 +99,6 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
                 presenter.loadFloor(page, pageSize, Constants.part_id, listType, eventName)
             }
             R.id.call_records_linlyout -> {
-                //showMessage("点击了通话记录")
                 no_answer_calls_imagev.visibility = View.GONE
                 call_records_imagev.visibility = View.VISIBLE
                 page = 1
@@ -138,21 +112,6 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
 
     }
 
-    /**
-     * 加载未接通话记录
-     */
-    fun callRecords(){
-//        presenter.loadFloor()
-
-    }
-
-
-    /**
-     * @author LDD
-     * @From   HomeFragment
-     * @Date   2018/1/19 下午5:33
-     * @Note   绑定事件
-     */
     override fun bindEvent() {
         //点击监听
         mViewDataBinding.noAnswerCallsLinlyout.setOnClickListener(this)
@@ -166,102 +125,31 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
         configRefresh()
     }
 
-    /**
-     * @author LDD
-     * @From   HomeFragment
-     * @Date   2018/1/19 下午5:34
-     * @Note   页面销毁回调
-     */
     override fun destory() {
-        debugLog("HomeFragment","Destory")
     }
 
-    /**
-     * @author LDD
-     * @From   HomeFragment
-     * @Date   2018/1/19 下午5:35
-     * @Note   处理错误信息
-     * @param  message  错误信息
-     */
     override fun onError(message: String, type: Int) {
-        getUtils().dismissDialog()
         errorLog("error",message)
         showMessage(message)
     }
 
-    /**
-     * @author LDD
-     * @From   HomeFragment
-     * @Date   2018/1/19 下午5:37
-     * @Note   耗时加载开始
-     */
     override fun start() {
-        getUtils().showDialog()
     }
-    /**
-     * @author LDD
-     * @From   HomeFragment
-     * @Date   2018/8/16 下午4:08
-     * @Note   渲染楼层
-     * @param  data  数据
-     */
+
     override fun renderFloor(data: ArrayList<InteractionVO>) {
         Log.e("TAG","CallRecordsFragment走了。。。"+data.size)
 
-//        var listData = arrayListOf<FrameDO>()
-//        var listData = ArrayList<CallingHistoryVO>()
-//       var callingHistoryVO = CallingHistoryVO()
-//        callingHistoryVO.content = "nicai"
-//
-//        var callingHistoryVO2 = CallingHistoryVO()
-//        callingHistoryVO2.content = "1234"
-//
-//        var callingHistoryVO3 = CallingHistoryVO()
-//        callingHistoryVO3.content = "43322"
-//
-//        var callingHistoryVO4 = CallingHistoryVO()
-//        callingHistoryVO4.content = "4567"
-//
-//        var callingHistoryVO5 = CallingHistoryVO()
-//        callingHistoryVO5.content = "56544"
-//
-//        var callingHistoryVO6 = CallingHistoryVO()
-//        callingHistoryVO6.content = "766555"
-//
-//        var callingHistoryVO7 = CallingHistoryVO()
-//        callingHistoryVO7.content = "卡萨卡"
-//
-//        var callingHistoryVO8 = CallingHistoryVO()
-//        callingHistoryVO8.content = "我十四"
-//
-//        var callingHistoryVO9 = CallingHistoryVO()
-//        callingHistoryVO9.content = "你在哪"
-//
-//        listData.add(callingHistoryVO)
-//        listData.add(callingHistoryVO2)
-//        listData.add(callingHistoryVO3)
-//        listData.add(callingHistoryVO4)
-//        listData.add(callingHistoryVO5)
-//        listData.add(callingHistoryVO6)
-//        listData.add(callingHistoryVO7)
-//        listData.add(callingHistoryVO8)
-//        listData.add(callingHistoryVO9)
-
-//Log.e("TAG","CallRecordsFragment走了2222。。。"+listData.size)
-//        for (s2 in listData){
-//            Log.e("TAG","走了3333。。。")
-//            println(s2.name)
-//        }
-//
-
         refresh.finishRefresh()
         if (page == 1) {
             refresh.resetNoMoreData()
             adapter.data.clear()
             if (data.size > 0) {
                 for (item in data) {
-                    if (item.actionDirectionType == 1 || item.actionDirectionType == 2 || item.actionDirectionType == 3) {
-                        adapter.data.add(item)
+                    //只有普通呼叫和紧急呼叫加入呼叫列表
+                    if (TcpType.SOS.name == item.actionType || TcpType.VOICE.name == item.actionType) {
+                        if (item.actionDirectionType == 1 || item.actionDirectionType == 2 || item.actionDirectionType == 3) {
+                            adapter.data.add(item)
+                        }
                     }
                 }
                 Log.i("abc1"," " + adapter.data.size);
@@ -271,8 +159,11 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
         } else {
             if (data.size > 0) {
                 for (item in data) {
-                    if (item.actionDirectionType == 1 || item.actionDirectionType == 2 || item.actionDirectionType == 3) {
-                        adapter.data.add(item)
+                    //只有普通呼叫和紧急呼叫加入呼叫列表
+                    if (TcpType.SOS.name == item.actionType || TcpType.VOICE.name == item.actionType) {
+                        if (item.actionDirectionType == 1 || item.actionDirectionType == 2 || item.actionDirectionType == 3) {
+                            adapter.data.add(item)
+                        }
                     }
                 }
                 adapter.notifyDataSetChanged()
@@ -289,22 +180,10 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
 
     }
 
-    /**
-     * @author LDD
-     * @From   HomeFragment
-     * @Date   2018/1/19 下午5:36
-     * @Note   操作完成
-     * @param  message 完成信息
-     */
     override fun complete(message: String, type: Int) {
         getUtils().dismissDialog()
     }
-    /**
-     * @author LDD
-     * @From   HomeFragment
-     * @Date   2018/1/19 下午5:37
-     * @Note   配置刷新监听处理
-     */
+
     private fun configRefresh(){
         //下拉刷新
         mViewDataBinding.refresh.setOnRefreshListener {
@@ -317,13 +196,7 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
             presenter.loadFloor(page, pageSize, Constants.part_id, listType, eventName)
         }
     }
-    /**
-     * @author LDD
-     * @From
-     * @Date   2018/1/19 下午5:39
-     * @Note   处理网络状态
-     * @param  state 网络状态
-     */
+
     override fun networkMonitor(state: NetState) {
         state.filter(onWifi = {
 

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

@@ -9,6 +9,7 @@ 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.google.gson.Gson
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.wdkl.core.socket.SocketManager
 import com.wdkl.ncs.android.component.nursehome.R
@@ -28,6 +29,8 @@ import com.wdkl.ncs.android.middleware.model.dto.ExaminationConfigByGroupNameDto
 import com.wdkl.ncs.android.middleware.model.dto.FeeConfigByGroupNameDto
 import com.wdkl.ncs.android.middleware.model.vo.*
 import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil
+import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
+import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
 import com.wdkl.ncs.android.middleware.utils.CommonUtils
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import kotlinx.android.synthetic.main.fragment_frame_part.*
@@ -187,7 +190,7 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
 
         call_the_voice_tv.setOnClickListener {
             //语音呼叫
-            if (frame.customerName != null) {
+            if (frame.customerName != null && frame.bedDeviceId != null) {
                 //通话之前先判断webrtc socket是否连接上，否则不能建立通话
                 if (SocketManager.getInstance().socketOpen()) {
                     VoiceUtil.startAudioCall(Integer.parseInt(Constants.ids), frame.bedDeviceId)
@@ -196,7 +199,7 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
                     showMessage("通话服务未建立连接，请检查网络或稍后再试")
                 }
             } else {
-                showMessage("床位未入住，无法通话")
+                showMessage("床位未入住或未绑定设备，无法通话")
             }
         }
 
@@ -295,7 +298,7 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
      * @param  message  错误信息
      */
     override fun onError(message: String, type: Int) {
-        getUtils().dismissDialog()
+        refresh.finishRefresh()
         errorLog("error",message)
         showMessage(message)
     }
@@ -307,7 +310,6 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
      * @Note   耗时加载开始
      */
     override fun start() {
-        getUtils().showDialog()
     }
     /**
      * @author LDD
@@ -317,8 +319,7 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
      * @param  data  数据
      */
     override fun showData(data: FramePartVO) {
-
-        if (data!=null && data.frameRoomVos != null){
+        if (data.frameRoomVos != null){
             var frameRoomVos = data.frameRoomVos as ArrayList<FrameRoomVO>
             var frameBedVO = ArrayList<FrameBedVO>()
 
@@ -335,6 +336,7 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
             Log.i("abc2", " " + frameRoomVos.size);
             adapter!!.notifyDataSetChanged()
         }
+        refresh.finishRefresh()
         refresh.finishLoadMore()
     }
 
@@ -346,7 +348,6 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
      * @param  message 完成信息
      */
     override fun complete(message: String, type: Int) {
-        getUtils().dismissDialog()
     }
     /**
      * @author LDD
@@ -355,7 +356,9 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
      * @Note   配置刷新监听处理
      */
     private fun configRefresh(){
-
+        refresh.setOnRefreshListener {
+            presenter.loadData(Constants.part_id)
+        }
     }
     /**
      * @author LDD
@@ -383,6 +386,14 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
-        //
+        when (messageEvent.getType()) {
+            Constants.EVENT_TCP_MSG -> {
+                var tcpModel = messageEvent.getMessage() as TcpModel
+                if (tcpModel.action == TcpAction.DataAction.REFRESH) {
+                    //更新数据
+                    presenter.loadData(Constants.part_id)
+                }
+            }
+        }
     }
 }

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

@@ -2,15 +2,15 @@
 <layout>
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="154px"
-        android:layout_height="80px"
+        android:layout_width="140dp"
+        android:layout_height="90dp"
         android:background="#ffffff"
         android:padding="6dp">
 
         <LinearLayout
             android:id="@+id/rl_nurse_item"
             android:layout_width="match_parent"
-            android:layout_height="16dp"
+            android:layout_height="20dp"
             android:layout_alignParentBottom="true">
             <TextView
                 android:id="@+id/tv_nurse_config_name"
@@ -19,7 +19,7 @@
                 android:layout_weight="2"
                 android:text="--"
                 android:textColor="#B4B4B4"
-                android:textSize="16px"/>
+                android:textSize="14sp"/>
 
             <TextView
                 android:id="@+id/tv_nurse_config_color"
@@ -36,27 +36,28 @@
             android:layout_above="@id/rl_nurse_item"
             android:layout_marginBottom="4dp">
             <ImageView
-                android:id="@+id/bao_mother_imagev"
+                android:id="@+id/patient_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:id="@+id/patient_name_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_toRightOf="@id/bao_mother_imagev"
+                android:layout_toRightOf="@id/patient_imagev"
                 android:layout_marginLeft="4dp"
                 android:text="--"
-                android:textSize="16px"
+                android:textSize="16sp"
                 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_toRightOf="@id/patient_imagev"
+                android:layout_below="@id/patient_name_tv"
+                android:layout_marginTop="6dp"
                 android:layout_marginLeft="4dp"
                 android:src="@drawable/nv" />
 
@@ -65,27 +66,11 @@
                 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:layout_below="@id/patient_name_tv"
+                android:layout_marginTop="4dp"
+                android:layout_marginLeft="6dp"
                 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" />-->
+                android:textSize="14sp" />
 
             <TextView
                 android:id="@+id/room_number_tv"
@@ -93,7 +78,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:text="2房"
-                android:textSize="14px"
+                android:textSize="14sp"
                 android:textColor="#2F9DF1"/>
 
         </RelativeLayout>

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

@@ -93,8 +93,7 @@
             android:layout_height="match_parent"
             android:layout_below="@+id/button_linlyout"
             android:layout_marginLeft="6px"
-            android:layout_marginRight="8px"
-            >
+            android:layout_marginRight="8px">
 
         <com.scwang.smartrefresh.layout.SmartRefreshLayout
             android:id="@+id/refresh"
@@ -107,6 +106,10 @@
                 android:id="@+id/listView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:scrollbars="vertical"
+                android:fadeScrollbars="true"
+                android:scrollbarSize="4dp"
+                android:scrollbarThumbVertical="@color/colorPrimaryDark"
                 android:background="#87CEFA">
             </android.support.v7.widget.RecyclerView>
 

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

@@ -132,9 +132,7 @@
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/listView"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                </android.support.v7.widget.RecyclerView>
+                    android:layout_height="match_parent"/>
 
             </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 

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

@@ -9,14 +9,14 @@
         android:id="@+id/tv_item_cost_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="12sp"
+        android:textSize="14sp"
         android:textColor="@color/black"/>
     <TextView
         android:id="@+id/tv_item_cost_value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:textSize="12sp"
+        android:textSize="14sp"
         android:textColor="@color/black"/>
     <TextView
         android:id="@+id/tv_item_cost_id"
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/tv_item_cost_name"
         android:layout_marginTop="4dp"
-        android:textSize="12sp"
+        android:textSize="14sp"
         android:textColor="#A4A4A4"/>
     <TextView
         android:id="@+id/tv_item_cost_unit"
@@ -33,7 +33,7 @@
         android:layout_alignParentRight="true"
         android:layout_below="@id/tv_item_cost_value"
         android:layout_marginTop="4dp"
-        android:textSize="12sp"
+        android:textSize="14sp"
         android:textColor="#A4A4A4"/>
 
 </RelativeLayout>

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

@@ -18,7 +18,7 @@
             android:layout_weight="1"
             android:text=""
             android:textColor="@color/main_color"
-            android:textSize="14sp"/>
+            android:textSize="16sp"/>
         <TextView
             android:id="@+id/tv_cost_group_total"
             android:layout_width="0dp"
@@ -27,7 +27,7 @@
             android:gravity="right"
             android:text=""
             android:textColor="@color/main_color"
-            android:textSize="14sp"/>
+            android:textSize="16sp"/>
     </LinearLayout>
 
     <android.support.v7.widget.RecyclerView

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

@@ -9,14 +9,14 @@
         android:id="@+id/tv_item_exam_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="12sp"
+        android:textSize="14sp"
         android:textColor="@color/black"/>
     <TextView
         android:id="@+id/tv_item_exam_value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:textSize="12sp"
+        android:textSize="14sp"
         android:textColor="@color/black"/>
     <TextView
         android:id="@+id/tv_item_exam_desc"
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/tv_item_exam_name"
         android:layout_marginTop="4dp"
-        android:textSize="12sp"
+        android:textSize="14sp"
         android:textColor="@color/black"/>
     <TextView
         android:id="@+id/tv_item_exam_time"
@@ -32,7 +32,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/tv_item_exam_desc"
         android:layout_marginTop="4dp"
-        android:textSize="12sp"
+        android:textSize="14sp"
         android:textColor="#A4A4A4"/>
 
 </RelativeLayout>

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

@@ -18,7 +18,7 @@
             android:layout_weight="1"
             android:text=""
             android:textColor="@color/main_color"
-            android:textSize="14sp"/>
+            android:textSize="16sp"/>
     </LinearLayout>
 
     <android.support.v7.widget.RecyclerView

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

@@ -9,7 +9,7 @@
         <LinearLayout
             android:id="@+id/call_the_voice_linlyout"
             android:layout_width="match_parent"
-            android:layout_height="46px"
+            android:layout_height="56px"
             android:layout_alignParentBottom="true"
             android:layout_marginRight="10px"
             android:gravity="center"
@@ -20,26 +20,26 @@
             <TextView
                 android:id="@+id/call_the_voice_tv"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingLeft="20dp"
                 android:drawableLeft="@drawable/hu_jiao"
                 android:drawablePadding="6px"
-                android:textSize="16px"
+                android:textSize="18sp"
                 android:text="语音"
                 android:textColor="@drawable/selector_action_button_text_color"/>
 
             <TextView
                 android:id="@+id/call_the_video_tv"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingLeft="20dp"
                 android:drawableLeft="@drawable/hu_jiao"
                 android:drawablePadding="6px"
-                android:textSize="16px"
+                android:textSize="18sp"
                 android:text="视频"
                 android:textColor="@drawable/selector_action_button_text_color"/>
         </LinearLayout>
@@ -70,7 +70,7 @@
                     android:gravity="center"
                     android:textColor="@drawable/selt_call_records_text"
                     android:text="基础信息"
-                    android:textSize="14px" />
+                    android:textSize="16sp" />
 
                 <RadioButton
                     android:id="@+id/fee_radio"
@@ -83,7 +83,7 @@
                     android:gravity="center"
                     android:textColor="@drawable/selt_call_records_text"
                     android:text="费用"
-                    android:textSize="14px" />
+                    android:textSize="16sp" />
 
                 <RadioButton
                     android:id="@+id/exam_radio"
@@ -96,7 +96,7 @@
                     android:gravity="center"
                     android:textColor="@drawable/selt_call_records_text"
                     android:text="检验"
-                    android:textSize="14px" />
+                    android:textSize="16sp" />
             </RadioGroup>
 
             <RelativeLayout
@@ -114,11 +114,22 @@
                     android:layout_marginTop="10px"
                     android:src="@drawable/kong_chuang" />
 
-                <RelativeLayout
+                <TextView
+                    android:id="@+id/roomNumber"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6px"
+                    android:layout_marginLeft="10px"
+                    android:layout_toRightOf="@+id/head_portrait_imagev"
+                    android:text="--"
+                    android:textColor="#2F9DF1"
+                    android:textSize="14sp" />
+
+                <!--<RelativeLayout
                     android:id="@+id/basic_information_relalyou"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="19px"
+                    android:layout_marginTop="10px"
                     android:layout_marginRight="10px"
                     android:layout_marginLeft="10px"
                     android:layout_toRightOf="@+id/head_portrait_imagev">
@@ -128,8 +139,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="8px"
-                        android:text="---"
-                        android:textSize="16px"
+                        android:text="-&#45;&#45;"
+                        android:textSize="16sp"
                         android:textColor="#0D0D0D"/>
 
                     <TextView
@@ -137,25 +148,36 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
-                        android:text="--"
+                        android:text="&#45;&#45;"
                         android:textColor="#2F9DF1"
-                        android:textSize="16px" />
+                        android:textSize="14sp" />
 
-                </RelativeLayout>
+                </RelativeLayout>-->
 
                 <LinearLayout
-                    android:id="@+id/baby_information_linlayout"
+                    android:id="@+id/custom_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">
+                    android:layout_below="@+id/roomNumber"
+                    android:layout_alignLeft="@+id/roomNumber"
+                    android:layout_marginTop="6px">
+
+                    <TextView
+                        android:id="@+id/name_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/roomNumber"
+                        android:layout_alignLeft="@+id/roomNumber"
+                        android:text="---"
+                        android:textSize="14sp"
+                        android:textColor="#0D0D0D"/>
 
                     <ImageView
                         android:id="@+id/gender_imagev"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical" />
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="12px"/>
 
                     <TextView
                         android:id="@+id/age_tv"
@@ -164,7 +186,7 @@
                         android:layout_marginLeft="8px"
                         android:text="--"
                         android:textColor="#B4B4B4"
-                        android:textSize="12px" />
+                        android:textSize="14sp" />
 
                 </LinearLayout>
 
@@ -173,7 +195,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="10px"
-                    android:layout_below="@+id/baby_information_linlayout"
+                    android:layout_below="@+id/custom_information_linlayout"
                     android:layout_marginTop="20px">
 
                     <TextView
@@ -181,7 +203,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="8px"
                         android:text="入住日期："
-                        android:textSize="14px"
+                        android:textSize="14sp"
                         android:textColor="#0D0D0D"/>
 
                     <TextView
@@ -192,7 +214,7 @@
                         android:layout_marginLeft="8px"
                         android:text="----"
                         android:textColor="#B4B4B4"
-                        android:textSize="14px" />
+                        android:textSize="14sp" />
 
                 </RelativeLayout>
 
@@ -210,7 +232,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="8px"
                         android:text="手机号："
-                        android:textSize="14px"
+                        android:textSize="14sp"
                         android:textColor="#0D0D0D"/>
 
                     <ImageView
@@ -229,7 +251,7 @@
                         android:layout_marginLeft="8px"
                         android:text="无"
                         android:textColor="#B4B4B4"
-                        android:textSize="14px" />
+                        android:textSize="14sp" />
 
                 </RelativeLayout>
 
@@ -246,7 +268,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="8px"
                         android:text="责任医生："
-                        android:textSize="14px"
+                        android:textSize="14sp"
                         android:textColor="#0D0D0D"/>
 
                     <TextView
@@ -257,7 +279,7 @@
                         android:layout_marginLeft="8px"
                         android:text="----"
                         android:textColor="#B4B4B4"
-                        android:textSize="14px" />
+                        android:textSize="14sp" />
 
                 </RelativeLayout>
 
@@ -274,7 +296,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="8px"
                         android:text="责任护士："
-                        android:textSize="14px"
+                        android:textSize="14sp"
                         android:textColor="#0D0D0D"/>
 
                     <TextView
@@ -285,7 +307,7 @@
                         android:layout_marginLeft="8px"
                         android:text="----"
                         android:textColor="#B4B4B4"
-                        android:textSize="14px" />
+                        android:textSize="14sp" />
 
                 </RelativeLayout>
 
@@ -302,7 +324,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="8px"
                         android:text="护理项："
-                        android:textSize="14px"
+                        android:textSize="14sp"
                         android:textColor="#0D0D0D"/>
 
                     <TextView
@@ -313,7 +335,7 @@
                         android:layout_marginLeft="8px"
                         android:text="----"
                         android:textColor="#B4B4B4"
-                        android:textSize="14px" />
+                        android:textSize="14sp" />
 
                 </RelativeLayout>
 
@@ -333,19 +355,19 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="8px"
                         android:text="医嘱："
-                        android:textSize="14px"
+                        android:textSize="14sp"
                         android:textColor="#0D0D0D"/>
 
                     <TextView
                         android:id="@+id/tv_advice_info"
                         android:layout_width="match_parent"
-                        android:layout_height="60dp"
+                        android:layout_height="80dp"
                         android:layout_marginLeft="8px"
                         android:scrollbars="vertical"
                         android:fadeScrollbars="true"
                         android:text="----"
                         android:textColor="#B4B4B4"
-                        android:textSize="14px" />
+                        android:textSize="14sp" />
 
                 </LinearLayout>
 
@@ -365,19 +387,19 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="8px"
                         android:text="病情描述："
-                        android:textSize="14px"
+                        android:textSize="14sp"
                         android:textColor="#0D0D0D"/>
 
                     <TextView
                         android:id="@+id/tv_illness_info"
                         android:layout_width="match_parent"
-                        android:layout_height="60dp"
+                        android:layout_height="80dp"
                         android:layout_marginLeft="8px"
                         android:scrollbars="vertical"
                         android:fadeScrollbars="true"
                         android:text="----"
                         android:textColor="#B4B4B4"
-                        android:textSize="14px" />
+                        android:textSize="14sp" />
 
                 </LinearLayout>
             </RelativeLayout>