修改部分问题

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

@@ -236,6 +236,20 @@ public class DateUtil {
         return new SimpleDateFormat("yyyy年MM月dd日 HH:mm").format(date);
     }
 
+    public static String dateFormatDefault(String dateStr) {
+        if (TextUtils.isEmpty(dateStr)) {
+            return "";
+        }
+        DateFormat sdf = new SimpleDateFormat(FORMAT);
+        Date date = null;
+        try {
+            date = sdf.parse(dateStr);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return new SimpleDateFormat(FORMAT).format(date);
+    }
+
     public static String dateFormatMMdd(String dateStr) {
         if (TextUtils.isEmpty(dateStr)) {
             return "";

chatModule/src/main/java/com/cooleshow/chatmodule/adapter/NoticeListAdapter.java

@@ -45,8 +45,7 @@ public class NoticeListAdapter extends BaseQuickAdapter<GroupNoticeBean.RowsBean
         TextView tvRead = helper.getView(R.id.tv_read);
         GlideUtils.INSTANCE.loadImage(getContext(), bean.avatar, ivPortrait, R.drawable.tc_icon_teacher_default_head);
         tvName.setText(bean.username);
-
-        tvTime.setText(DateUtil.dateFormatNoSecond(TextUtils.isEmpty(bean.updateTime) ? bean.createTime : bean.updateTime));
+        tvTime.setText(DateUtil.dateFormatDefault(TextUtils.isEmpty(bean.updateTime) ? bean.createTime : bean.updateTime));
         if (bean.topFlag) {
             tvRoof.setVisibility(View.VISIBLE);
         } else {

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

@@ -1,5 +1,6 @@
 package com.cooleshow.chatmodule.ui;
 
+import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -22,6 +23,7 @@ import com.cooleshow.chatmodule.contract.GroupMemberContract;
 import com.cooleshow.chatmodule.databinding.TcActivityGroupMemberBinding;
 import com.cooleshow.chatmodule.presenter.GroupMemberPresenter;
 import com.cooleshow.chatmodule.utils.helper.ChatHelper;
+import com.cooleshow.chatmodule.utils.helper.IMThemManager;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.mcxtzhang.indexlib.IndexBar.widget.IndexBar;
 import com.mcxtzhang.indexlib.suspension.SuspensionDecoration;
@@ -72,7 +74,7 @@ public class GroupMemberActivity extends BaseMVPActivity<TcActivityGroupMemberBi
         recyclerview = viewBinding.expendList;
         livLetters = viewBinding.livLetters;
         tvHint = viewBinding.tvHint;
-
+        IMThemManager.getInstance().setTextDrawableStyle(viewBinding.tvHint);
 
         recyclerview.setLayoutManager(mManager = new LinearLayoutManager(this));
         RecyclerView.RecycledViewPool viewPool = new RecyclerView.RecycledViewPool();
@@ -85,7 +87,7 @@ public class GroupMemberActivity extends BaseMVPActivity<TcActivityGroupMemberBi
         adapter.setEmptyView(emptyViewLayout);
         recyclerview.setAdapter(adapter);
         mDecoration = new SuspensionDecoration(this, mDatas);
-        mDecoration.setColorTitleBg(getResources().getColor(com.cooleshow.base.R.color.color_f6f8f9));
+        mDecoration.setColorTitleBg(Color.TRANSPARENT);
         mDecoration.setmTitleHeight(DensityUtil.dp2px(this, 30));
         recyclerview.addItemDecoration(mDecoration);
         livLetters.setmPressedShowTextView(tvHint)//设置HintTextView

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

@@ -343,6 +343,36 @@
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guide_line1"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.125"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guide_line2"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.375"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guide_line3"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.625"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guide_line4"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.875"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
             <TextView
                 android:id="@+id/tv_mine_track_list"
                 android:layout_width="wrap_content"
@@ -356,8 +386,8 @@
                 android:textSize="@dimen/sp_12"
                 app:layout_constraintHorizontal_chainStyle="spread"
                 app:layout_constraintHorizontal_weight="1"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@+id/tv_practice_info"
+                app:layout_constraintRight_toRightOf="@+id/guide_line1"
+                app:layout_constraintLeft_toLeftOf="@+id/guide_line1"
                 app:layout_constraintTop_toBottomOf="@+id/tv_common_function" />
 
             <TextView
@@ -370,10 +400,10 @@
                 android:text="练习统计"
                 android:textColor="@color/color_333333"
                 android:textSize="@dimen/sp_12"
+                app:layout_constraintRight_toRightOf="@+id/guide_line2"
+                app:layout_constraintLeft_toLeftOf="@+id/guide_line2"
                 app:layout_constraintHorizontal_chainStyle="spread_inside"
                 app:layout_constraintHorizontal_weight="1"
-                app:layout_constraintLeft_toRightOf="@+id/tv_mine_track_list"
-                app:layout_constraintRight_toLeftOf="@+id/tv_order_info"
                 app:layout_constraintTop_toTopOf="@+id/tv_mine_track_list" />
 
             <TextView
@@ -387,8 +417,8 @@
                 android:textColor="@color/color_333333"
                 android:textSize="@dimen/sp_12"
                 app:layout_constraintHorizontal_weight="1"
-                app:layout_constraintLeft_toRightOf="@+id/tv_practice_info"
-                app:layout_constraintRight_toLeftOf="@+id/tv_rank_board"
+                app:layout_constraintRight_toRightOf="@+id/guide_line3"
+                app:layout_constraintLeft_toLeftOf="@+id/guide_line3"
                 app:layout_constraintTop_toTopOf="@+id/tv_mine_track_list" />
 
 
@@ -419,8 +449,8 @@
                 android:textColor="@color/color_333333"
                 android:textSize="@dimen/sp_12"
                 app:layout_constraintHorizontal_weight="1"
-                app:layout_constraintLeft_toRightOf="@+id/tv_rank_board"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintRight_toRightOf="@+id/guide_line4"
+                app:layout_constraintLeft_toLeftOf="@+id/guide_line4"
                 app:layout_constraintTop_toTopOf="@+id/tv_mine_track_list" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -42,7 +42,7 @@
                         android:layout_width="@dimen/dp_54"
                         android:layout_height="@dimen/dp_54"
                         android:layout_marginLeft="12dp"
-                        android:layout_marginTop="8dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
                         android:src="@drawable/icon_default_head"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />

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

@@ -1,5 +1,6 @@
 package com.common.im.ui.activity;
 
+import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -81,7 +82,7 @@ public class GroupMemberActivity extends BaseMVPActivity<ActivityGroupMemberBind
         adapter = new GroupMemberAdapter(mDatas);
         recyclerview.setAdapter(adapter);
         mDecoration = new SuspensionDecoration(this, mDatas);
-        mDecoration.setColorTitleBg(getResources().getColor(com.cooleshow.base.R.color.color_f6f8f9));
+        mDecoration.setColorTitleBg(Color.TRANSPARENT);
         mDecoration.setmTitleHeight(DensityUtil.dp2px(this, 30));
         recyclerview.addItemDecoration(mDecoration);
         livLetters.setmPressedShowTextView(tvHint)//设置HintTextView

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

@@ -17,6 +17,7 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.common.im.ui.MessageFragment;
 import com.cooleshow.base.bean.RouteBean;
 import com.cooleshow.base.common.BaseApplication;
@@ -418,6 +419,11 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
         if (isFinishing() || isDestroyed()) {
             return;
         }
+        if (UserHelper.isTenantAccount(userInfo.tenantId)) {
+            ARouter.getInstance().build(RouterPath.JGCenter.PATH_HOME)
+                    .navigation();
+            return;
+        }
         //存储userInfo信息
         UserHelper.saveUserInfo(userInfo);
         connectIM();