呼叫记录列表动画切换卡顿，暂时去掉。

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -18,6 +18,7 @@ import android.view.View
 import android.view.ViewTreeObserver
 import android.widget.SeekBar
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentTransaction
 import com.alibaba.fastjson.JSON
 import com.alibaba.fastjson.JSONObject
 import com.clj.fastble.BleManager
@@ -503,9 +504,9 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
         currentFragmentThree = fragment
         bed_call_frame_r.bringToFront()
         supportFragmentManager.beginTransaction()
-                .setCustomAnimations(R.anim.push_left_in, R.anim.slide_up_out)
-                .add(R.id.bed_call_frame_r, fragment)
-                .commitAllowingStateLoss()
+            //.setCustomAnimations(R.anim.slide_right_in, R.anim.slide_right_out)
+            .add(R.id.bed_call_frame_r, fragment)
+            .commitAllowingStateLoss()
     }
 
     fun removeRightFragment() {
@@ -521,7 +522,7 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
         yhCallFragment = fragment
         bed_call_frame_r_h.bringToFront()
         supportFragmentManager.beginTransaction()
-//                .setCustomAnimations(R.anim.push_left_in, R.anim.slide_up_out)
+                //.setCustomAnimations(R.anim.push_left_in, R.anim.slide_up_out)
                 .add(R.id.bed_call_frame_r_h, fragment)
                 .commitAllowingStateLoss()
     }

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/CallRecordsFragment.kt

@@ -1,6 +1,7 @@
 package com.wdkl.app.ncs.callingbed.fragment
 
 import android.app.Activity
+import android.os.Bundle
 import android.util.Log
 import android.view.View
 import androidx.recyclerview.widget.GridLayoutManager
@@ -90,6 +91,11 @@ class CallRecordsFragment : BaseFragment<BedCallRecordsFragmentPresenter, MainCa
         main_call_r_l_rv_2.layoutManager = virtualLayoutManager
         main_call_r_l_rv_2.adapter = delegateAdapter
 
+    }
+
+    override fun onResume() {
+        super.onResume()
+
         if (Constant.CUSTOM_ID != -1) {
             presenter.loadCallRecords(page, pageSize, Constant.CUSTOM_ID)
         }

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/SkyCallFragment.kt

@@ -106,7 +106,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
     }
 
     private fun showui(){
-        if (  Constant.NursingTitle.equals("进入护理")){
+        if (Constant.NursingTitle.equals("进入护理")){
             view_calling_bed_layout_title.setBackgroundColor(Color.parseColor("#FF8484"))
             calling_bed_layout_call_mian.setBackgroundColor(Color.parseColor("#FF8484"))
             view_title_layout_return.visibility=View.GONE

android_bed/src/main/res/anim/slide_left_out.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromXDelta="0%p"
+        android:toXDelta="100%p"
+        android:duration="500"/>
+</set>

android_bed/src/main/res/anim/slide_right_in.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromXDelta="100%"
+        android:toXDelta="0"
+        android:duration="500"/>
+</set>

android_bed/src/main/res/anim/slide_right_out.xml

@@ -3,5 +3,5 @@
     <translate
         android:fromXDelta="0%p"
         android:toXDelta="100%p"
-        android:duration="300"/>
+        android:duration="500"/>
 </set>

android_bed/src/main/res/layout/main_call_r_dialog.xml

@@ -2,34 +2,32 @@
 <layout xmlns:bind="http://schemas.android.com/apk/res-auto">
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/call_r_k"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/transparent">
-    <LinearLayout
+    android:background="#B8000000">
+    <!--<LinearLayout
         android:id="@+id/call_r_k"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:clickable="true"
-        android:background="#80000000"
-        >
-    </LinearLayout>
+        android:background="#80000000" />-->
+
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="520dp"
         android:orientation="horizontal"
         android:layout_alignParentRight="true"
         android:layout_marginTop="@dimen/d60"
-        android:background="@drawable/shape_main_call_r_bg"
-        >
+        android:background="@drawable/shape_main_call_r_bg">
         <LinearLayout
             android:id="@+id/main_call_r_l_view"
             android:layout_width="@dimen/d48"
             android:layout_height="match_parent"
             android:orientation="vertical"
             android:clickable="true"
-            android:gravity="center_horizontal"
-            >
+            android:gravity="center_horizontal">
             <ImageView
                 android:layout_width="@dimen/d20"
                 android:layout_height="@dimen/d20"
@@ -50,14 +48,12 @@
             android:orientation="vertical"
             android:gravity="center_horizontal"
             android:layout_marginTop="@dimen/d16"
-            android:layout_marginBottom="@dimen/d50"
-            >
+            android:layout_marginBottom="@dimen/d50">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/main_call_r_l_rv_1"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-               />
+                android:layout_height="match_parent"/>
         </LinearLayout>
 
         <LinearLayout
@@ -68,14 +64,12 @@
             android:layout_marginTop="@dimen/d16"
             android:layout_marginBottom="@dimen/d50"
             android:layout_marginLeft="@dimen/d20"
-            android:layout_marginRight="@dimen/d16"
-            >
+            android:layout_marginRight="@dimen/d16">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/d54"
                 android:orientation="horizontal"
-                android:background="@drawable/shape_bed_bg"
-                >
+                android:background="@drawable/shape_bed_bg">
                 <RelativeLayout
                     android:id="@+id/call_records_linlyout"
                     android:layout_width="0dp"
@@ -141,12 +135,7 @@
                 />
             </com.scwang.smartrefresh.layout.SmartRefreshLayout>
         </LinearLayout>
-
-
-
     </LinearLayout>
-
-
 </RelativeLayout>
 
 </layout>

android_bed/src/main/res/layout/view_title_layout.xml

@@ -1,176 +1,180 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/view_calling_bed_layout_title"
     android:layout_width="match_parent"
     android:layout_height="42dp">
 
-    <!--设备号-->
-    <LinearLayout
-        android:id="@+id/view_title_layout_return"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="20dp"
-        android:background="@drawable/shape_main_hos_txt_bg"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp">
+    <RelativeLayout
+        android:id="@+id/view_calling_bed_layout_title"
+        android:layout_width="match_parent"
+        android:layout_height="42dp">
 
-        <ImageView
-            android:id="@+id/view_title_layout_img"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginRight="6dp"
-            android:background="@mipmap/return_w"
-            android:visibility="gone" />
-        <!--医院名称-->
-        <TextView
-            android:id="@+id/view_title_layout_tv_hospital_name"
+        <!--设备号-->
+        <LinearLayout
+            android:id="@+id/view_title_layout_return"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:text="科室名称"
-            android:textColor="@color/white"
-            android:textSize="@dimen/font_size_18" />
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/view_title_layout_tv_no_img"
-        android:layout_width="@dimen/d22"
-        android:layout_height="@dimen/d22"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="10dp"
-        android:layout_toLeftOf="@+id/view_title_layout_tv_no"
-        android:background="@mipmap/dun"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/view_title_layout_tv_no"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="10dp"
-        android:text="ID:"
-        android:textColor="@color/black"
-        android:textSize="@dimen/font_size_18"
-        android:visibility="gone" />
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:background="@drawable/shape_main_hos_txt_bg"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp">
 
-    <!--状态图标-->
-    <LinearLayout
-        android:id="@+id/view_title_layout_ll_right"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="10dp"
-        android:orientation="horizontal">
+            <ImageView
+                android:id="@+id/view_title_layout_img"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginRight="6dp"
+                android:background="@mipmap/return_w"
+                android:visibility="gone" />
+            <!--医院名称-->
+            <TextView
+                android:id="@+id/view_title_layout_tv_hospital_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="marquee"
+                android:singleLine="true"
+                android:text="科室名称"
+                android:textColor="@color/white"
+                android:textSize="@dimen/font_size_18" />
+        </LinearLayout>
 
         <ImageView
-            android:id="@+id/view_title_lay_day_img"
-            android:layout_width="@dimen/d18"
-            android:layout_height="@dimen/d18"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
-            android:background="@mipmap/riqi" />
-        <!--日期-->
-        <TextClock
-            android:id="@+id/view_title_lay_day_tx"
+            android:id="@+id/view_title_layout_tv_no_img"
+            android:layout_width="@dimen/d22"
+            android:layout_height="@dimen/d22"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="10dp"
+            android:layout_toLeftOf="@+id/view_title_layout_tv_no"
+            android:background="@mipmap/dun"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/view_title_layout_tv_no"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/d5"
-            android:format12Hour="yyyy-MM-dd EEEE"
-            android:format24Hour="yyyy-MM-dd EEEE"
-            android:text="16:08"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="10dp"
+            android:text="ID:"
             android:textColor="@color/black"
-            android:textSize="@dimen/font_size_18" />
+            android:textSize="@dimen/font_size_18"
+            android:visibility="gone" />
 
-        <ImageView
-            android:id="@+id/view_title_lay_time_img"
-            android:layout_width="@dimen/d18"
-            android:layout_height="@dimen/d18"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/d23"
-            android:layout_marginRight="4dp"
-            android:background="@mipmap/shijian" />
-        <!--时间-->
-        <TextClock
-            android:id="@+id/view_title_lay_time_tx"
+        <!--状态图标-->
+        <LinearLayout
+            android:id="@+id/view_title_layout_ll_right"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/d5"
-            android:layout_marginRight="@dimen/d30"
-            android:format12Hour="HH:mm"
-            android:format24Hour="HH:mm"
-            android:text="16:08"
-            android:textColor="@color/black"
-            android:textSize="@dimen/font_size_18" />
-
-        <!--SIP状态图标-->
-        <TextView
-            android:id="@+id/view_title_layout_tv_point"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
-            android:background="@mipmap/sip_b"
-            android:visibility="gone" />
+            android:layout_marginRight="10dp"
+            android:orientation="horizontal">
 
-        <ImageView
-            android:id="@+id/view_title_layout_iv_bt"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
-            android:visibility="gone" />
+            <ImageView
+                android:id="@+id/view_title_lay_day_img"
+                android:layout_width="@dimen/d18"
+                android:layout_height="@dimen/d18"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:background="@mipmap/riqi" />
+            <!--日期-->
+            <TextClock
+                android:id="@+id/view_title_lay_day_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="@dimen/d5"
+                android:format12Hour="yyyy-MM-dd EEEE"
+                android:format24Hour="yyyy-MM-dd EEEE"
+                android:text="16:08"
+                android:textColor="@color/black"
+                android:textSize="@dimen/font_size_18" />
 
-        <ImageView
-            android:id="@+id/view_title_layout_iv_wifi"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
-            android:visibility="gone" />
+            <ImageView
+                android:id="@+id/view_title_lay_time_img"
+                android:layout_width="@dimen/d18"
+                android:layout_height="@dimen/d18"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="@dimen/d23"
+                android:layout_marginRight="4dp"
+                android:background="@mipmap/shijian" />
+            <!--时间-->
+            <TextClock
+                android:id="@+id/view_title_lay_time_tx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="@dimen/d5"
+                android:layout_marginRight="@dimen/d30"
+                android:format12Hour="HH:mm"
+                android:format24Hour="HH:mm"
+                android:text="16:08"
+                android:textColor="@color/black"
+                android:textSize="@dimen/font_size_18" />
 
-        <ImageView
-            android:id="@+id/view_title_layout_iv_tcp"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
-            android:src="@mipmap/ic_tcp_fail" />
+            <!--SIP状态图标-->
+            <TextView
+                android:id="@+id/view_title_layout_tv_point"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:background="@mipmap/sip_b"
+                android:visibility="gone" />
 
-        <ImageView
-            android:id="@+id/view_title_layout_iv_ethernet"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
-            android:visibility="gone" />
+            <ImageView
+                android:id="@+id/view_title_layout_iv_bt"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:visibility="gone" />
 
-        <ImageView
-            android:id="@+id/view_title_layout_iv_day_night"
-            android:layout_width="20dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
-            android:src="@mipmap/ic_daylight" />
+            <ImageView
+                android:id="@+id/view_title_layout_iv_wifi"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/view_title_layout_iv_tcp"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:src="@mipmap/ic_tcp_fail" />
+
+            <ImageView
+                android:id="@+id/view_title_layout_iv_ethernet"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:visibility="gone" />
 
-    </LinearLayout>
+            <ImageView
+                android:id="@+id/view_title_layout_iv_day_night"
+                android:layout_width="20dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:src="@mipmap/ic_daylight" />
 
+        </LinearLayout>
+    </RelativeLayout>
 </RelativeLayout>