Browse Source

#去掉些无用代码,优化左侧呼叫记录显示

weizhengliang 3 years ago
parent
commit
2ffb05e6d1

+ 1 - 5
app/src/main/code/com/wdkl/app/ncs/application/Application.kt

@@ -76,11 +76,7 @@ class Application : BaseApplication() {
      * @return rx观察者
      * @return rx观察者
      */
      */
     private fun initFrame() {
     private fun initFrame() {
-        if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.LOLLIPOP) {
-            BaseConfig.getInstance().addActivity("WelcomeActivity", "HomeActivity")
-        } else {
-            BaseConfig.getInstance().closeScrollBack()
-        }
+
         NetEngineConfig.init(baseContext)
         NetEngineConfig.init(baseContext)
                 .openLogger()
                 .openLogger()
                 .addNetInterceptor(RestfulExceptionInterceptor())
                 .addNetInterceptor(RestfulExceptionInterceptor())

+ 10 - 0
nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/adapter/CallRecordsItemAdapter.kt

@@ -77,6 +77,7 @@ class CallRecordsItemAdapter(val data:ArrayList<InteractionVO>) : BaseDelegateAd
                 binding.tabImagev.setImageResource(R.drawable.lai_dian_tou_xiang_bg)
                 binding.tabImagev.setImageResource(R.drawable.lai_dian_tou_xiang_bg)
                 binding.callListReply.visibility = View.GONE
                 binding.callListReply.visibility = View.GONE
                 binding.callSosReply.visibility = View.GONE
                 binding.callSosReply.visibility = View.GONE
+                return
             }
             }
 
 
             //是否已处理
             //是否已处理
@@ -134,6 +135,15 @@ class CallRecordsItemAdapter(val data:ArrayList<InteractionVO>) : BaseDelegateAd
                 }
                 }
             }
             }
 
 
+            //门口机呼叫记录
+            if (itemData.fromDeviceType != null && itemData.fromDeviceType == 3) {
+                binding.sickbedTv.text = itemData.fromFrameFullName
+                binding.nameTv.text = "门口机"
+                binding.callStatusImagev.visibility = View.GONE
+                binding.callListReply.visibility = View.GONE
+                binding.callSosReply.visibility = View.GONE
+            }
+
             binding.callListReply.setOnClickListener {
             binding.callListReply.setOnClickListener {
                 if (!Constants.ids.equals("")) {
                 if (!Constants.ids.equals("")) {
                     if (itemData.actionDirectionType == 1 && itemData.fromDeviceId != null && itemData.fromDeviceId != Constants.ids!!.toInt()) {
                     if (itemData.actionDirectionType == 1 && itemData.fromDeviceId != null && itemData.fromDeviceId != Constants.ids!!.toInt()) {

+ 1 - 1
rtc-chat/src/main/java/com/wdkl/skywebrtc/engine/webrtc/WebRTCEngine.java

@@ -64,7 +64,7 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
     private SurfaceViewRenderer localRenderer;
     private SurfaceViewRenderer localRenderer;
 
 
     // 服务器实例列表
     // 服务器实例列表
-    private String serverIP = "120.76.246.253";
+    private String serverIP = "8.129.220.143";
     private String turnUser = "wdklrtc";
     private String turnUser = "wdklrtc";
     private String turnUserPwd = "Wdkl2021Rtc";
     private String turnUserPwd = "Wdkl2021Rtc";
 
 

+ 0 - 1
webrtc/src/main/java/com/wdkl/core/socket/SocketManager.java

@@ -230,7 +230,6 @@ public class SocketManager implements IEvent {
             } else {
             } else {
                 EventBus.getDefault().post(new MessageEvent("video_call", Constants.Companion.getEVENT_CALL_STATE()));
                 EventBus.getDefault().post(new MessageEvent("video_call", Constants.Companion.getEVENT_CALL_STATE()));
             }
             }
-            //CallSingleActivity.openActivity(mContext, inviteId, false, inviteId, audioOnly, false, false);
         }
         }
     }
     }