From 1cb86d56496996975585f5dff9678b7c6009691d Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期二, 28 六月 2022 17:08:05 +0800
Subject: [PATCH] 代码同步
---
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
index 2e4a99b..37ef91b 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
@@ -163,10 +163,7 @@
@Override
public void outgoingInit() {
super.outgoingInit();
-<<<<<<< HEAD
Log.d("HDLLinphoneKit","------outgoingInit------");
-=======
->>>>>>> 1697a5c0a1d40e756738d1f99d496c6e33b3fd52
}
@Override
@@ -180,12 +177,8 @@
@Override
public void callEnd() {
super.callEnd();
-<<<<<<< HEAD
Log.d("HDLLinphoneKit","------callEnd------");
// context.sendBroadcast(new Intent(HDLLinphoneIntercomActivity.RECEIVE_FINISH_VIDEO_ACTIVITY));
-
-=======
->>>>>>> 1697a5c0a1d40e756738d1f99d496c6e33b3fd52
}
});
}
--
Gitblit v1.8.0