HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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 } }); }