修改BUG

BaseLibrary/src/main/java/com/cooleshow/base/ui/activity/set/AddressListActivity.java

@@ -21,6 +21,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.EmptyViewLayout;
+import com.cooleshow.base.widgets.dialog.CommonDialog;
 import com.google.gson.Gson;
 
 import java.util.ArrayList;
@@ -70,7 +71,8 @@ public class AddressListActivity extends BaseMVPActivity<ActivityAddressListBind
         addressListAdapter.setDelClickListener(position -> {
             delPosition = position;
             AddressBean addressBean = dataList.get(position);
-            presenter.delAddress(addressBean.id);
+            showTipDialog(addressBean);
+
         });
         addressListAdapter.setOnItemClickListener((adapter, view, position) -> {
             if (mIsCheckAddress) {
@@ -86,6 +88,28 @@ public class AddressListActivity extends BaseMVPActivity<ActivityAddressListBind
         });
     }
 
+    private void showTipDialog(AddressBean addressBean) {
+        CommonDialog commonDialog = new CommonDialog(AddressListActivity.this);
+        commonDialog.show();
+        commonDialog.setTitle("提示");
+        commonDialog.setContent("是否删除该地址?");
+        commonDialog.setOnCancelClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                commonDialog.dismiss();
+            }
+        });
+        commonDialog.setOnConfirmClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (presenter != null) {
+                    presenter.delAddress(addressBean.id);
+                }
+                commonDialog.dismiss();
+            }
+        });
+    }
+
     private void setEmptyView() {
         EmptyViewLayout emptyView = new EmptyViewLayout(this);
         emptyView.setContent(com.cooleshow.base.R.drawable.icon_empty_content, "暂无数据");

BaseLibrary/src/main/res/layout/layout_address_item.xml

@@ -33,16 +33,17 @@
 
     <TextView
         android:id="@+id/tv_address"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="14dp"
         android:layout_marginTop="8dp"
-        android:layout_marginRight="30dp"
+        android:layout_marginRight="10dp"
         android:textColor="@color/color_666666"
         android:textSize="@dimen/sp_16"
+        app:layout_constraintRight_toLeftOf="@+id/im_modify"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_name"
-        tool:text="湖北省武汉市汉街总部" />
+        tool:text="湖北省武汉市汉街总部湖北省武汉市汉街总部湖北省武汉市汉街总部湖北省武汉市汉街总部" />
 
     <ImageView
         android:id="@+id/im_modify"

student/src/main/java/com/cooleshow/student/ui/mine/PersonalSettingActivity.java

@@ -375,7 +375,7 @@ public class PersonalSettingActivity extends BaseMVPActivity<ActivityPersonalSet
             //男
             viewBinding.tvSex.setText("男");
         }
-        viewBinding.tvPhone.setText(data.phone);
+        viewBinding.tvPhone.setText(UserHelper.getUserPhone());
         if (!TextUtils.isEmpty(data.birthdate)) {
             if (data.birthdate.contains(" ")) {
                 String[] s = data.birthdate.split(" ");

teacher/src/main/java/com/cooleshow/teacher/adapter/HomeworkAdapter.java

@@ -55,7 +55,7 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkListBean.RowsBean,
             tv_name.setText(item.courseGroupName + tvname);
         } else {
             GlideUtils.INSTANCE.loadImage(getContext(), item.studentAvatar, im_header, R.drawable.icon_teacher_default_head);
-            tv_name.setText(item.courseGroupName);
+            tv_name.setText(item.studentName);
         }
 
         if (TextUtils.equals(mDecorate, "YES")) {

teacher/src/main/java/com/cooleshow/teacher/adapter/SparringCourseListAdapter.java

@@ -1,6 +1,7 @@
 package com.cooleshow.teacher.adapter;
 
 import android.text.TextUtils;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -23,6 +24,7 @@ public class SparringCourseListAdapter extends BaseQuickAdapter<SparringCourseLi
 
     public SparringCourseListAdapter(int layoutResId) {
         super(layoutResId);
+        addChildClickViewIds(R.id.iv_go_chat);
     }
 
     @Override
@@ -59,16 +61,17 @@ public class SparringCourseListAdapter extends BaseQuickAdapter<SparringCourseLi
             tvCourseStatusBt.setText("进入教室");
             tvCourseStatusBt.setBackgroundResource(R.drawable.shape_course_status_ing);
             tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.white));
+            tvCourseStatusBt.setVisibility(View.VISIBLE);
         }
 
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, data.status)) {
             //已结束
             tv_course_status.setText("已结束");
             tv_course_status.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_999999));
-
             tvCourseStatusBt.setText("评价");
             tvCourseStatusBt.setBackgroundResource(R.drawable.shape_course_status_normal);
             tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
+            tvCourseStatusBt.setVisibility(View.GONE);
         }
     }
 

teacher/src/main/java/com/cooleshow/teacher/ui/course/SparringCourseFragment.java

@@ -13,6 +13,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder;
 import com.bigkoo.pickerview.listener.CustomListener;
 import com.bigkoo.pickerview.view.TimePickerView;
 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.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.constanst.Constants;
@@ -45,6 +46,7 @@ import java.util.List;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import io.rong.imkit.utils.helper.OpenChatHelper;
 
 /**
  * Author by pq, Date on 2022/4/25.
@@ -149,6 +151,17 @@ public class SparringCourseFragment extends BaseMVPFragment<FragmentSparringCour
                 }
             }
         });
+
+        mAdapter.setOnItemChildClickListener(new OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
+                if (position < mAdapter.getData().size()) {
+                    SparringCourseListBean.RowsBean rowsBean = mAdapter.getData().get(position);
+                    OpenChatHelper.goChat(getContext(), rowsBean.userId, rowsBean.userName);
+                }
+            }
+        });
+
         mViewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
         mViewBinding.recyclerView.setAdapter(mAdapter);
         buildDefaultCourseStatusFilterList();

teacher/src/main/java/com/cooleshow/teacher/ui/work/AssignHomeworkActivity.java

@@ -101,7 +101,8 @@ public class AssignHomeworkActivity extends BaseMVPActivity<ActivityAssignHomewo
         //subjectName
         GlideUtils.INSTANCE.loadImage(this, bean.studentAvatar, viewBinding.imHeader, R.drawable.icon_teacher_default_head);
         viewBinding.tvCourseName.setText(bean.subjectName);
-        viewBinding.tvName.setText(bean.courseGroupName);
+
+        viewBinding.tvName.setText(bean.studentName);
 
         viewBinding.tvDate.setText(UiUtils.getCourseTimeString(bean.startTime, bean.endTime));
 

teacher/src/main/res/layout/guide_thre.xml

@@ -25,16 +25,16 @@
             android:background="@drawable/view_guide_point_normal" />
 
         <View
-            android:layout_width="@dimen/dp_14"
+            android:layout_width="@dimen/dp_7"
             android:layout_height="@dimen/dp_7"
             android:layout_marginLeft="11dp"
-            android:background="@drawable/view_guide_point_select" />
+            android:background="@drawable/view_guide_point_normal" />
 
         <View
-            android:layout_width="@dimen/dp_7"
+            android:layout_width="@dimen/dp_14"
             android:layout_height="@dimen/dp_7"
             android:layout_marginLeft="11dp"
-            android:background="@drawable/view_guide_point_normal" />
+            android:background="@drawable/view_guide_point_select" />
 
     </LinearLayout>
 
@@ -58,7 +58,7 @@
         android:layout_above="@+id/ll_points"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="@dimen/dp_112"
-        android:text="师生面对面讲解，解锁新技巧"
+        android:text="展示个人风采，传播专业知识"
         android:textColor="@color/color_9e9e9e" />
 
     <TextView
@@ -68,7 +68,7 @@
         android:layout_above="@+id/tv_content"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="10dp"
-        android:text="直播互动"
+        android:text="个人主页"
         android:textColor="@color/color_333333"
         android:textSize="@dimen/sp_24"
         android:textStyle="bold" />

teacher/src/main/res/layout/item_sparring_course_list_layout.xml

@@ -69,6 +69,7 @@
         tools:text="张豆豆" />
 
     <ImageView
+        android:id="@+id/iv_go_chat"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"