Browse Source

老师端解散群组逻辑增加

Pq 3 years ago
parent
commit
34b9ea8486

+ 2 - 1
rong_im/common_im_ui/src/main/java/com/common/im/api/IMApi.java

@@ -1,5 +1,6 @@
 package com.common.im.api;
 package com.common.im.api;
 
 
+import static com.cooleshow.base.common.BaseConstant.AUTH_GROUP;
 import static com.cooleshow.base.common.BaseConstant.STUDENT_GROUP;
 import static com.cooleshow.base.common.BaseConstant.STUDENT_GROUP;
 import static com.cooleshow.base.common.BaseConstant.TEACHER_GROUP;
 import static com.cooleshow.base.common.BaseConstant.TEACHER_GROUP;
 
 
@@ -215,7 +216,7 @@ public interface IMApi {
     /**
     /**
      * 解散群组
      * 解散群组
      *
      *
-     * @param groupId
+     * @param
      * @return
      * @return
      */
      */
     @POST(TEACHER_GROUP + "imGroup/dismiss/{groupId}")
     @POST(TEACHER_GROUP + "imGroup/dismiss/{groupId}")

+ 2 - 2
rong_im/common_im_ui/src/main/java/com/common/im/presenter/ChatGroupSettingPresenter.java

@@ -182,7 +182,7 @@ public class ChatGroupSettingPresenter extends BasePresenter<ChatGroupSettingCon
     }
     }
 
 
     /**
     /**
-     * 散群组
+     * 散群组
      *
      *
      * @param groupId
      * @param groupId
      */
      */
@@ -217,7 +217,7 @@ public class ChatGroupSettingPresenter extends BasePresenter<ChatGroupSettingCon
         });
         });
     }
     }
 
 
-    public void groupApplyList(String groupId){
+    public void groupApplyList(String groupId) {
         if (getView() != null) {
         if (getView() != null) {
             getView().showLoading();
             getView().showLoading();
         }
         }

+ 14 - 11
rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/ChatGroupSettingActivity.java

@@ -96,27 +96,30 @@ public class ChatGroupSettingActivity extends BaseMVPActivity<ActivityChatGroupS
                     .withString("targetId", targetId)
                     .withString("targetId", targetId)
                     .navigation();
                     .navigation();
         } else if (view.getId() == R.id.btn_confirm) {
         } else if (view.getId() == R.id.btn_confirm) {
-            finish();
-//            if (BaseApplication.Companion.isTeacherClient()) {
-//                //老师端解散群组
-//                showConfirmDialog();
-//            } else {
-//                //发消息
-//                finish();
-//            }
+//            finish();
+            if (BaseApplication.Companion.isTeacherClient()) {
+                //老师端解散群组
+                showConfirmDialog();
+            } else {
+                //发消息
+                finish();
+            }
         }
         }
 
 
     }
     }
 
 
     private void showConfirmDialog() {
     private void showConfirmDialog() {
         CommonDialog commonDialog = new CommonDialog(this);
         CommonDialog commonDialog = new CommonDialog(this);
+        commonDialog.show();
         commonDialog.setTitle("提示");
         commonDialog.setTitle("提示");
         commonDialog.setContent("确认解散群组吗?");
         commonDialog.setContent("确认解散群组吗?");
         commonDialog.setOnConfirmClickListener(new View.OnClickListener() {
         commonDialog.setOnConfirmClickListener(new View.OnClickListener() {
             @Override
             @Override
             public void onClick(View v) {
             public void onClick(View v) {
-//                presenter.delLocalConversation();
-
+                if (commonDialog != null) {
+                    commonDialog.dismiss();
+                }
+                presenter.dissolveChatGroup(targetId);
             }
             }
         });
         });
         commonDialog.setOnCancelClickListener(new View.OnClickListener() {
         commonDialog.setOnCancelClickListener(new View.OnClickListener() {
@@ -158,7 +161,7 @@ public class ChatGroupSettingActivity extends BaseMVPActivity<ActivityChatGroupS
 
 
         Button btnConfirm = viewBinding.btnConfirm;
         Button btnConfirm = viewBinding.btnConfirm;
         if (BaseApplication.Companion.isTeacherClient()) {
         if (BaseApplication.Companion.isTeacherClient()) {
-            btnConfirm.setText("发消息");
+            btnConfirm.setText("解散群组");
             viewBinding.llChatJoinApply.setVisibility(View.VISIBLE);
             viewBinding.llChatJoinApply.setVisibility(View.VISIBLE);
         } else {
         } else {
             btnConfirm.setText("发消息");
             btnConfirm.setText("发消息");