学生端机构版增加小组显示

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

@@ -77,6 +77,10 @@ public class MineFragment extends BaseMVPFragment<FgMineLayoutBinding, MinePrese
         if (data == null) {
             return;
         }
+        //机构小组
+        mViewBinding.tvGroupName.setText(data.getTenantGroupName());
+        mViewBinding.tvGroupName.setVisibility(!TextUtils.isEmpty(data.getTenantGroupName()) ? View.VISIBLE : View.GONE);
+
         GlideUtils.INSTANCE.loadImage(getContext(), data.heardUrl, mViewBinding.ivAvatar, com.cooleshow.base.R.drawable.icon_default_head);
 
         mViewBinding.tvNickName.setText(data.username);
@@ -86,23 +90,23 @@ public class MineFragment extends BaseMVPFragment<FgMineLayoutBinding, MinePrese
         mViewBinding.tvSubjectName.setText(data.subjectName);
 
         String vipTip = "暂未开通";
-        if(data.isVip == 1){
+        if (data.isVip == 1) {
             String s = DateUtil.date2Str(DateUtil.str2Date(data.membershipEndTime), "yyyy-MM-dd");
             vipTip = "至" + s;
-        }else{
+        } else {
             if (!TextUtils.isEmpty(data.membershipEndTime)) {
-               vipTip = "会员已过期";
+                vipTip = "会员已过期";
             }
         }
         mViewBinding.tvVipStatus.setText(vipTip);
 
         String tip = "暂未开通";
-        if(data.getTenantAlbumFlag() ==1){
+        if (data.getTenantAlbumFlag() == 1) {
             String s = DateUtil.date2Str(DateUtil.str2Date(data.getTenantAlbumEndTime()), "yyyy-MM-dd");
             tip = "至" + s;
-        }else{
+        } else {
             if (!TextUtils.isEmpty(data.getTenantAlbumEndTime())) {
-                tip ="训练工具已过期";
+                tip = "训练工具已过期";
             }
         }
         mViewBinding.tvToolsLimitTime.setText(tip);
@@ -179,7 +183,7 @@ public class MineFragment extends BaseMVPFragment<FgMineLayoutBinding, MinePrese
             JGWebStartHelper.startActivationCodePage();
             return;
         }
-        if(id == R.id.im_message){
+        if (id == R.id.im_message) {
             ARouter.getInstance().build(RouterPath.JGCenter.MESSAGE_BOX)
                     .navigation();
             return;

institution/src/main/java/com/cooleshow/institution/stu/ui/setting/PersonalSettingActivity.java

@@ -450,6 +450,10 @@ public class PersonalSettingActivity extends BaseMVPActivity<JgActivityPersonalS
             //否
             viewBinding.tvCertificationStatus.setText("未认证");
         }
+
+        //机构小组
+        viewBinding.tvGroupName.setText(data.getTenantGroupName());
+        viewBinding.clGroupName.setVisibility(!TextUtils.isEmpty(data.getTenantGroupName()) ? View.VISIBLE : View.GONE);
     }
 
 

institution/src/main/res/layout/fg_mine_layout.xml

@@ -111,6 +111,14 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/view_status_bar" />
 
+        <View
+            android:layout_marginBottom="3dp"
+            android:id="@+id/view_avatar_bottom_point"
+            app:layout_constraintRight_toRightOf="@+id/iv_avatar"
+            app:layout_constraintLeft_toLeftOf="@+id/iv_avatar"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
+            android:layout_width="1px"
+            android:layout_height="1px"/>
 
         <TextView
             android:id="@+id/tv_nickName"
@@ -123,27 +131,42 @@
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_20"
             android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@+id/fl_subject"
+            app:layout_constraintBottom_toTopOf="@+id/tv_group_name"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
-            app:layout_constraintRight_toLeftOf="@+id/iv_vip_tag"
+            app:layout_constraintRight_toLeftOf="@+id/fl_subject"
             app:layout_constraintTop_toTopOf="@+id/iv_avatar"
             app:layout_constraintVertical_chainStyle="packed"
             app:layout_constraintWidth_default="wrap"
-            tools:text="宋小泽" />
+            tools:text="宋小泽宋小泽宋小泽" />
+
+        <TextView
+            android:textSize="@dimen/sp_13"
+            android:textColor="@color/color_999999"
+            android:includeFontPadding="false"
+            android:layout_marginTop="6dp"
+            android:id="@+id/tv_group_name"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
+            app:layout_constraintTop_toBottomOf="@+id/tv_nickName"
+            app:layout_constraintLeft_toLeftOf="@+id/tv_nickName"
+            tools:text="武汉市梨花街道第二小学音乐小组"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
         <FrameLayout
+            app:layout_constraintRight_toRightOf="parent"
+            android:layout_marginStart="6dp"
             android:id="@+id/fl_subject"
+            android:layout_marginEnd="12dp"
             android:layout_width="wrap_content"
             android:layout_height="19dp"
-            android:layout_marginTop="6dp"
             android:paddingStart="7dp"
             android:paddingEnd="7dp"
             android:background="@drawable/shape_4dffffff_border_white_10dp"
-            app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
-            app:layout_constraintLeft_toLeftOf="@+id/tv_nickName"
-            app:layout_constraintTop_toBottomOf="@+id/tv_nickName">
+            app:layout_constraintBottom_toBottomOf="@+id/tv_nickName"
+            app:layout_constraintLeft_toRightOf="@+id/tv_nickName"
+            app:layout_constraintTop_toTopOf="@+id/tv_nickName">
 
             <ImageView
                 android:layout_width="wrap_content"
@@ -167,13 +190,11 @@
             android:id="@+id/iv_vip_tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="13dp"
             android:src="@drawable/jg_icon_vip_no_open"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_nickName"
-            app:layout_constraintLeft_toRightOf="@+id/tv_nickName"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tv_nickName" />
+            app:layout_constraintRight_toRightOf="@+id/view_avatar_bottom_point"
+            app:layout_constraintLeft_toLeftOf="@+id/view_avatar_bottom_point"
+            app:layout_constraintBottom_toBottomOf="@+id/view_avatar_bottom_point"
+            app:layout_constraintTop_toTopOf="@+id/view_avatar_bottom_point" />
 
 
         <androidx.constraintlayout.widget.ConstraintLayout

institution/src/main/res/layout/jg_activity_personal_setting.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/color_f6f8f9"
     android:orientation="vertical">
 
@@ -61,7 +62,7 @@
                     <ImageView
                         android:layout_width="@dimen/dp_6"
                         android:layout_height="@dimen/dp_11"
-                        android:layout_marginRight="15dp"
+                        android:layout_marginRight="12dp"
                         android:background="@drawable/icon_arrow_right"
                         app:layout_constraintBottom_toBottomOf="@+id/im_header"
                         app:layout_constraintRight_toRightOf="parent"
@@ -112,7 +113,7 @@
                     <ImageView
                         android:layout_width="@dimen/dp_6"
                         android:layout_height="@dimen/dp_11"
-                        android:layout_marginRight="15dp"
+                        android:layout_marginRight="12dp"
                         android:background="@drawable/icon_arrow_right"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
@@ -161,7 +162,7 @@
                     <ImageView
                         android:layout_width="@dimen/dp_6"
                         android:layout_height="@dimen/dp_11"
-                        android:layout_marginRight="15dp"
+                        android:layout_marginRight="12dp"
                         android:background="@drawable/icon_arrow_right"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
@@ -199,7 +200,7 @@
                         android:id="@+id/tv_score"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginRight="15dp"
+                        android:layout_marginRight="12dp"
                         android:text="--"
                         android:textColor="@color/color_aaaaaa"
                         android:textSize="@dimen/sp_16"
@@ -211,7 +212,7 @@
                         android:visibility="gone"
                         android:layout_width="@dimen/dp_6"
                         android:layout_height="@dimen/dp_11"
-                        android:layout_marginRight="15dp"
+                        android:layout_marginRight="12dp"
                         android:background="@drawable/icon_arrow_right"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
@@ -261,7 +262,7 @@
                     <ImageView
                         android:layout_width="@dimen/dp_6"
                         android:layout_height="@dimen/dp_11"
-                        android:layout_marginRight="15dp"
+                        android:layout_marginRight="12dp"
                         android:background="@drawable/icon_arrow_right"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
@@ -310,7 +311,7 @@
                     <ImageView
                         android:layout_width="@dimen/dp_6"
                         android:layout_height="@dimen/dp_11"
-                        android:layout_marginRight="15dp"
+                        android:layout_marginRight="12dp"
                         android:background="@drawable/icon_arrow_right"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
@@ -328,7 +329,7 @@
 
 
                 <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_modify_psd"
+                    android:id="@+id/cl_group_name"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_55"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -338,6 +339,57 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="12dp"
+                        android:text="小组"
+                        android:textColor="@color/color_1a1a1a"
+                        android:textSize="@dimen/sp_16"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/tv_group_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="12dp"
+                        android:text="--"
+                        android:textColor="@color/color_aaaaaa"
+                        android:textSize="@dimen/sp_16"
+                        tools:text="武汉市梨花街道第二小学音乐小组"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:visibility="gone"
+                        android:layout_width="@dimen/dp_6"
+                        android:layout_height="@dimen/dp_11"
+                        android:layout_marginRight="12dp"
+                        android:background="@drawable/icon_arrow_right"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginLeft="11dp"
+                        android:layout_marginRight="9dp"
+                        android:background="@color/color_f2f2f2"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintLeft_toLeftOf="parent" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/cl_modify_psd"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_55"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/cl_group_name">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="12dp"
                         android:text="修改密码"
                         android:textColor="@color/color_1a1a1a"
                         android:textSize="@dimen/sp_16"
@@ -348,7 +400,7 @@
                     <ImageView
                         android:layout_width="@dimen/dp_6"
                         android:layout_height="@dimen/dp_11"
-                        android:layout_marginRight="15dp"
+                        android:layout_marginRight="12dp"
                         android:background="@drawable/icon_arrow_right"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
@@ -400,7 +452,7 @@
                     <ImageView
                         android:layout_width="@dimen/dp_6"
                         android:layout_height="@dimen/dp_11"
-                        android:layout_marginRight="15dp"
+                        android:layout_marginRight="12dp"
                         android:background="@drawable/icon_arrow_right"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
@@ -441,7 +493,7 @@
                     <ImageView
                         android:layout_width="@dimen/dp_6"
                         android:layout_height="@dimen/dp_11"
-                        android:layout_marginRight="15dp"
+                        android:layout_marginRight="12dp"
                         android:background="@drawable/icon_arrow_right"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintRight_toRightOf="parent"

usercenter/src/main/java/com/cooleshow/usercenter/bean/StudentUserInfo.java

@@ -70,6 +70,25 @@ public class StudentUserInfo implements Serializable {
     private String tenantAlbumEndTime;
     private int tenantAlbumFlag;//学练工具是否有效 0否 1是
 
+    private String tenantGroupId;
+    private String tenantGroupName;
+
+    public String getTenantGroupId() {
+        return tenantGroupId;
+    }
+
+    public void setTenantGroupId(String tenantGroupId) {
+        this.tenantGroupId = tenantGroupId;
+    }
+
+    public String getTenantGroupName() {
+        return tenantGroupName;
+    }
+
+    public void setTenantGroupName(String tenantGroupName) {
+        this.tenantGroupName = tenantGroupName;
+    }
+
     public int getTenantAlbumFlag() {
         return tenantAlbumFlag;
     }