Browse Source

修改云教练websocket地址

Pq 3 years ago
parent
commit
1fe63ddfde

+ 28 - 19
BaseLibrary/src/main/java/com/cooleshow/base/common/WebConstants.java

@@ -9,6 +9,17 @@ public abstract class WebConstants {
     public static final String WEB_UA_PARAMS = ";COLEXIUAPPA";
     public static final String WEB_UA_PARAMS = ";COLEXIUAPPA";
     public static final String WEB_JS_INTERFACE = "COLEXIU";
     public static final String WEB_JS_INTERFACE = "COLEXIU";
     public static final String WEB_URL = "web_url";//
     public static final String WEB_URL = "web_url";//
+    public static final String WEB_SOCKET_URL_TEST = "wss://dev.colexiu.com/audioAnalysis";
+    public static final String WEB_SOCKET_URL_RELEASE = "wss://dev.colexiu.com/audioAnalysis";
+
+
+    public static String getWebSocketUrl() {
+        if (BuildConfig.DEBUG) {
+            return WEB_SOCKET_URL_TEST;
+        } else {
+            return WEB_SOCKET_URL_RELEASE;
+        }
+    }
 
 
     private static String getTeacherBaseUrlH5() {
     private static String getTeacherBaseUrlH5() {
         return BuildConfig.BASE_URL_H5;
         return BuildConfig.BASE_URL_H5;
@@ -21,38 +32,37 @@ public abstract class WebConstants {
     private static String getBaseUrlH5() {
     private static String getBaseUrlH5() {
         return BaseApplication.Companion.isTeacherClient() ? getTeacherBaseUrlH5() : getStudentBaseUrlH5();
         return BaseApplication.Companion.isTeacherClient() ? getTeacherBaseUrlH5() : getStudentBaseUrlH5();
     }
     }
+
     //直播课列表
     //直播课列表
-    public static  final String STUDENT_LIVE_CLASS=getBaseUrlH5() +"/#/liveClass";
+    public static final String STUDENT_LIVE_CLASS = getBaseUrlH5() + "/#/liveClass";
     //视频课列表
     //视频课列表
-    public static  final String STUDENT_VIDEO_CLASS=getBaseUrlH5() +"/#/videoClass";
+    public static final String STUDENT_VIDEO_CLASS = getBaseUrlH5() + "/#/videoClass";
     //陪练课列表
     //陪练课列表
-    public static  final String STUDENT_PRACTICE_CLASS=getBaseUrlH5() +"/#/practiceClass";
+    public static final String STUDENT_PRACTICE_CLASS = getBaseUrlH5() + "/#/practiceClass";
     //评测记录
     //评测记录
-    public static  final String STUDENT_MEMBER_RECORD=getBaseUrlH5() +"/#/memberRecord";
+    public static final String STUDENT_MEMBER_RECORD = getBaseUrlH5() + "/#/memberRecord";
     //会员中心
     //会员中心
-    public static  final String STUDENT_MEMBER_CENTER=getBaseUrlH5() +"/#/memberCenter";
+    public static final String STUDENT_MEMBER_CENTER = getBaseUrlH5() + "/#/memberCenter";
     //老师主页
     //老师主页
-    public static  final String STUDENT_TEACHER_HOME=getBaseUrlH5() +"/#/teacherHome?teacherId=";
+    public static final String STUDENT_TEACHER_HOME = getBaseUrlH5() + "/#/teacherHome?teacherId=";
     //老师风采
     //老师风采
-    public static  final String STUDENT_TEACHER_ELEGANT=getBaseUrlH5() +"/#/teacherElegant";
+    public static final String STUDENT_TEACHER_ELEGANT = getBaseUrlH5() + "/#/teacherElegant";
     //交易记录
     //交易记录
-    public static  final String STUDENT_TRAD_RECORD=getBaseUrlH5() +"/#/tradeRecord";
+    public static final String STUDENT_TRAD_RECORD = getBaseUrlH5() + "/#/tradeRecord";
     //我的关注
     //我的关注
-    public static  final String STUDENT_TEACHER_FOLLOW=getBaseUrlH5() +"/#/teacherFollow";
+    public static final String STUDENT_TEACHER_FOLLOW = getBaseUrlH5() + "/#/teacherFollow";
     //我的乐谱
     //我的乐谱
-    public static  final String STUDENT_MUSIC_PERSONAL=getBaseUrlH5() +"/#/music-personal";
+    public static final String STUDENT_MUSIC_PERSONAL = getBaseUrlH5() + "/#/music-personal";
     //资讯详情
     //资讯详情
-    public static  final String STUDENT_SPECIAL_DETAIL=getBaseUrlH5() +"/#/specialDetail?id=";
+    public static final String STUDENT_SPECIAL_DETAIL = getBaseUrlH5() + "/#/specialDetail?id=";
     //精彩资讯
     //精彩资讯
-    public static  final String STUDENT_SPECIAL=getBaseUrlH5() +"/#/special";
+    public static final String STUDENT_SPECIAL = getBaseUrlH5() + "/#/special";
     //热门专辑
     //热门专辑
-    public static  final String STUDENT_MUSIC_ALBUM=getBaseUrlH5() +"/#/music-album";
+    public static final String STUDENT_MUSIC_ALBUM = getBaseUrlH5() + "/#/music-album";
     //专辑详情
     //专辑详情
-    public static  final String STUDENT_MUSIC_ALBUM_DETAIL=getBaseUrlH5() +"/#/music-album-detail/";
+    public static final String STUDENT_MUSIC_ALBUM_DETAIL = getBaseUrlH5() + "/#/music-album-detail/";
     //学生端直播间购物车
     //学生端直播间购物车
-    public static  final String STUDENT_LIVE_SHOP_CAR_URL=getBaseUrlH5() +"/#/liveActiveList";
-
-
+    public static final String STUDENT_LIVE_SHOP_CAR_URL = getBaseUrlH5() + "/#/liveActiveList";
 
 
 
 
     //注册协议
     //注册协议
@@ -98,8 +108,7 @@ public abstract class WebConstants {
     public static final String PIANO_ROOM = getBaseUrlH5() + "#/pianoRoom";
     public static final String PIANO_ROOM = getBaseUrlH5() + "#/pianoRoom";
 
 
     //商品订单
     //商品订单
-    public static final String MALL_GOODS_ORDER= getBaseUrlH5() + "/#/goodsOrder";
-
+    public static final String MALL_GOODS_ORDER = getBaseUrlH5() + "/#/goodsOrder";
 
 
 
 
 }
 }

+ 1 - 1
student/src/main/java/com/cooleshow/student/ui/web/AccompanyFragment.java

@@ -163,7 +163,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
             url = getArguments().getString("url");
             url = getArguments().getString("url");
         }
         }
         String localUserId = UserHelper.getUserId();
         String localUserId = UserHelper.getUserId();
-        webSocketUri = URI.create("ws://192.168.3.119:8090/audioAnalysis" + "/" + localUserId);
+        webSocketUri = URI.create(WebConstants.getWebSocketUrl() + "/" + localUserId);
         try {
         try {
             if (Build.VERSION.SDK_INT >= 21 && Build.VERSION.SDK_INT < 23) {
             if (Build.VERSION.SDK_INT >= 21 && Build.VERSION.SDK_INT < 23) {
                 webView = new LollipopFixedWebView(getActivity());
                 webView = new LollipopFixedWebView(getActivity());

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/web/AccompanyFragment.java

@@ -168,7 +168,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
             url = getArguments().getString("url");
             url = getArguments().getString("url");
         }
         }
         String localUserId = UserHelper.getUserId();
         String localUserId = UserHelper.getUserId();
-        webSocketUri = URI.create("ws://192.168.3.119:8090/audioAnalysis" + "/" + localUserId);
+        webSocketUri = URI.create(WebConstants.getWebSocketUrl() + "/" + localUserId);
         try {
         try {
             if (Build.VERSION.SDK_INT >= 21 && Build.VERSION.SDK_INT < 23) {
             if (Build.VERSION.SDK_INT >= 21 && Build.VERSION.SDK_INT < 23) {
                 webView = new LollipopFixedWebView(getActivity());
                 webView = new LollipopFixedWebView(getActivity());