2 Commitit f64d9da1cd ... 48d9aa6ac3

Tekijä SHA1 Viesti Päivämäärä
  Pq 48d9aa6ac3 学生端1.8.0版本 4 kuukautta sitten
  Pq 11aee91b66 修改机构端我的页面专辑信息跳转H5页面参数逻辑 4 kuukautta sitten

+ 1 - 1
institution/src/main/java/com/cooleshow/institution/stu/constants/JGWebConstants.java

@@ -34,7 +34,7 @@ public class JGWebConstants {
     //排行榜
     public static final String RANK_BOARD = getBaseUrlH5() + "/#/ranking-list";
     public static final String ACTIVATION_CODE = getBaseUrlH5() + "/#/activation-code";
-    public static final String TRAIN_TOOLS = getBaseUrlH5() + "/#/train-tool?subjectType=%s";
+    public static final String TRAIN_TOOLS = getBaseUrlH5() + "/#/train-tool?albumId=%s";
     public static final String TRAIN_TOOLS2 = getBaseUrlH5() + "/#/train-tool?subjectType=%s&albumId=%s";
     public static final String TRAIN_LIST = getBaseUrlH5() + "/#/train-list?subjectType=%s&albumId=%s";
     public static final String ACCOMPANY_HELP = getBaseUrlH5() + "/#/lessonCourseware?albumId=%s";

+ 2 - 2
institution/src/main/java/com/cooleshow/institution/stu/constants/JGWebStartHelper.java

@@ -114,10 +114,10 @@ public class JGWebStartHelper {
                 .navigation();
     }
 
-    public static void startTrainTools(String subjectType){
+    public static void startTrainTools(String albumId){
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
-                .withString(WebConstants.WEB_URL, String.format(JGWebConstants.TRAIN_TOOLS,subjectType))
+                .withString(WebConstants.WEB_URL, String.format(JGWebConstants.TRAIN_TOOLS,albumId))
                 .navigation();
     }
 

+ 3 - 1
institution/src/main/java/com/cooleshow/institution/stu/ui/main/MineFragment.java

@@ -54,6 +54,7 @@ public class MineFragment extends BaseMVPFragment<FgMineLayoutBinding, MinePrese
             checkIndicator(position);
         }
     };
+    private String albumId;
 
     @Override
     protected void initView(View rootView) {
@@ -242,7 +243,7 @@ public class MineFragment extends BaseMVPFragment<FgMineLayoutBinding, MinePrese
             return;
         }
         if (id == R.id.view_student_num || id == R.id.iv_train_tools_bg) {
-            JGWebStartHelper.startTrainTools("");
+            JGWebStartHelper.startTrainTools(albumId);
             return;
         }
 
@@ -280,6 +281,7 @@ public class MineFragment extends BaseMVPFragment<FgMineLayoutBinding, MinePrese
             return;
         }
         if (mViewBinding != null && mViewBinding.tvTrainToolsTitle != null) {
+            this.albumId = data.getTenantAlbumId();
             data.handleTipLogic();
             mViewBinding.tvGoOpen.setText(data.getOpenText());
             mViewBinding.tvTrainToolsTitle.setText(data.getShowTitle());

+ 2 - 2
student/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "com.cooleshow.student"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 179
-        versionName "1.7.9"
+        versionCode 180
+        versionName "1.8.0"
 
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a"

+ 9 - 0
usercenter/src/main/java/com/cooleshow/usercenter/bean/JGAlbumInfoBean.java

@@ -13,12 +13,21 @@ import java.util.Locale;
 public class JGAlbumInfoBean {
     private String tenantAlbumName;
     private String endTime;
+    private String tenantAlbumId;
 
     private String showTitle;
     private String showTip;
     private String showTime;
     private boolean isOpen;
 
+    public String getTenantAlbumId() {
+        return tenantAlbumId;
+    }
+
+    public void setTenantAlbumId(String tenantAlbumId) {
+        this.tenantAlbumId = tenantAlbumId;
+    }
+
     public boolean isOpen() {
         return isOpen;
     }