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 = ""; // 登录