DESKTOP-JJ6HLMB 1 year ago
parent
commit
e66da89df6

+ 22 - 11
TMessagesProj/src/main/java/org/telegram/cricdit/adapter/CommentAdapter.java

@@ -4,6 +4,7 @@ import static org.telegram.cricdit.utils.Base64Utils.base64ToBitmap;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -42,6 +43,8 @@ import org.telegram.cricdit.view.AvatarImage;
 import org.telegram.cricdit.view.ExpandTextView;
 import org.telegram.messenger.R;
 import org.telegram.messenger.UserConfig;
+import org.telegram.ui.ActionBar.BaseFragment;
+import org.telegram.ui.ProfileActivity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -62,9 +65,11 @@ public class CommentAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
     BaseHeadViewHolder headViewHolder;
     private NewsBean.NewsFeedBean mBean;
     private RequestOptions requestOptionsCircle;
+    BaseFragment baseFragment;
 
 
-    public CommentAdapter(List<MultiItemEntity> list, Context context, BaseHeadViewHolder holder) {
+    public CommentAdapter(BaseFragment baseFragment, List<MultiItemEntity> list, Context context, BaseHeadViewHolder holder) {
+        this.baseFragment = baseFragment;
         this.mList = list;
         this.context = context;
         this.headViewHolder = holder;
@@ -328,11 +333,11 @@ public class CommentAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                 }
 //                viewHolder.avatar.load(mainCommendBean.getUser_avatar());
 //                if (!TextUtils.isEmpty(mainCommendBean.getUser_avatar())) {
-                    Glide.with(context).load(base64ToBitmap(mainCommendBean.getUser_avatar()))
-                            .apply(requestOptionsCircle)
-                            .placeholder(R.drawable.book_user)
-                            .error(R.drawable.book_user)
-                            .into(viewHolder.avatar);
+                Glide.with(context).load(base64ToBitmap(mainCommendBean.getUser_avatar()))
+                        .apply(requestOptionsCircle)
+                        .placeholder(R.drawable.book_user)
+                        .error(R.drawable.book_user)
+                        .into(viewHolder.avatar);
 //                }
                 viewHolder.avatar.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -341,6 +346,9 @@ public class CommentAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 //                                .build(ARouterPath.PATH_MAIN_PERSON_DETAIL_ACTIVITY)
 //                                .withString(Constants.USER_ID, mainCommendBean.getUser_id())
 //                                .navigation();
+                        Bundle args = new Bundle();
+                        args.putLong("user_id", Long.parseLong(mainCommendBean.getUser_id()));
+                        baseFragment.presentFragment(new ProfileActivity(args));
                     }
                 });
                 viewHolder.content.init(false, mainCommendBean.getContent(), null);
@@ -399,11 +407,11 @@ public class CommentAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 //                viewHolder.content.setText(childCommendBean.getContent());
 //                viewHolder.avatar.load(childCommendBean.getUser_avatar());
 //                if (!TextUtils.isEmpty(childCommendBean.getUser_avatar())) {
-                    Glide.with(context).load(base64ToBitmap(childCommendBean.getUser_avatar()))
-                            .apply(requestOptionsCircle)
-                            .placeholder(R.drawable.book_user)
-                            .error(R.drawable.book_user)
-                            .into(viewHolder.avatar);
+                Glide.with(context).load(base64ToBitmap(childCommendBean.getUser_avatar()))
+                        .apply(requestOptionsCircle)
+                        .placeholder(R.drawable.book_user)
+                        .error(R.drawable.book_user)
+                        .into(viewHolder.avatar);
 //                }
                 viewHolder.avatar.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -412,6 +420,9 @@ public class CommentAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 //                                .build(ARouterPath.PATH_MAIN_PERSON_DETAIL_ACTIVITY)
 //                                .withString(Constants.USER_ID, childCommendBean.getUser_id())
 //                                .navigation();
+                        Bundle args = new Bundle();
+                        args.putLong("user_id", Long.parseLong(childCommendBean.getUser_id()));
+                        baseFragment.presentFragment(new ProfileActivity(args));
                     }
                 });
                 viewHolder.name.setText(((ChildCommendBean) item).getUser_name());

+ 1 - 1
TMessagesProj/src/main/java/org/telegram/cricdit/ui/CommentFragment.java

@@ -136,7 +136,7 @@ public class CommentFragment extends BaseActivity<CommentPresenter> implements O
         ImageView ivShare = rootView.findViewById(R.id.iv_share);
         rlBottom = rootView.findViewById(R.id.rl_bottom);
         rv.setLayoutManager(new LinearLayoutManager(getContext()));
-        adapter = new CommentAdapter(null, getParentActivity(), mHolder);
+        adapter = new CommentAdapter(null,null, getParentActivity(), mHolder);
         if (bean != null) {
             adapter.setNewsBean(bean);
         }

+ 2 - 3
TMessagesProj/src/main/java/org/telegram/cricdit/ui/NewsDetailCommentFragment.java

@@ -179,7 +179,7 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
     public void setHeadViewHolder(BaseHeadViewHolder holder) {
         mHolder = holder;
         rv.setLayoutManager(new LinearLayoutManager(getContext()));
-        adapter = new CommentAdapter(null, getParentActivity(), mHolder);
+        adapter = new CommentAdapter(this,null, getParentActivity(), mHolder);
         if (newsBean != null) {
             adapter.setNewsBean(newsBean);
         }
@@ -681,8 +681,7 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
 ////            } else if (multiItem instanceof ChildCommendBean) {//表示点击子评论的回复
 ////
 ////            }
-//        }
-//        viewDataBinding.mTextView.setText("");
+//     //        }   viewDataBinding.mTextView.setText("");
         //调用后台接口评论回复
         int id = 0;
         if (multiItem != null) {

+ 1 - 1
TMessagesProj/src/main/java/org/telegram/cricdit/ui/RankDetailCommentFragment.java

@@ -147,7 +147,7 @@ public class RankDetailCommentFragment extends BaseActivity<CommentPresenter> im
     public void setHeadViewHolder(BaseHeadViewHolder holder) {
         mHolder = holder;
         rv.setLayoutManager(new LinearLayoutManager(getContext()));
-        adapter = new CommentAdapter(null, getParentActivity(), mHolder);
+        adapter = new CommentAdapter(this, null, getParentActivity(), mHolder);
         if (bean != null) {
             adapter.setNewsBean(bean);
         }

+ 3 - 3
TMessagesProj_App/bundleAfat_SDK23/release/output-metadata.json

@@ -11,9 +11,9 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 1,
-      "versionName": "0.0.1",
-      "outputFile": "app.apk"
+      "versionCode": 4,
+      "versionName": "0.0.3",
+      "outputFile": "Cricdit0.0.3.apk"
     }
   ],
   "elementType": "File"