修改学生端首页顺序 修改跳转选中

BaseLibrary/src/main/java/com/cooleshow/base/utils/JumpUtils.java

@@ -42,7 +42,7 @@ public class JumpUtils {
                     if (TextUtils.equals(routeBean.pageTag, RouteConstants.PAGE_TAG_BUY_PRACTICE) || TextUtils.equals(routeBean.pageTag, RouteConstants.PAGE_TAG_COURSE_REMIND)) {
                         //购买陪练课,跳转首页课表
                         ARouter.getInstance().build(RouterPath.APPCenter.PATH_HOME)
-                                .withInt(Constants.MAIN_PAGE_SELECT_POTION_KEY, 1)
+                                .withInt(Constants.MAIN_PAGE_SELECT_POTION_KEY, 2)
                                 .navigation();
                         return true;
                     }

chatModule/src/main/java/com/cooleshow/chatmodule/ui/ChatGroupSettingActivity.java

@@ -439,7 +439,7 @@ public class ChatGroupSettingActivity extends BaseMVPActivity<TcActivityChatGrou
     @Override
     public void dissolveChatGroupSuccess() {
         ToastUtil.getInstance().showShort("解散成功");
-        JumpUtils.jumpMain(2);
+        JumpUtils.jumpMain(3);
     }
 
     @Override
@@ -466,7 +466,7 @@ public class ChatGroupSettingActivity extends BaseMVPActivity<TcActivityChatGrou
         if (UserHelper.isTenantAccount()) {
             JumpUtils.jumpJGMainAndSelectChild(1, 0);
         } else {
-            JumpUtils.jumpMain(2);
+            JumpUtils.jumpMain(3);
         }
     }
 

rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/ChatGroupSettingActivity.java

@@ -292,7 +292,7 @@ public class ChatGroupSettingActivity extends BaseMVPActivity<ActivityChatGroupS
     @Override
     public void dissolveChatGroupSuccess(String targetId) {
         ToastUtil.getInstance().showShort("解散成功");
-        JumpUtils.jumpMain(2);
+        JumpUtils.jumpMain(3);
     }
 
     @Override

student/src/main/java/com/cooleshow/student/ui/main/MainActivity.java

@@ -133,7 +133,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
             if (TextUtils.equals(intentResult, PushIntentParseHelper.TT_PUSH_ACTION_TAG)) {
                 //融云推送相关
                 //选中聊天
-                setPositionItem(2);
+                setPositionItem(3);
                 return;
             }
             try {
@@ -164,12 +164,12 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
         CourseTableFragment courseTableFragment = new CourseTableFragment();
         mChatFragment = new ChatFragment();
         shopMallFragment = new MallFragment();
-        MusicHallFragment musicHallFragment =new MusicHallFragment();
+        MusicHallFragment musicHallFragment = new MusicHallFragment();
         mMineFragment = new MineFragment();
         mFragments.add(newHomeFragment);
+        mFragments.add(musicHallFragment);
         mFragments.add(courseTableFragment);
         mFragments.add(mChatFragment);
-        mFragments.add(musicHallFragment);
         mFragments.add(mMineFragment);
         homePageAdapter.setFragments(mFragments);
         getViewBinding().viewPager.setAdapter(homePageAdapter);
@@ -212,13 +212,13 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
             onTabClick(viewBinding.viewHome);
         }
         if (position == 1) {
-            onTabClick(viewBinding.viewCourse);
+            onTabClick(viewBinding.viewMall);
         }
         if (position == 2) {
-            onTabClick(viewBinding.viewChat);
+            onTabClick(viewBinding.viewCourse);
         }
         if (position == 3) {
-            onTabClick(viewBinding.viewMall);
+            onTabClick(viewBinding.viewChat);
         }
         if (position == 4) {
             onTabClick(viewBinding.viewMine);
@@ -410,7 +410,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
     private void bindPushId() {
         if (isNeedSetPushId && UserHelper.isLogin() && !TextUtils.isEmpty(UserHelper.getUserId())) {
             String userId = UserHelper.getUserId();
-            BaseApplication.registrationId=JPushInterface.getRegistrationID(getApplicationContext());
+            BaseApplication.registrationId = JPushInterface.getRegistrationID(getApplicationContext());
             LogUtils.i("pq", "registrationId:" + BaseApplication.registrationId);
             JPushInterface.setAlias(getApplicationContext(), 1, userId);
             CrashReport.setDeviceId(getApplicationContext(), userId);

student/src/main/java/com/cooleshow/student/ui/main/NewHomeFragmentV2.java

@@ -753,7 +753,7 @@ public class NewHomeFragmentV2 extends BaseMVPFragment<FgNewHomeV2LayoutBinding,
             return;
         }
         if (id == R.id.view_course_info_bg) {
-            JumpUtils.jumpMain(1);
+            JumpUtils.jumpMain(2);
             return;
         }
     }

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

@@ -53,7 +53,7 @@
             app:lottie_rawRes="@raw/shouye" />
 
         <com.cooleshow.base.widgets.TabAnimationView
-            android:id="@+id/tab_course"
+            android:id="@+id/tab_mall"
             android:layout_width="24dp"
             android:layout_height="24dp"
             app:layout_constraintLeft_toLeftOf="@+id/view_course"
@@ -61,10 +61,10 @@
             app:layout_constraintTop_toTopOf="@+id/tab_home"
             app:lottie_autoPlay="false"
             app:lottie_loop="false"
-            app:lottie_rawRes="@raw/kebiao" />
+            app:lottie_rawRes="@raw/shangcheng" />
 
         <com.cooleshow.base.widgets.TabAnimationView
-            android:id="@+id/tab_chat"
+            android:id="@+id/tab_course"
             android:layout_width="24dp"
             android:layout_height="24dp"
             app:layout_constraintLeft_toLeftOf="@+id/view_chat"
@@ -72,7 +72,7 @@
             app:layout_constraintTop_toTopOf="@+id/tab_home"
             app:lottie_autoPlay="false"
             app:lottie_loop="false"
-            app:lottie_rawRes="@raw/liaotian" />
+            app:lottie_rawRes="@raw/kebiao" />
 
         <com.cooleshow.base.widgets.UnreadCountTextView
             android:id="@+id/tv_msg_count"
@@ -92,7 +92,7 @@
             app:layout_constraintCircleRadius="12dp" />
 
         <com.cooleshow.base.widgets.TabAnimationView
-            android:id="@+id/tab_mall"
+            android:id="@+id/tab_chat"
             android:layout_width="24dp"
             android:layout_height="24dp"
             app:layout_constraintLeft_toLeftOf="@+id/view_mall"
@@ -100,7 +100,7 @@
             app:layout_constraintTop_toTopOf="@+id/tab_home"
             app:lottie_autoPlay="false"
             app:lottie_loop="false"
-            app:lottie_rawRes="@raw/shangcheng" />
+            app:lottie_rawRes="@raw/liaotian" />
 
         <com.cooleshow.base.widgets.TabAnimationView
             android:id="@+id/tab_mine"
@@ -130,45 +130,45 @@
             app:layout_constraintTop_toBottomOf="@+id/tab_home" />
 
         <TextView
-            android:id="@+id/tv_course"
+            android:id="@+id/tv_mall"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:includeFontPadding="false"
-            android:text="课表"
+            android:text="商城"
             android:textColor="@color/color_999999"
             android:textSize="@dimen/sp_10"
             app:layout_constraintBottom_toBottomOf="@+id/tv_home"
-            app:layout_constraintLeft_toLeftOf="@+id/tab_course"
-            app:layout_constraintRight_toRightOf="@+id/tab_course"
+            app:layout_constraintLeft_toLeftOf="@+id/tab_mall"
+            app:layout_constraintRight_toRightOf="@+id/tab_mall"
             app:layout_constraintTop_toTopOf="@+id/tv_home" />
 
         <TextView
-            android:id="@+id/tv_chat"
+            android:id="@+id/tv_course"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:includeFontPadding="false"
-            android:text="聊天"
+            android:text="课表"
             android:textColor="@color/color_999999"
             android:textSize="@dimen/sp_10"
             app:layout_constraintBottom_toBottomOf="@+id/tv_home"
-            app:layout_constraintLeft_toLeftOf="@+id/tab_chat"
-            app:layout_constraintRight_toRightOf="@+id/tab_chat"
+            app:layout_constraintLeft_toLeftOf="@+id/tab_course"
+            app:layout_constraintRight_toRightOf="@+id/tab_course"
             app:layout_constraintTop_toTopOf="@+id/tv_home" />
 
         <TextView
-            android:id="@+id/tv_mall"
+            android:id="@+id/tv_chat"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:includeFontPadding="false"
-            android:text="商城"
+            android:text="聊天"
             android:textColor="@color/color_999999"
             android:textSize="@dimen/sp_10"
             app:layout_constraintBottom_toBottomOf="@+id/tv_home"
-            app:layout_constraintLeft_toLeftOf="@+id/tab_mall"
-            app:layout_constraintRight_toRightOf="@+id/tab_mall"
+            app:layout_constraintLeft_toLeftOf="@+id/tab_chat"
+            app:layout_constraintRight_toRightOf="@+id/tab_chat"
             app:layout_constraintTop_toTopOf="@+id/tv_home" />
 
         <TextView
@@ -238,16 +238,16 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <FrameLayout
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/cs_bottom"
         android:layout_width="match_parent"
-        android:layout_height="0dp">
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/cs_bottom"
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.cooleshow.base.widgets.CustomDragView
-            android:layout_gravity="bottom|right"
             android:id="@+id/view_suspension"
             android:layout_width="100dp"
             android:layout_height="100dp"
+            android:layout_gravity="bottom|right"
             android:layout_marginEnd="12dp"
             android:layout_marginBottom="12dp"
             android:visibility="gone"