修改部分页面样式适配机构端

BaseLibrary/src/main/res/drawable/pg_stu.xml

@@ -15,9 +15,9 @@
             <shape>
                 <corners android:radius="2dp" />
                 <gradient
-                    android:centerColor="@color/colorPrimaryStudent"
-                    android:endColor="@color/colorPrimaryStudent"
-                    android:startColor="@color/colorPrimaryStudent" />
+                    android:centerColor="?attr/klx_main_color2"
+                    android:endColor="?attr/klx_main_color2"
+                    android:startColor="?attr/klx_main_color2" />
 
             </shape>
         </clip>

institution/src/main/java/com/cooleshow/institution/stu/constants/JGWebConstants.java

@@ -1,6 +1,8 @@
 package com.cooleshow.institution.stu.constants;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.common.BaseApplication;
+import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.institution.stu.BuildConfig;
 
 /**
@@ -11,7 +13,11 @@ public class JGWebConstants {
 
     //曲目详情页
     public static final String MUSIC_SHEET_DETAIL = getBaseUrlH5() + "/#/music-detail?id=";
+    //帮助中心
+    public static final String HELP_CENTER = getBaseUrlH5() + "/#/helpCenter";
+
     private static String getBaseUrlH5() {
         return BuildConfig.BASE_URL_H5_JG;
     }
+
 }

institution/src/main/java/com/cooleshow/institution/stu/constants/JGWebStartHelper.java

@@ -10,6 +10,7 @@ import com.cooleshow.base.router.RouterPath;
 public class JGWebStartHelper {
     /**
      * 打开老师个人主页
+     *
      * @param
      */
     public static void startMusicSheetDetail(String musicId) {
@@ -18,4 +19,32 @@ public class JGWebStartHelper {
                 .withString(WebConstants.WEB_URL, JGWebConstants.MUSIC_SHEET_DETAIL + musicId)
                 .navigation();
     }
+
+    public static void startHelpCenter() {
+        ARouter.getInstance()
+                .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                .withString(WebConstants.WEB_URL, JGWebConstants.HELP_CENTER)
+                .navigation();
+    }
+
+    /**
+     * 打开用户协议页面
+     */
+    public static void startUserPrivacy() {
+        ARouter.getInstance()
+                .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                .withString(WebConstants.WEB_URL, WebConstants.REGISTRATION_AGREEMENT)
+                .navigation();
+    }
+
+    /**
+     * 打开隐私协议页面
+     */
+    public static void startPrivacy() {
+        ARouter.getInstance()
+                .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                .withString(WebConstants.WEB_URL, WebConstants.PRIVACY_AGREEMENT)
+                .navigation();
+    }
+
 }

institution/src/main/java/com/cooleshow/institution/stu/ui/main/MineFragment.java

@@ -4,6 +4,7 @@ import android.text.TextUtils;
 import android.view.View;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.base.utils.DateUtil;
@@ -12,6 +13,8 @@ import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.institution.stu.R;
+import com.cooleshow.institution.stu.constants.JGWebConstants;
+import com.cooleshow.institution.stu.constants.JGWebStartHelper;
 import com.cooleshow.institution.stu.databinding.FgMineLayoutBinding;
 import com.cooleshow.institution.stu.presenter.MinePresenter;
 import com.cooleshow.usercenter.bean.StudentUserInfo;
@@ -90,6 +93,34 @@ public class MineFragment extends BaseMVPFragment<FgMineLayoutBinding, MinePrese
             //个人中心
             ARouter.getInstance().build(RouterPath.JGCenter.MINE_PERSONAL_SETTING)
                     .navigation();
+            return;
+        }
+        if (id == R.id.tv_help_center) {
+            //帮助中心
+            JGWebStartHelper.startHelpCenter();
+            return;
+        }
+
+        if(id == R.id.tv_feed_back){
+            //意见反馈
+            ARouter.getInstance().build(RouterPath.MineCenter.MINE_FEEDBACK)
+                    .navigation();
+            return;
+        }
+
+        if(id ==R.id.tv_user_protocol){
+            JGWebStartHelper.startUserPrivacy();
+            return;
+        }
+        if(id == R.id.tv_privacy_policy){
+            JGWebStartHelper.startPrivacy();
+            return;
+        }
+
+        if(id == R.id.tv_about_us){
+            ARouter.getInstance().build(RouterPath.MineCenter.MINE_ABOUT)
+                    .navigation();
+            return;
         }
     }
 }

student/src/main/java/com/cooleshow/student/ui/mine/FeedBackActivity.java

@@ -7,6 +7,7 @@ import android.view.View;
 import androidx.annotation.Nullable;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
@@ -56,6 +57,7 @@ public class FeedBackActivity extends BaseMVPActivity<ActivityFeedbackBinding, F
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StyleConfig.setTheme(this);
         super.onCreate(savedInstanceState);
         StatusBarUtil.setStatusBarDarkTheme(this, true);
     }

student/src/main/java/com/cooleshow/student/ui/web/HtmlActivity.java

@@ -48,6 +48,7 @@ import com.cooleshow.base.BuildConfig;
 import com.cooleshow.base.bean.WxPayResult;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.constanst.Constants;
+import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.data.net.RetrofitClientNoToken;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseActivity;
@@ -154,6 +155,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         //限制截屏和录屏
 //        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        StyleConfig.setTheme(this);
         super.onCreate(savedInstanceState);
         AndroidBug5497Workaround.assistActivity(this);
         EventBus.getDefault().register(this);

student/src/main/res/layout/activity_feedback.xml

@@ -67,7 +67,7 @@
         android:layout_marginLeft="28dp"
         android:layout_marginTop="53dp"
         android:layout_marginRight="28dp"
-        android:background="@drawable/shape_course_status_ing"
+        android:background="?attr/klx_main_bt_background"
         android:gravity="center"
         android:text="提交"
         android:textColor="@color/white"