## [1.1.60] version 78 - 2020-09-03

### Changed
- APP_DEV 全局变量修改IP
- 强制竖屏

WebRTC/src/main/java/com/wdkl/core/consts/Urls.java

@@ -1,16 +1,22 @@
 package com.wdkl.core.consts;
 
+import com.wdkl.ncs.android.middleware.config.WdklNcsConfigCenter;
+
 /**
  * Created by dds on 2020/4/19.
  * ddssingsong@163.com
  */
 public class Urls {
 
-    //private final static String IP = "192.168.2.111";
-    //public final static String IP = "42.192.40.58:5000";
-//    public final static String IP = "172.28.100.100:5000";
-
-    public final static String IP = "120.76.246.253:5000";
+    public static String IP = "8.129.220.143:5000";
+    //public final static String IP = "120.76.246.253:5000";
+    static {
+        if (WdklNcsConfigCenter.getINSTANCE().getAPP_DEV()){
+            IP = "8.129.220.143:5000";
+        } else {
+            IP = "120.76.246.253:5000";
+        }
+    }
 
     private final static String HOST = "http://" + IP + "/";
 

app/src/main/AndroidManifest.xml

@@ -43,7 +43,7 @@
 <!--            >-->
 <!--        <activity android:name="com.wdkl.ncs.android.component.home.activity.WatchRegisterActivity">-->
 <!--        <activity android:name="com.starrtc.demo.demo.SplashActivity">-->
-        <activity android:name="com.wdkl.ncs.android.component.home.activity.WatchHome2Activity" >
+        <activity android:name="com.wdkl.ncs.android.component.home.activity.WatchHome2Activity" android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 77
+    ext.app_version_code = 78
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.1.59"
+    ext.app_version = "1.1.60"
 
     /**
      * 项目依赖库

home/src/main/AndroidManifest.xml

@@ -19,17 +19,17 @@
         android:allowBackup="true"
         android:supportsRtl="true">
 
-        <activity android:name=".activity.WatchHome2Activity"/>
-        <activity android:name=".activity.WatchContactsActivity" />
-        <activity android:name=".activity.WatchCallRecordsActivity" />
-        <activity android:name=".activity.WatchEventDetailActivity" />
-        <activity android:name=".activity.WatchUserSettingActivity" />
-        <activity android:name=".activity.SOSEmergencyCallActivity" />
-        <activity android:name=".activity.TakeoverActivity" />
-        <activity android:name=".activity.WebRTCVoipAudioActivity" />
-        <activity android:name=".activity.WebRTCVoipAudioRingingActivity" />
-        <activity android:name=".activity.AppUpdateActivity" />
-        <activity android:name=".activity.NewEventListActivity"/>
+        <activity android:screenOrientation="portrait" android:name=".activity.WatchHome2Activity"/>
+        <activity android:screenOrientation="portrait" android:name=".activity.WatchContactsActivity" />
+        <activity android:screenOrientation="portrait" android:name=".activity.WatchCallRecordsActivity" />
+        <activity android:screenOrientation="portrait" android:name=".activity.WatchEventDetailActivity" />
+        <activity android:screenOrientation="portrait" android:name=".activity.WatchUserSettingActivity" />
+        <activity android:screenOrientation="portrait" android:name=".activity.SOSEmergencyCallActivity" />
+        <activity android:screenOrientation="portrait" android:name=".activity.TakeoverActivity" />
+        <activity android:screenOrientation="portrait" android:name=".activity.WebRTCVoipAudioActivity" />
+        <activity android:screenOrientation="portrait" android:name=".activity.WebRTCVoipAudioRingingActivity" />
+        <activity android:screenOrientation="portrait" android:name=".activity.AppUpdateActivity" />
+        <activity android:screenOrientation="portrait" android:name=".activity.NewEventListActivity"/>
 
         <service android:name="com.wdkl.ncs.android.component.home.service.WdKeepAliveService">
             <intent-filter>

middleware/src/main/code/com/wdkl/ncs/android/middleware/config/WdklNcsConfigCenter.kt

@@ -22,7 +22,7 @@ class WdklNcsConfigCenter {
     /**
      *  是否处于开发模式
      */
-    val APP_DEV = false
+    val APP_DEV = true
 
     /**
      * 基础URL

readme.md

@@ -26,6 +26,13 @@
 
 ---
 
+## [1.1.60] version 78 - 2020-09-03
+### Changed
+- APP_DEV 全局变量修改IP
+- 强制竖屏
+
+---
+
 ## [1.1.59] version 77 - 2020-08-24
 ### Fixed
 - 优化TCP连通

rtc-chat/build.gradle

@@ -30,6 +30,7 @@ dependencies {
 
     // 官方库
     implementation group: 'org.webrtc', name: 'google-webrtc', version: '1.0.32006'
+    implementation project(path: ':middleware')
     // 自己编译的库
     //api project(path: ':libwebrtc')
 }

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

@@ -14,6 +14,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 
+import com.wdkl.ncs.android.middleware.config.WdklNcsConfigCenter;
 import com.wdkl.skywebrtc.EnumType;
 import com.wdkl.skywebrtc.engine.AudioFocusManager;
 import com.wdkl.skywebrtc.engine.EngineCallback;
@@ -68,7 +69,8 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
 
 
     // 服务器实例列表
-    private String serverIP = "120.76.246.253";
+    // private String serverIP = "120.76.246.253";
+    private String serverIP = "8.129.220.143";
     private String turnUser = "wdklrtc";
     private String turnUserPwd = "Wdkl2021Rtc";
 
@@ -96,6 +98,12 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
         this.mIsAudioOnly = mIsAudioOnly;
         this.mContext = mContext;
         audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+
+        if (WdklNcsConfigCenter.getINSTANCE().getAPP_DEV()){
+            serverIP = "8.129.220.143";
+        } else {
+            serverIP = "120.76.246.253";
+        }
         // 初始化ice地址
         initIceServer();
     }