浏览代码

修改IM公告部分问题

Pq 1 年之前
父节点
当前提交
af4227e144

+ 6 - 1
chatModule/src/main/java/com/cooleshow/chatmodule/adapter/NoticeListAdapter.java

@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.module.BaseLoadMoreModule;
 import com.chad.library.adapter.base.module.LoadMoreModule;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.utils.DateUtil;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.widgets.CustomLoadMoreView;
@@ -53,7 +54,11 @@ public class NoticeListAdapter extends BaseQuickAdapter<GroupNoticeBean.RowsBean
         }
         tvTitle.setText(bean.title);
         tvContent.setText(bean.content);
-        ivSetting.setVisibility(View.GONE);
+        if (BaseApplication.Companion.isTeacherClient()) {
+            ivSetting.setVisibility(View.VISIBLE);
+        } else {
+            ivSetting.setVisibility(View.GONE);
+        }
         ivSetting.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

+ 1 - 1
chatModule/src/main/java/com/cooleshow/chatmodule/api/IMApi.java

@@ -97,7 +97,7 @@ public interface IMApi {
      * @param body
      * @return
      */
-    @POST("{group_name}" + "/imGroupNotice/save")
+    @POST("{group_name}" + "/imGroupNotice/create")
     Observable<BaseResponse<Object>> createGroupNotice(@Body RequestBody body, @Path("group_name") String group_name);
 
     /**

+ 32 - 0
chatModule/src/main/java/com/cooleshow/chatmodule/bean/GroupNoticeBean.java

@@ -47,5 +47,37 @@ public class GroupNoticeBean {
         public boolean topFlag;
         public String updateTime;
         public String username;
+
+        @Override
+        public String toString() {
+            return "RowsBean{" +
+                    "avatar='" + avatar + '\'' +
+                    ", content='" + content + '\'' +
+                    ", createTime='" + createTime + '\'' +
+                    ", delFlag=" + delFlag +
+                    ", groupId='" + groupId + '\'' +
+                    ", id='" + id + '\'' +
+                    ", operatorId=" + operatorId +
+                    ", sentToNewMemberFlag=" + sentToNewMemberFlag +
+                    ", title='" + title + '\'' +
+                    ", topFlag=" + topFlag +
+                    ", updateTime='" + updateTime + '\'' +
+                    ", username='" + username + '\'' +
+                    '}';
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "GroupNoticeBean{" +
+                "limit=" + limit +
+                ", nextPage=" + nextPage +
+                ", offset=" + offset +
+                ", pageNo=" + pageNo +
+                ", prePage=" + prePage +
+                ", total=" + total +
+                ", totalPage=" + totalPage +
+                ", rows=" + rows.toString() +
+                '}';
     }
 }

+ 0 - 3
chatModule/src/main/java/com/cooleshow/chatmodule/presenter/NoticeEditPresenter.java

@@ -77,9 +77,6 @@ public class NoticeEditPresenter extends BasePresenter<NoticeEditContract.Notice
             @Override
             public void onComplete() {
                 super.onComplete();
-                if (getView() != null) {
-                    getView().hideLoading();
-                }
             }
         });
     }

+ 12 - 1
chatModule/src/main/java/com/cooleshow/chatmodule/ui/NoticeActivity.java

@@ -8,9 +8,11 @@ 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.OnItemClickListener;
+import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.LOG;
 import com.cooleshow.base.utils.PopupUtil;
 import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
@@ -68,7 +70,15 @@ public class NoticeActivity extends BaseMVPActivity<TcActivityNoticeBinding, Not
     protected void initView() {
         initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "群公告");
         //其他不可修改群公告
-        viewBinding.toolbarInclude.tvRight.setVisibility(View.GONE);
+        viewBinding.toolbarInclude.tvRight.setVisibility(View.VISIBLE);
+        if (BaseApplication.Companion.isTeacherClient()) {
+            viewBinding.toolbarInclude.tvRight.setImageResource(R.drawable.icon_chat_group_notice_add);
+            viewBinding.toolbarInclude.tvRight.setVisibility(View.VISIBLE);
+            viewBinding.toolbarInclude.tvRight.setOnClickListener(this);
+        } else {
+            //学生不可修改群公告
+            viewBinding.toolbarInclude.tvRight.setVisibility(View.GONE);
+        }
         targetId = getIntent().getStringExtra("targetId");
         recyclerView = viewBinding.recyclerView;
         floatbutton = viewBinding.floatbutton;
@@ -197,6 +207,7 @@ public class NoticeActivity extends BaseMVPActivity<TcActivityNoticeBinding, Not
 
     @Override
     public void queryGroupNoticeSuccess(int page, GroupNoticeBean dataList) {
+        LOG.i("pq","queryGroupNoticeSuccess:"+dataList);
         if (dataList != null) {
             if (page == 1) {
                 //第一页

二进制
chatModule/src/main/res/drawable-xhdpi/icon_chat_group_notice_add.png


二进制
chatModule/src/main/res/drawable-xxhdpi/icon_chat_group_notice_add.png


+ 9 - 0
teacher/src/main/java/com/cooleshow/teacher/App.java

@@ -79,6 +79,15 @@ public class App extends BaseApplication {
                 return new CustomRefreshHeader(context);//.setTimeFormat(new DynamicTimeFormat("更新于 %s"));//指定为经典Header,默认是 贝塞尔雷达Header
             }
         });
+
+        //设置全局的Footer构建器
+        SmartRefreshLayout.setDefaultRefreshFooterCreator(new DefaultRefreshFooterCreator() {
+            @Override
+            public RefreshFooter createRefreshFooter(Context context, RefreshLayout layout) {
+                //指定为经典Footer,默认是 BallPulseFooter
+                return new ClassicsFooter(context).setDrawableSize(20);
+            }
+        });
     }
 
     @Override