修改UI走查问题

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

@@ -1,11 +1,13 @@
 package com.cooleshow.chatmodule.adapter;
 
+import android.view.View;
 import android.widget.ImageView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.chatmodule.R;
+import com.cooleshow.chatmodule.utils.helper.IMThemManager;
 import com.luck.picture.lib.entity.LocalMedia;
 
 import java.util.List;
@@ -20,15 +22,20 @@ public class AddPhotoListAdapter extends BaseQuickAdapter<LocalMedia, BaseViewHo
 
     public AddPhotoListAdapter(List<LocalMedia> data) {
         super(R.layout.tc_photo_list_item, data);
+        addChildClickViewIds(R.id.iv_del);
     }
 
     @Override
     protected void convert(BaseViewHolder helper, LocalMedia item) {
         ImageView ivIcon = helper.getView(R.id.iv_icon);
-        if (item.getPath().equals("123")){
-            ivIcon.setImageResource(R.drawable.tc_ic_update_photo);
-        }else{
-            GlideUtils.INSTANCE.loadImage(getContext(), item.getPath(), ivIcon);
+        ImageView iv_del = helper.getView(R.id.iv_del);
+        if (item.getPath().equals("123")) {
+            iv_del.setVisibility(View.GONE);
+            int addPicDefaultImgRes = IMThemManager.getInstance().getAddPicDefaultImgRes();
+            ivIcon.setImageResource(addPicDefaultImgRes != -1 ? addPicDefaultImgRes : R.drawable.tc_ic_update_photo);
+        } else {
+            iv_del.setVisibility(View.VISIBLE);
+            GlideUtils.INSTANCE.loadImageCenterCrop(getContext(), item.getPath(), ivIcon);
         }
 
     }

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

@@ -63,9 +63,9 @@ public class GroupMemberAdapter extends BaseQuickAdapter<GroupMemberBean, BaseVi
 
         if (null != bean) {
             if (TextUtils.equals(bean.getRoleType(), "STUDENT")) {
-                GlideImageLoaderUtils.getInstance().loadCircleImage(getContext(), bean.getAvatar(), R.drawable.tc_icon_teacher_default_head, ivIcon);
+                GlideImageLoaderUtils.getInstance().loadImage(getContext(), bean.getAvatar(), ivIcon,R.drawable.tc_icon_teacher_default_head);
             } else {
-                GlideImageLoaderUtils.getInstance().loadCircleImage(getContext(), bean.getAvatar(), R.drawable.tc_icon_teacher_default_head, ivIcon);
+                GlideImageLoaderUtils.getInstance().loadImage(getContext(), bean.getAvatar(), ivIcon,R.drawable.tc_icon_teacher_default_head);
             }
             tvTitle.setText(bean.getNickname());
             if (TextUtils.equals(currentId, bean.getUserId())) {

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

@@ -13,6 +13,7 @@ import android.widget.EditText;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.listener.OnItemChildClickListener;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.constanst.UploadConstants;
@@ -22,6 +23,7 @@ import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.helper.GlideEngine;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
+import com.cooleshow.chatmodule.R;
 import com.cooleshow.chatmodule.adapter.AddPhotoListAdapter;
 import com.cooleshow.chatmodule.constants.TCChatRouterPath;
 import com.cooleshow.chatmodule.contract.ImAppealContract;
@@ -77,6 +79,8 @@ public class ImAppealActivity extends BaseMVPActivity<TcActivityImAppealBinding,
         initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "投诉");
         IMThemManager.getInstance().setMainButtonStyles(viewBinding.btnCommit);
         IMThemManager.getInstance().setEditStyle(viewBinding.etContent);
+        IMThemManager.getInstance().setComplainImgDrawableStyle1(viewBinding.ivReasonTitle);
+        IMThemManager.getInstance().setComplainImgDrawableStyle2(viewBinding.ivScreenShotTitle);
 
         Intent intent = getIntent();
         targetId = intent.getStringExtra("targetId");
@@ -105,6 +109,20 @@ public class ImAppealActivity extends BaseMVPActivity<TcActivityImAppealBinding,
                 }
             }
         });
+
+        addPhotoListAdapter.setOnItemChildClickListener(new OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
+                if(position<addPhotoListAdapter.getData().size()){
+                    if(view.getId() == R.id.iv_del){
+                        addPhotoListAdapter.removeAt(position);
+                        addNewEmpty();
+                        return;
+                    }
+                }
+            }
+        });
+
         btn_commit.setOnClickListener(view -> {
             if (null == selectList || selectList.size() <= 0) {
                 ToastUtil.getInstance().showShort("请选择聊天截图");

chatModule/src/main/java/com/cooleshow/chatmodule/utils/helper/IMThemManager.java

@@ -46,6 +46,9 @@ public class IMThemManager {
     private int checkBtDrawableRes = -1;
     private int mainButtonBackgroundRes = -1;
     private int chatTopViewBackgroundRes = -1;
+    private int complainTitleImgTagRes = -1;
+    private int complainTitleImgTagRes2 = -1;
+    private int addPicDefaultImgRes = -1;
 
 
     private IMThemManager() {
@@ -56,7 +59,6 @@ public class IMThemManager {
     }
 
 
-
     private static final class IMThemManagerHolder {
         private static IMThemManager mManager = new IMThemManager();
     }
@@ -141,8 +143,24 @@ public class IMThemManager {
         }
     }
 
+    public void setComplainTitleImgTagRes(int complainTitleImgTagRes) {
+        this.complainTitleImgTagRes = complainTitleImgTagRes;
+    }
+
+    public void setComplainTitleImgTagRes2(int complainTitleImgTagRes2) {
+        this.complainTitleImgTagRes2 = complainTitleImgTagRes2;
+    }
+
+    public int getAddPicDefaultImgRes() {
+        return addPicDefaultImgRes;
+    }
+
+    public void setAddPicDefaultImgRes(int addPicDefaultImgRes) {
+        this.addPicDefaultImgRes = addPicDefaultImgRes;
+    }
+
     public void setEditStyle(EditText... editTexts) {
-        if(editTexts == null){
+        if (editTexts == null) {
             return;
         }
         for (int i = 0; i < editTexts.length; i++) {
@@ -166,16 +184,29 @@ public class IMThemManager {
 
     public void setTextDrawableStyle(TextView textView) {
         Drawable backgroundDrawable = null;
-            backgroundDrawable = textView.getBackground();
-            if (backgroundDrawable != null) {
-                if (mainStyleColor2 != -1) {
-                    backgroundDrawable.setTint(mainStyleColor2);
-                } else {
-                    backgroundDrawable.setTintList(null);
-                }
+        backgroundDrawable = textView.getBackground();
+        if (backgroundDrawable != null) {
+            if (mainStyleColor2 != -1) {
+                backgroundDrawable.setTint(mainStyleColor2);
+            } else {
+                backgroundDrawable.setTintList(null);
             }
+        }
+    }
+
+    public void setComplainImgDrawableStyle1(ImageView imageView) {
+        if (complainTitleImgTagRes != -1) {
+            imageView.setImageResource(complainTitleImgTagRes);
+        }
     }
 
+    public void setComplainImgDrawableStyle2(ImageView imageView) {
+        if (complainTitleImgTagRes2 != -1) {
+            imageView.setImageResource(complainTitleImgTagRes2);
+        }
+    }
+
+
     public void setEmptyDrawable(Drawable emptyDrawable) {
         MessageProperties instance = MessageProperties.getInstance();
         instance.setConversationListEmptyDrawable(emptyDrawable);
@@ -221,13 +252,16 @@ public class IMThemManager {
     public void resetStyleValue() {
         this.tabIndicatorDrawable = null;
         setMainStyleColor(-1);
-        this.mainStyleColor2 =-1;
+        this.mainStyleColor2 = -1;
         setSearchIconRes(-1);
         setSearchTextColor(-1);
         this.searchBtBackgroundRes = -1;
         this.checkBtDrawableRes = -1;
         this.mainButtonBackgroundRes = -1;
         this.chatTopViewBackgroundRes = -1;
+        this.complainTitleImgTagRes = -1;
+        this.complainTitleImgTagRes2 = -1;
+        this.addPicDefaultImgRes = -1;
         setEmptyDrawable(null);
     }
 }

chatModule/src/main/res/layout/tc_activity_im_appeal.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -17,66 +18,115 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/tv_task_title"
-                android:layout_width="wrap_content"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_13"
-                android:layout_marginTop="@dimen/dp_13"
-                android:text="请输入投诉的理由"
-                android:textColor="@color/black_444"
-                android:textSize="@dimen/sp_16"
-                android:textStyle="bold" />
+                android:layout_marginStart="13dp"
+                android:layout_marginTop="13dp"
+                android:layout_marginEnd="13dp"
+                android:background="@drawable/bg_white_10dp">
 
+                <ImageView
+                    android:id="@+id/iv_reason_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_13"
+                    android:src="@drawable/tc_icon_tousu_title"
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_task_title"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/tv_task_title" />
 
-            <EditText
-                android:id="@+id/et_content"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_175"
-                android:layout_marginStart="@dimen/dp_13"
-                android:layout_marginTop="@dimen/dp_12"
-                android:layout_marginEnd="@dimen/dp_13"
-                android:theme="@style/MyEditText"
-                android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
-                android:background="@drawable/bg_gray_line_shape_5dp"
-                android:gravity="left|top"
-                android:hint="请输入投诉理由，200字以内"
-                android:maxLength="200"
-                android:paddingStart="@dimen/dp_9"
-                android:paddingTop="@dimen/dp_10"
-                android:paddingEnd="@dimen/dp_9"
-                android:paddingBottom="@dimen/dp_10"
-                android:textColor="@color/gray_777"
-                android:textSize="@dimen/dp_14" />
-
-
-            <TextView
-                android:layout_marginStart="@dimen/dp_13"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_13"
-                android:text="请上传聊天截图 "
-                android:textColor="@color/black_444"
-                android:textSize="@dimen/sp_16"
-                android:textStyle="bold" />
-
-            <LinearLayout
-                android:paddingBottom="12dp"
+
+                <TextView
+                    android:id="@+id/tv_task_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_6"
+                    android:layout_marginTop="@dimen/dp_16"
+                    android:gravity="center"
+                    android:includeFontPadding="false"
+                    android:text="请输入投诉的理由"
+                    android:textColor="@color/color_333333"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold"
+                    app:layout_constraintLeft_toRightOf="@+id/iv_reason_title"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <EditText
+                    android:id="@+id/et_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_175"
+                    android:background="@color/transparent"
+                    android:gravity="left|top"
+                    android:hint="请输入投诉理由，200字以内"
+                    android:maxLength="200"
+                    android:paddingStart="@dimen/dp_13"
+                    android:paddingTop="@dimen/dp_10"
+                    android:paddingEnd="@dimen/dp_13"
+                    android:paddingBottom="@dimen/dp_10"
+                    android:textColor="@color/color_333333"
+                    android:textColorHint="@color/color_aaaaaa"
+                    android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
+                    android:textSize="@dimen/dp_14"
+                    android:theme="@style/MyEditText"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_task_title" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="13dp"
                 android:layout_marginTop="12dp"
                 android:layout_marginEnd="13dp"
-                android:orientation="vertical">
+                android:background="@drawable/shape_10dp_white">
+
+                <ImageView
+                    android:id="@+id/iv_screen_shot_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_13"
+                    android:src="@drawable/tc_icon_img_title"
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_img_title"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/tv_img_title" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/recyclerView"
+                <TextView
+                    android:id="@+id/tv_img_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="6dp"
+                    android:layout_marginTop="@dimen/dp_16"
+                    android:gravity="center"
+                    android:includeFontPadding="false"
+                    android:text="请上传聊天截图 "
+                    android:textColor="@color/color_333333"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold"
+                    app:layout_constraintLeft_toRightOf="@+id/iv_screen_shot_title"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never"
-                    android:scrollbars="none" />
+                    android:layout_marginStart="13dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="13dp"
+                    android:orientation="vertical"
+                    android:paddingBottom="12dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_img_title">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/recyclerView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:overScrollMode="never"
+                        android:scrollbars="none" />
+
+                </LinearLayout>
 
-            </LinearLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <Button
                 android:id="@+id/btn_commit"

chatModule/src/main/res/layout/tc_photo_list_item.xml

@@ -1,15 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:paddingTop="12dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/iv_icon"
-        android:layout_width="92dp"
-        android:layout_height="85dp"
+        android:layout_width="90dp"
+        android:layout_height="90dp"
         android:layout_gravity="center"
         android:orientation="vertical"
-        android:src="@drawable/tc_ic_update_photo" />
-</FrameLayout>
+        android:src="@drawable/tc_ic_update_photo"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/iv_del"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="4dp"
+        android:src="@drawable/tc_icon_del_img"
+        android:visibility="gone"
+        app:layout_constraintRight_toRightOf="@+id/iv_icon"
+        app:layout_constraintTop_toTopOf="@+id/iv_icon" />
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -110,6 +110,9 @@ public class MainActivity extends BaseMVPActivity<ActivityInstitutionMainLayoutB
         IMThemManager.getInstance().setCheckBtDrawableRes(R.drawable.jg_switch_selector);
         IMThemManager.getInstance().setMainButtonBackgroundRes(R.drawable.shape_fe2451_39dp);
         IMThemManager.getInstance().setChatTopViewBackgroundRes(R.drawable.jg_bg_chat_top);
+        IMThemManager.getInstance().setComplainTitleImgTagRes(R.drawable.jg_tc_icon_tousu_title);
+        IMThemManager.getInstance().setComplainTitleImgTagRes2(R.drawable.jg_tc_icon_img_title);
+        IMThemManager.getInstance().setAddPicDefaultImgRes(R.drawable.jg_tc_ic_update_photo);
     }
 
     public void onTabClick(View view) {

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

@@ -135,7 +135,7 @@ public class PersonalSettingActivity extends BaseMVPActivity<JgActivityPersonalS
             return;
         }
 
-        if(id == R.id.cs_sign_out_accout){
+        if (id == R.id.cs_sign_out_accout) {
             ARouter.getInstance().build(RouterPath.UserCenter.SIGN_OUT_ACCOUNT)
                     .navigation();
             return;
@@ -205,11 +205,23 @@ public class PersonalSettingActivity extends BaseMVPActivity<JgActivityPersonalS
         return format.format(date);
     }
 
+    private String getCurrentGender() {
+        String gender = "";
+        if (mySetDetailBean != null) {
+            gender = mySetDetailBean.gender;
+        }
+        return gender;
+    }
+
     private void modifySex() {
         PopupUtil.showInBottom(this, R.layout.jg_pop_modify_sex, (view, popupWindow) -> {
             TextView tv_boy = view.findViewById(R.id.tv_boy);
             TextView tv_girl = view.findViewById(R.id.tv_girl);
             TextView tv_cancel = view.findViewById(R.id.tv_cancel);
+
+            String currentGender = getCurrentGender();
+            tv_boy.setTextColor(getResources().getColor(TextUtils.equals(currentGender, "1") ? R.color.color_fe2451 : com.cooleshow.base.R.color.color_333333));
+            tv_girl.setTextColor(getResources().getColor(TextUtils.equals(currentGender, "0") ? R.color.color_fe2451 : com.cooleshow.base.R.color.color_333333));
             tv_boy.setOnClickListener(view13 -> {
 
                 JSONObject jsonObject = new JSONObject();
@@ -297,7 +309,7 @@ public class PersonalSettingActivity extends BaseMVPActivity<JgActivityPersonalS
             Uri imageUri;
             if (Build.VERSION.SDK_INT >= 24) {
                 imageUri = FileProvider.getUriForFile(this,
-                        "com.cooleshow.student.fileprovider", outputImage);
+                        getPackageName() + ".fileprovider", outputImage);
             } else {
                 imageUri = Uri.fromFile(outputImage);
             }

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

@@ -206,11 +206,12 @@
 
 
             <ImageView
+                app:layout_constraintVertical_chainStyle="packed"
+                app:layout_constraintBottom_toTopOf="@+id/tv_vip_status"
                 android:id="@+id/iv_vip_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
-                android:layout_marginTop="19dp"
                 android:src="@drawable/jg_vip_title"
                 app:layout_constraintLeft_toLeftOf="@+id/view_class_num"
                 app:layout_constraintTop_toTopOf="@+id/view_class_num" />
@@ -235,6 +236,7 @@
                 app:layout_constraintTop_toTopOf="@+id/view_arrow_bg" />
 
             <TextView
+                android:layout_marginTop="9dp"
                 android:id="@+id/tv_vip_status"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -249,11 +251,12 @@
 
 
             <ImageView
+                app:layout_constraintVertical_chainStyle="packed"
+                app:layout_constraintBottom_toTopOf="@+id/tv_tools_limit_time"
                 android:id="@+id/iv_train_tools_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
-                android:layout_marginTop="19dp"
                 android:src="@drawable/jg_train_tools_title"
                 app:layout_constraintLeft_toLeftOf="@+id/view_student_num"
                 app:layout_constraintTop_toTopOf="@+id/view_student_num" />
@@ -279,6 +282,7 @@
 
 
             <TextView
+                android:layout_marginTop="9dp"
                 android:id="@+id/tv_tools_limit_time"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"

usercenter/src/main/java/com/cooleshow/usercenter/constants/UserConstants.java

@@ -9,7 +9,7 @@ public class UserConstants {
     public static final String SEND_VERIFY_CODE_TYPE_REGISTER ="REGISTER";//发送验证码type-注册
     public static final String SEND_VERIFY_CODE_TYPE_BANK ="BANK";//发送验证码type-绑定银行卡
     public static final String SEND_VERIFY_CODE_TYPE_LOGOFF  ="LOGOFF";//发送验证码type-注销账号
-    public static final String SEND_VERIFY_CODE_TYPE_UNBIND_TENANT  ="";//发送验证码type-解绑机构
+    public static final String SEND_VERIFY_CODE_TYPE_UNBIND_TENANT  ="SMS";//发送验证码type-解绑机构
     public static final String LOGIN_ITEM ="login_item";//发送验证码type-绑定银行卡
     public static final String PHONE_NUM_KEY="phone_num_key";
     public static final String TEMP_TOKEN="temp_token";