修改部分问题

institution/src/main/java/com/cooleshow/institution/stu/adapter/SwitchAlbumAdapter.java

@@ -53,7 +53,7 @@ public class SwitchAlbumAdapter extends BaseQuickAdapter<AlbumListBean, BaseView
 
         View cs_root = holder.getView(R.id.cs_root);
         View iv_select = holder.getView(R.id.iv_select);
-        boolean isSelect = TextUtils.equals(albumListBean.getId(), selectId);
+        boolean isSelect = TextUtils.equals(albumListBean.getTenantGroupAlbumId(), selectId);
         if (isSelect) {
             iv_select.setVisibility(View.VISIBLE);
             cs_root.setBackgroundResource(R.drawable.shape_15ffffff_10dp_border_80ffffff_1dp);

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

@@ -142,10 +142,10 @@ public class JGWebStartHelper {
                 .navigation();
     }
 
-    public static void startAccompanyHelp(String albumId) {
+    public static void startAccompanyHelp(String albumId,String taId) {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
-                .withString(WebConstants.WEB_URL, String.format(JGWebConstants.ACCOMPANY_HELP,albumId))
+                .withString(WebConstants.WEB_URL, String.format(JGWebConstants.ACCOMPANY_HELP,albumId,taId))
                 .navigation();
 
     }

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

@@ -71,7 +71,7 @@ public class CardAnimFragment extends BaseFragment<FgCardAnimLayoutBinding> {
                 }
                 if (!TextUtils.isEmpty(pageTypeValue)) {
                     if (TextUtils.equals(pageTypeValue, HomePageType.ACCOMPANY_HELP.getType())) {
-                        JGWebStartHelper.startAccompanyHelp(albumId);
+                        JGWebStartHelper.startAccompanyHelp(albumId,tenantGroupAlbumId);
                         return;
                     }
                     JGWebStartHelper.startTrainList(pageTypeValue, albumId,tenantGroupAlbumId);

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

@@ -77,6 +77,8 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
     private ArrayList<AlbumListBean> allAlbumDatas;
     private ExpandAndCollapseAnimPopupWindow mPopupWindow;
 
+    private AlbumDetailBean currentData;
+
     @Override
     protected void initView(View rootView) {
         Utils.setHeadView(mViewBinding.viewStatusBar, requireContext(), 0);
@@ -215,12 +217,16 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
         mViewBinding.tvName.setText(data.getTenantName());
     }
 
-    private int currentStatus = Constants.HOME_PAGE_STATUS_EMPTY;
+    private int currentStatus = -1;
     private ArrayList<HomePageType> currentPageTypeList;
 
     private void load(AlbumDetailBean data) {
         int tenantAlbumStatus = data.isStatus() ? Constants.HOME_PAGE_STATUS_HASLOCK : Constants.HOME_PAGE_STATUS_UNLOCK;
         ArrayList<HomePageType> pageList = new ArrayList<>();
+        if (data.getCoursewareCounts() > 0) {
+            //云教程
+            pageList.add(HomePageType.ACCOMPANY_HELP);
+        }
         if (data.getSubjectCounts() > 0) {
             //声部训练
             pageList.add(HomePageType.SUBJECT_PRACTICE);
@@ -233,11 +239,7 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
             //合奏训练
             pageList.add(HomePageType.ALL_PRACTICE);
         }
-        if (data.getSubjectCounts() > 0) {
-            //云教程
-            pageList.add(HomePageType.ACCOMPANY_HELP);
-        }
-        if (!isNeedRefresh(tenantAlbumStatus, pageList)) {
+        if (!isNeedRefresh(data.getId(), data.getTenantGroupAlbumId(), tenantAlbumStatus, pageList)) {
             return;
         }
         this.currentPageTypeList = pageList;
@@ -252,13 +254,20 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
             CardAnimFragment cardAnimFragment = CardAnimFragment.newInstance(page.getValue(), page.getType(), defaultAlbumId, tenantGroupAlbumId, tenantAlbumStatus);
             list.add(cardAnimFragment);
         }
+        this.currentData = data;
         this.currentStatus = tenantAlbumStatus;
         mCardPageAdapter.setFragments(list);
         mViewBinding.viewPager.setAdapter(mCardPageAdapter);
 //        mCardPageAdapter.notifyDataSetChanged();
     }
 
-    private boolean isNeedRefresh(int status, ArrayList<HomePageType> pageList) {
+    private boolean isNeedRefresh(String defaultAlbumId, String tenantGroupAlbumId, int status, ArrayList<HomePageType> pageList) {
+        if (currentData != null && !TextUtils.equals(tenantGroupAlbumId, currentData.getTenantGroupAlbumId())) {
+            return true;
+        }
+        if (currentData != null && !TextUtils.equals(defaultAlbumId, currentData.getId())) {
+            return true;
+        }
         if (mCardPageAdapter.getItemCount() != pageList.size() || currentStatus != status) {
             return true;
         }
@@ -326,6 +335,10 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
         this.tenantGroupAlbumId = defaultSelectAlbum.getTenantGroupAlbumId();
         UserHelper.setCustomCache(UserHelper.DEFAULT_ALBUM_ID, tenantGroupAlbumId);
         mViewBinding.tvSwitchAlbum.setText(defaultSelectAlbum.getName());
+        getAlbumDetail(defaultSelectAlbum.getTenantGroupAlbumId());
+    }
+
+    private void getAlbumDetail(String tenantGroupAlbumId) {
         presenter.getAlbumDetail(tenantGroupAlbumId);
     }
 

student/src/main/AndroidManifest.xml

@@ -234,6 +234,7 @@
         <activity
             android:name=".ui.web.HtmlActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="locked"
             android:windowSoftInputMode="adjustPan"/>
         <activity
             android:name=".ui.web.HtmlHorizontalScreenActivity"

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

@@ -244,9 +244,10 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
         }
 
         int orientation = intent.getIntExtra("orientation", -1);
-        if (orientation >= 0) {
+        if (orientation != -1) {
             setRequestedOrientation(orientation);
-
+        } else {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         }
         int c_orientation = intent.getIntExtra("c_orientation", ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         isNeedResetScreenOrientation = c_orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;

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

@@ -229,7 +229,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
         setStatusBarTextColor(intent.getBooleanExtra("statusBarTextColor", false));
         if (isHideTitle) {
             headerBbarView.setVisibility(View.GONE);
-            viewStatusbar.setVisibility(View.VISIBLE);
+            viewStatusbar.setVisibility(View.GONE);
         }
         if (!TextUtils.isEmpty(titleStr)) {
             tvTitle.setText(titleStr);
@@ -1081,7 +1081,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
             } catch (Exception e) {
 
             }
-            headerBbarView.setVisibility(View.VISIBLE);
+            headerBbarView.setVisibility(View.GONE);
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
         }
     }

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

@@ -242,9 +242,10 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
         }
 
         int orientation = intent.getIntExtra("orientation", -1);
-        if (orientation >= 0) {
+        if (orientation != -1) {
             setRequestedOrientation(orientation);
-
+        } else {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         }
 
         int c_orientation = intent.getIntExtra("c_orientation", ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);