From a780f0b8d0ccec90d359c0c554f07d5afde9554c Mon Sep 17 00:00:00 2001 From: 562935844@qq.com Date: 星期二, 28 六月 2022 17:05:31 +0800 Subject: [PATCH] 代码同步 --- HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java index 2fa757f..e1a68a0 100644 --- a/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java +++ b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java @@ -15,8 +15,15 @@ public class LinphoneTestActivity extends Activity { +<<<<<<< HEAD private static final String password = "c3jPOxdmD0bkNuo930eY9eYBD"; private static final String serverIP = "47.96.88.250:25060"; +======= +// "A583853817423247", +// "763548", + private static final String password = "763548"; + private static final String serverIP = "139.159.157.75:46000";//""116.62.26.215:35060"; +>>>>>>> 1697a5c0a1d40e756738d1f99d496c6e33b3fd52 private String account = ""; // 鐧诲綍 -- Gitblit v1.8.0