替换删除老版本云教练模块的东西

BaseLibrary/src/main/java/com/cooleshow/base/common/WebApi.java

@@ -20,4 +20,12 @@ public class WebApi {
 
     public static final String API_SAVE_FILE = "saveFile";
     public static final String API_VIDEO_CROP = "videoCrop";
+
+    public static final String API_SET_CACHE = "setCache";
+    //获取缓存
+    public static final String API_GET_CACHE = "getCache";
+
+    public static final String API_COURSE_LOADING = "courseLoading";
+    public static final String API_CLOUD_LOADING = "cloudLoading";
+    //打开音频合成相关页面
 }

BaseLibrary/src/main/java/com/cooleshow/base/utils/helper/WebStartHelper.java

@@ -41,7 +41,7 @@ public class WebStartHelper {
      * * @param id
      */
     public static void startAccompany(String id) {
-        ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_ACCOMPANY_HTML)
+        ARouter.getInstance().build(RouterPath.Accompany.ACTIVITY_ACCOMPANY_HTML)
                 .withString("url", String.format(WebConstants.SCORE_DETAIL_PAGE, id))
                 .withBoolean("isHideTitle", true)
                 .withBoolean("statusBarTextColor", true)

BaseLibrary/src/main/res/values/colors.xml

@@ -200,5 +200,6 @@
     <color name="color_ff7b31">#FF7B31</color>
     <color name="color_777777">#777777</color>
     <color name="color_eb6363">#EB6363</color>
+    <color name="color_ff8057">#ff8057</color>
 
 </resources>

accompany/src/main/java/com/daya/orchestra/accompany/js/JsInterfaceAccomPanyUtils.java

@@ -64,7 +64,7 @@ public class JsInterfaceAccomPanyUtils extends Object {
                             .withString(UserConstants.PHONE_NUM_KEY, UserHelper.getUserPhone())
                             .navigation();
                     activity.finish();
-                } else if ("cloudLoading".equals(api)) {
+                } else if (TextUtils.equals(WebApi.API_CLOUD_LOADING,api)) {
                     if (onListener != null) {
                         onListener.cloudLoading(jsonObject);
                     }

accompany/src/main/java/com/daya/orchestra/accompany/web/AccompanyActivity.java

@@ -135,7 +135,8 @@ public class AccompanyActivity extends BaseActivity<ActivityAccompanyBinding> {
         }
 
         setStatusBarTextColor(intent.getBooleanExtra("statusBarTextColor", true));
-        webViewUrl = url;
+        addToken(url);
+
         accompanyFragment = AccompanyFragment.newInstance(webViewUrl);
         accompanyFragment.setOnAccompanyListener(new AccompanyFragment.onListener() {
 
@@ -318,6 +319,24 @@ public class AccompanyActivity extends BaseActivity<ActivityAccompanyBinding> {
         startService(intentOne);
     }
 
+    private void addToken(String url) {
+        String userToken = UserHelper.getUserToken();
+        String Authorization = TextUtils.isEmpty(userToken) ? null : userToken;
+        if (!TextUtils.isEmpty(Authorization)) {
+            try {
+                authorization = URLEncoder.encode(Authorization, "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+            boolean status = url.contains("?");
+            if (status) {
+                webViewUrl = (url + "&Authorization=" + authorization);
+            } else {
+                webViewUrl = (url + "?Authorization=" + authorization);
+            }
+        }
+    }
+
     @SuppressLint("CheckResult")
     private void toStartCapture() {
         Observable.create(new ObservableOnSubscribe<Object>() {

student/src/main/java/com/cooleshow/student/widgets/helper/JsInterfaceAccomPanyUtils.java

@@ -143,7 +143,7 @@ public class JsInterfaceAccomPanyUtils extends Object {
                     } catch (Exception e) {
                     }
 
-                    ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_ACCOMPANY_HTML)
+                    ARouter.getInstance().build(RouterPath.Accompany.ACTIVITY_ACCOMPANY_HTML)
                             .withString("url", content.getString("url"))
                             .withBoolean("isHideTitle", isHideTitle)
                             .withBoolean("statusBarTextColor", statusBarTextColor)

student/src/main/java/com/cooleshow/student/widgets/helper/JsInterfaceUtils.java

@@ -166,7 +166,7 @@ public class JsInterfaceUtils extends Object {
                         c_orientation = content.optInt("c_orientation",ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//当前页面的横竖屏,用于云教练页面页面关闭的时候判断
                     } catch (Exception e) {
                     }
-                    ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_ACCOMPANY_HTML)
+                    ARouter.getInstance().build(RouterPath.Accompany.ACTIVITY_ACCOMPANY_HTML)
                             .withString(WEB_URL, content.getString("url"))
                             .withBoolean("isHideTitle", isHideTitle)
                             .withBoolean("statusBarTextColor", statusBarTextColor)

student/src/main/res/drawable/shape_accompany_loading_progress_drawable.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/background">
-        <shape>
-            <corners android:radius="4dip" />
-<!--            <solid android:color="@color/color_eeeeee"/>-->
-            <stroke android:color="@color/white" android:width="1dp"/>
-        </shape>
-    </item>
-    <item android:id="@android:id/progress">
-<!--        <clip>-->
-<!--            <shape>-->
-<!--                <corners android:radius="4dip" />-->
-<!--                <solid android:color="@color/color_4877ff"/>-->
-<!--            </shape>-->
-<!--        </clip>-->
-
-        <!--
-   -->
-        <scale android:scaleWidth="100%"
-            android:drawable="@drawable/progress_bar_ffffff_4dp"/>
-    </item>
-</layer-list>

teacher/src/main/java/com/cooleshow/teacher/widgets/helper/JsInterfaceAccomPanyUtils.java

@@ -139,7 +139,7 @@ public class JsInterfaceAccomPanyUtils extends Object {
                     } catch (Exception e) {
                     }
 
-                    ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_ACCOMPANY_HTML)
+                    ARouter.getInstance().build(RouterPath.Accompany.ACTIVITY_ACCOMPANY_HTML)
                             .withString("url", content.getString("url"))
                             .withBoolean("isHideTitle", isHideTitle)
                             .withBoolean("statusBarTextColor", statusBarTextColor)

teacher/src/main/java/com/cooleshow/teacher/widgets/helper/JsInterfaceHelper.java

@@ -124,7 +124,7 @@ public class JsInterfaceHelper extends Object {
                     orientation = content.getInt("orientation");
                 } catch (Exception e) {
                 }
-                ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_ACCOMPANY_HTML)
+                ARouter.getInstance().build(RouterPath.Accompany.ACTIVITY_ACCOMPANY_HTML)
                         .withString("url", content.getString("url"))
                         .withBoolean("isHideTitle", isHideTitle)
                         .withBoolean("statusBarTextColor", statusBarTextColor)

teacher/src/main/java/com/cooleshow/teacher/widgets/helper/JsInterfaceUtils.java

@@ -179,7 +179,7 @@ public class JsInterfaceUtils extends Object {
                         c_orientation = content.optInt("c_orientation",ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//当前页面的横竖屏,用于云教练页面页面关闭的时候判断
                     } catch (Exception e) {
                     }
-                    ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_ACCOMPANY_HTML)
+                    ARouter.getInstance().build(RouterPath.Accompany.ACTIVITY_ACCOMPANY_HTML)
                             .withString(WEB_URL, content.getString("url"))
                             .withBoolean("isHideTitle", isHideTitle)
                             .withBoolean("statusBarTextColor", statusBarTextColor)

teacher/src/main/res/drawable/shape_accompany_loading_progress_drawable.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/background">
-        <shape>
-            <corners android:radius="4dip" />
-            <!--            <solid android:color="@color/color_eeeeee"/>-->
-            <stroke android:color="@color/white" android:width="1dp"/>
-        </shape>
-    </item>
-    <item android:id="@android:id/progress">
-        <!--        <clip>-->
-        <!--            <shape>-->
-        <!--                <corners android:radius="4dip" />-->
-        <!--                <solid android:color="@color/color_4877ff"/>-->
-        <!--            </shape>-->
-        <!--        </clip>-->
-
-        <!--
-   -->
-        <scale android:scaleWidth="100%"
-            android:drawable="@drawable/progress_bar_ffffff_4dp"/>
-    </item>
-</layer-list>