TMessagesProj/src/main/java/org/telegram/cricdit/adapter/MoreGroupAdapter.java

@@ -1,63 +1,51 @@
 package org.telegram.cricdit.adapter;
 
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
 import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.resource.bitmap.CircleCrop;
-import com.bumptech.glide.request.RequestOptions;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.luck.picture.lib.utils.DensityUtil;
 
 import org.telegram.cricdit.bean.MoreGroupBean;
-import org.telegram.cricdit.config.Constants;
-import org.telegram.cricdit.utils.AvatarImageUtils;
 import org.telegram.cricdit.utils.Base64Utils;
-import org.telegram.cricdit.utils.CornerTransform;
-import org.telegram.cricdit.utils.GlideUtils;
 import org.telegram.cricdit.view.TagTextView;
 import org.telegram.messenger.AndroidUtilities;
-import org.telegram.messenger.ChatObject;
-import org.telegram.messenger.MessagesController;
-import org.telegram.messenger.MessagesStorage;
 import org.telegram.messenger.R;
-import org.telegram.onecric.utils.GlideUtil;
-import org.telegram.tgnet.ConnectionsManager;
-import org.telegram.tgnet.TLObject;
-import org.telegram.tgnet.TLRPC;
-import org.telegram.ui.ChatActivity;
-import org.telegram.ui.Components.LayoutHelper;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class MoreGroupAdapter extends BaseQuickAdapter<MoreGroupBean, BaseViewHolder> {
+public class MoreGroupAdapter extends BaseQuickAdapter<MoreGroupBean.ListDTO, BaseViewHolder> {
     private final List<String> tagList;
 
-    public MoreGroupAdapter(int layoutResId, @Nullable List<MoreGroupBean> data) {
+    public MoreGroupAdapter(int layoutResId, @Nullable List<MoreGroupBean.ListDTO> data) {
         super(layoutResId, data);
         tagList = new ArrayList<>();
-        tagList.add("Hot");
+//        tagList.add("Hot");
     }
 
 
     @Override
-    protected void convert(@NonNull BaseViewHolder helper, MoreGroupBean item) {
+    protected void convert(@NonNull BaseViewHolder helper, MoreGroupBean.ListDTO item) {
         ImageView avartarImg = helper.getView(R.id.more_group_item_avatar);
         TagTextView titleTv = helper.getView(R.id.more_group_item_title);
 
         titleTv.setTypeface(AndroidUtilities.getNormalTypefaceMedium());
-        titleTv.setContentAndTag("India Cricket India Cricket", tagList);
+        titleTv.setContentAndTag(item.name, tagList);
+
+        System.out.println("rqqewrwerq   " + item.group_id);
+
+//        helper.setText(R.id.more_group_item_bio,item.introduction);
+
+//        helper.setVisible(R.id.more_group_item_bio,false);
 
         Glide.with(mContext)
-                .load(Base64Utils.base64ToBitmap(item.avatar))
+                .load(Base64Utils.base64ToBitmap(item.face_url))
                 .into(avartarImg);
+
     }
 
 }

TMessagesProj/src/main/java/org/telegram/cricdit/bean/MoreGroupBean.java

@@ -1,7 +1,40 @@
 package org.telegram.cricdit.bean;
 
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
 public class MoreGroupBean {
+        public Integer limit;
+        public List<ListDTO> list;
+        public Integer start;
+        public Integer total;
+
+        public static class ListDTO {
+            public String group_id;
+            public String name;
+            public String face_url;
+            public Integer groupNum;
+            public String introduction;
+            public String private_link;
+            public String public_link;
+    }
+//        public Integer limit;
+//        public List<ListDTO> list;
+//        public Integer start;
+//        public Integer total;
+//
+//        public static class ListDTO {
+//            public String groupId;
+//            public String name;
+//            public String faceUrl;
+//            public Integer groupNum;
+//            public String introduction;
+//            public String privateLink;
+//            public String publicLink;
+//            public Integer limit;
+//            public Integer start;
+//        }
 
-    public String avatar;
 
 }

TMessagesProj/src/main/java/org/telegram/cricdit/mvp/MoreGroupPresenter.java

@@ -3,6 +3,7 @@ package org.telegram.cricdit.mvp;
 
 import org.telegram.cricdit.base.BaseObserver;
 import org.telegram.cricdit.base.BasePresenter;
+import org.telegram.cricdit.bean.MoreGroupBean;
 import org.telegram.cricdit.bean.NewsGroupBean;
 import org.telegram.cricdit.net.ApiService;
 import org.telegram.cricdit.net.Parameter;
@@ -11,9 +12,11 @@ public class MoreGroupPresenter extends BasePresenter<MoreGroupView> {
 
     public void getMoreGroupData() {
         Parameter parameter = new Parameter();
-        addSubscribe(create(ApiService.class).getMoreGroup(parameter.buildJsonBody()), new BaseObserver<NewsGroupBean>() {
+        parameter.add("start",1);
+        parameter.add("limit",200);
+        addSubscribe(create(ApiService.class).getMoreGroup(parameter.buildJsonBody()), new BaseObserver<MoreGroupBean>() {
             @Override
-            protected void onSuccess(NewsGroupBean data) {
+            protected void onSuccess(MoreGroupBean data) {
                 if (data != null && getView() != null) {
                     getView().showList(data);
                 }

TMessagesProj/src/main/java/org/telegram/cricdit/mvp/MoreGroupView.java

@@ -2,9 +2,10 @@ package org.telegram.cricdit.mvp;
 
 
 import org.telegram.cricdit.base.IView;
+import org.telegram.cricdit.bean.MoreGroupBean;
 import org.telegram.cricdit.bean.NewsGroupBean;
 
 public interface MoreGroupView extends IView {
-    void showList(NewsGroupBean bean);
+    void showList(MoreGroupBean bean);
     void showError(Throwable e);
 }

TMessagesProj/src/main/java/org/telegram/cricdit/net/ApiService.java

@@ -79,7 +79,7 @@ public interface ApiService {
     @POST(Constants.APP_AUTH_URL + "/demo/home_group")
     Observable<BaseResponse<NewsGroupBean>> getHomeData(@Body RequestBody requestBody);
 
-    @POST(Constants.APP_AUTH_URL + "/demo/home_group")
+    @POST(Constants.APP_AUTH_URL + "/demo/more_group")
     Observable<BaseResponse<MoreGroupBean>> getMoreGroup(@Body RequestBody requestBody);
 
     //News搜索

TMessagesProj/src/main/java/org/telegram/cricdit/ui/NewsActivity.java

@@ -76,7 +76,7 @@ public class NewsActivity extends BaseTabActivity<NewsPresenter> {
         tabTitles.add(getContext().getString(R.string.news_tab1));
         tabTitles.add(getContext().getString(R.string.news_tab2));
         tabTitles.add(getContext().getString(R.string.news_tab3));
-//        tabTitles.add(getContext().getString(R.string.news_tab4));
+        tabTitles.add(getContext().getString(R.string.news_tab4));
         for (String title : tabTitles) {
             tabLayout.addTab(tabLayout.newTab().setText(title));
         }
@@ -88,7 +88,7 @@ public class NewsActivity extends BaseTabActivity<NewsPresenter> {
         bundle.putString("news_type", "news");
         frameLayouts.add(new NewsFragment(this, bundle));
         frameLayouts.add(new NewsGroupFragment(this));
-//        frameLayouts.add(new MoreGroupFragment(this));
+        frameLayouts.add(new MoreGroupFragment(this));
         NewsViewPagerAdapter adapter = new NewsViewPagerAdapter(frameLayouts, tabTitles);
         mViewPager.setAdapter(adapter);
 
@@ -106,11 +106,11 @@ public class NewsActivity extends BaseTabActivity<NewsPresenter> {
                 mIvPost.setVisibility(tabPosition == 0 ? View.VISIBLE : View.GONE);
                 mGroupSearch.setVisibility(tabPosition == 2 ? View.VISIBLE : View.GONE);
 
-//                if (tabPosition == 3) {
-//                    mIvSearch.setVisibility(View.GONE );
-//                    mIvPost.setVisibility(View.GONE );
-//                    mGroupSearch.setVisibility(View.GONE );
-//                }
+                if (tabPosition == 3) {
+                    mIvSearch.setVisibility(View.GONE );
+                    mIvPost.setVisibility(View.GONE );
+                    mGroupSearch.setVisibility(View.GONE );
+                }
                 updateTabView(tab, true);
             }
 

TMessagesProj/src/main/java/org/telegram/cricdit/ui/RankListActivity.java

@@ -91,7 +91,7 @@ public class RankListActivity extends BaseTabActivity<RankListPresenter> impleme
 
         ActionBarMenuItem actionBarMenuItem = menu.addItem(0, R.drawable.msg_add);
         actionBarMenuItem.setIconColor(ColorUtil.COLOR_WHITE);
-        actionBarMenuItem.setVisibility(View.GONE);
+//        actionBarMenuItem.setVisibility(View.GONE);
 
         smartRefreshlayout = view.findViewById(R.id.smart_refresh_layout);
         nestedScrollView = view.findViewById(R.id.nestedScrollView);

TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java

@@ -3861,7 +3861,8 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
         }
 
         if (filterTabsView != null) {
-            contentView.addView(filterTabsView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 44));
+            contentView.addView(filterTabsView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 30));
+//            contentView.addView(filterTabsView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 44));
         }
         if (!onlySelect) {
             final FrameLayout.LayoutParams layoutParams = LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT);
@@ -3869,7 +3870,6 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
                 layoutParams.topMargin = AndroidUtilities.statusBarHeight;
             }
             contentView.addView(actionBar, layoutParams);
-
             animatedStatusView = new DrawerProfileCell.AnimatedStatusView(context, 20, 60);
             contentView.addView(animatedStatusView, LayoutHelper.createFrame(20, 20, Gravity.LEFT | Gravity.TOP));
         }

TMessagesProj/src/main/res/layout/item_more_group.xml

@@ -68,6 +68,7 @@
         app:layout_constraintTop_toTopOf="@id/more_group_item_type" />
 
     <TextView
+        android:visibility="gone"
         android:id="@+id/more_group_item_bio"
         android:layout_width="0dp"
         android:layout_height="wrap_content"

gradle.properties

@@ -15,8 +15,8 @@
 #Sat Mar 12 05:53:50 MSK 2016
 #APP_VERSION_NAME=9.0.2
 #APP_VERSION_CODE=2808
-APP_VERSION_NAME=0.1.3
-APP_VERSION_CODE=14
+APP_VERSION_NAME=0.1.4
+APP_VERSION_CODE=15
 #APP_PACKAGE=org.telegram.messenger
 APP_PACKAGE=com.cricdit.cricdit
 RELEASE_KEY_PASSWORD=123456