More

TMessagesProj/src/main/AndroidManifest.xml

@@ -43,8 +43,8 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-<!--    <uses-permission android:name="android.permission.READ_CONTACTS" />-->
-<!--    <uses-permission android:name="android.permission.WRITE_CONTACTS" />-->
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />

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

@@ -1,38 +1,19 @@
 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;
@@ -43,7 +24,7 @@ public class MoreGroupAdapter extends BaseQuickAdapter<MoreGroupBean.ListDTO, Ba
     public MoreGroupAdapter(int layoutResId, @Nullable List<MoreGroupBean.ListDTO> data) {
         super(layoutResId, data);
         tagList = new ArrayList<>();
-        tagList.add("Hot");
+//        tagList.add("Hot");
     }
 
 
@@ -55,11 +36,16 @@ public class MoreGroupAdapter extends BaseQuickAdapter<MoreGroupBean.ListDTO, Ba
         titleTv.setTypeface(AndroidUtilities.getNormalTypefaceMedium());
         titleTv.setContentAndTag(item.name, tagList);
 
-        helper.setText(R.id.more_group_item_bio,item.introduction);
+        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.face_url))
                 .into(avartarImg);
+
     }
 
 }

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

@@ -11,13 +11,13 @@ public class MoreGroupBean {
         public Integer total;
 
         public static class ListDTO {
-            public String groupId;
+            public String group_id;
             public String name;
             public String face_url;
             public Integer groupNum;
             public String introduction;
-            public String privateLink;
-            public String publicLink;
+            public String private_link;
+            public String public_link;
     }
 //        public Integer limit;
 //        public List<ListDTO> list;

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

@@ -13,7 +13,7 @@ public class MoreGroupPresenter extends BasePresenter<MoreGroupView> {
     public void getMoreGroupData() {
         Parameter parameter = new Parameter();
         parameter.add("start",1);
-        parameter.add("limit",5);
+        parameter.add("limit",200);
         addSubscribe(create(ApiService.class).getMoreGroup(parameter.buildJsonBody()), new BaseObserver<MoreGroupBean>() {
             @Override
             protected void onSuccess(MoreGroupBean data) {

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

@@ -7,17 +7,13 @@ import android.view.LayoutInflater;
 import android.view.View;
 
 import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
 
 import org.telegram.cricdit.adapter.MoreGroupAdapter;
-import org.telegram.cricdit.adapter.NewsGroupAdapter;
 import org.telegram.cricdit.bean.BaseViewFragment;
 import org.telegram.cricdit.bean.MoreGroupBean;
-import org.telegram.cricdit.bean.NewsGroupBean;
 import org.telegram.cricdit.config.Constants;
 import org.telegram.cricdit.mvp.MoreGroupPresenter;
 import org.telegram.cricdit.mvp.MoreGroupView;
@@ -60,6 +56,8 @@ public class MoreGroupFragment implements BaseViewFragment, MoreGroupView {
         mMoreGroupBeanList = new ArrayList<>();
 
         mRefreshLayout = view.findViewById(R.id.more_group_refresh_layout);
+        mRefreshLayout.setEnableLoadMore(false);
+
 
         mRecyclerView = view.findViewById(R.id.more_group_recycler_view);
         mRecyclerView.setLayoutManager(new GridLayoutManager(mFragment.getContext(), 2));
@@ -69,7 +67,10 @@ public class MoreGroupFragment implements BaseViewFragment, MoreGroupView {
         View inflate = LayoutInflater.from(mFragment.getContext()).inflate(R.layout.layout_empty_view, null, false);
         mAdapter.setEmptyView(inflate);
         mAdapter.setOnItemClickListener((adapter, view1, position) -> {
-//            jumpToChat("",);
+            List<MoreGroupBean.ListDTO> data = mAdapter.getData();
+            if (data != null && data.size() > 0) {
+                jumpToChat(data.get(position).public_link, Long.parseLong(data.get(position).group_id));
+            }
         });
         mRecyclerView.setAdapter(mAdapter);
 
@@ -78,7 +79,9 @@ public class MoreGroupFragment implements BaseViewFragment, MoreGroupView {
     }
 
     private void initListener() {
-
+        mRefreshLayout.setOnRefreshListener(refreshLayout -> {
+            presenter.getMoreGroupData();
+        });
     }
 
     private void initData() {
@@ -87,14 +90,15 @@ public class MoreGroupFragment implements BaseViewFragment, MoreGroupView {
 
     @Override
     public void showList(MoreGroupBean bean) {
+        mRefreshLayout.finishRefresh();
         if (bean != null && bean.list != null && bean.list.size() > 0) {
-            mAdapter.addData(bean.list);
+            mAdapter.setNewData(bean.list);
         }
     }
 
     @Override
     public void showError(Throwable e) {
-
+        mRefreshLayout.finishRefresh();
     }
 
     @Override

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/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"