TMessagesProj/src/main/java/org/telegram/cricdit/config/Constants.java

@@ -19,10 +19,8 @@ public class Constants {
     //Privacy Policy地址
     public static final String WEB_URL_PRIVACY_POLICY = "https://m.cricdit.com/agreement?flag=app";
 
-//    public static final String WEB_URL_NEWS_H5_START = "https://m.cricdit.com/";
-    public static final String WEB_URL_NEWS_H5 = "https://n.cricdit.com/";
-    public static final String WEB_URL_NEWS_H5_PREFIX = "https://n.cricdit.com/news/";
-    public static final String WEB_URL_NEWS_H5_SUFFIX = ".html";
+//    public static final String WEB_URL_NEWS_H5_PREFIX = "https://n.cricdit.com/news?id=";
+    public static final String WEB_URL_NEWS_H5_PREFIX = "https://news.cricdit.com?id=";
 
     public static final String WEB_URL_MATCH_H5= "https://match.onecric.tv/";
 

TMessagesProj/src/main/java/org/telegram/cricdit/share/ShareUtils.java

@@ -10,7 +10,8 @@ import org.telegram.messenger.R;
 public class ShareUtils {
 
     public static String packagingNewsLink(String newsId) {
-        return Constants.WEB_URL_NEWS_H5_PREFIX + newsId + Constants.WEB_URL_NEWS_H5_SUFFIX;
+//        return Constants.WEB_URL_NEWS_H5_PREFIX + newsId + Constants.WEB_URL_NEWS_H5_SUFFIX;
+        return Constants.WEB_URL_NEWS_H5_PREFIX + newsId;
     }
 
     public static void shareForLink(String link, Context context) {

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

@@ -22,6 +22,7 @@ import org.telegram.cricdit.mvp.PointsRecordPresenter;
 import org.telegram.cricdit.mvp.PointsRecordView;
 import org.telegram.cricdit.view.CustomBubbleAttachPopup;
 import org.telegram.cricdit.view.CustomDateDialog;
+import org.telegram.messenger.LocaleController;
 import org.telegram.messenger.R;
 
 import java.util.ArrayList;
@@ -55,7 +56,7 @@ public class PointsRecordActivity extends BaseActivity<PointsRecordPresenter> im
 
     @Override
     public String setActionBarTitle() {
-        return "Points record";
+        return LocaleController.getString(R.string.CdPointsRecord);
     }
 
     @Override
@@ -79,14 +80,17 @@ public class PointsRecordActivity extends BaseActivity<PointsRecordPresenter> im
 
         mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
+        Calendar calendar = Calendar.getInstance();
+        mFilterTime.setText(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1));
+
 
-//        for (int i = 0; i < 5; i++) {
-//            PointsRecordBean.Data.ListDTO listDTO = new PointsRecordBean.Data.ListDTO();
-//            listDTO.score="+5";
-//            listDTO.time = "2022-12-26 15:35:21";
-//            listDTO.type = "Type of: Like";
-//            mPointsRecordBeanList.add(listDTO);
-//        }
+        for (int i = 0; i < 5; i++) {
+            PointsRecordBean.Data.ListDTO listDTO = new PointsRecordBean.Data.ListDTO();
+            listDTO.score = "+5";
+            listDTO.time = "2022-12-26 15:35:21";
+            listDTO.type = "Type of: Like";
+            mPointsRecordBeanList.add(listDTO);
+        }
 
         mAdapter = new PointsRecordAdapter(R.layout.item_points_record, mPointsRecordBeanList);
 
@@ -112,18 +116,21 @@ public class PointsRecordActivity extends BaseActivity<PointsRecordPresenter> im
         mRefreshLayout.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
             @Override
             public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
-
+                mStart++;
+//                presenter.getNormalRecord(mStart,mLimit,);
             }
 
             @Override
             public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                mStart = 1;
 //                presenter.getNormalRecord(mStart,mLimit,);
             }
         });
+
+//        presenter.getNormalRecord(mStart,mLimit,);
     }
 
     public void getDate() {
-
         CustomDateDialog dialog = new CustomDateDialog(getContext());
         Calendar calendar = Calendar.getInstance();
         dialog.setDate(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), (year, month) -> {
@@ -134,18 +141,11 @@ public class PointsRecordActivity extends BaseActivity<PointsRecordPresenter> im
 
     public void getType() {
         new XPopup.Builder(getContext())
-//                        .isCenterHorizontal(true)
-                .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
+                .isDestroyOnDismiss(true)
                 .atView(mFilterType)
-                .hasShadowBg(false) // 去掉半透明背景
-//                        .offsetX(XPopupUtils.dp2px(getContext(), 20))
-                .offsetY(XPopupUtils.dp2px(getContext(), 6))
-                .asCustom(new CustomBubbleAttachPopup(getContext(), new CustomBubbleAttachPopup.OnTypeSelectListener() {
-                    @Override
-                    public void select(String type) {
-                        mFilterType.setText(type);
-                    }
-                }))
+                .isViewMode(true)
+                .hasShadowBg(false)
+                .asCustom(new CustomBubbleAttachPopup(getContext(), type -> mFilterType.setText(type)))
                 .show();
     }
 
@@ -154,12 +154,19 @@ public class PointsRecordActivity extends BaseActivity<PointsRecordPresenter> im
         mRefreshLayout.finishRefresh();
         mRefreshLayout.finishLoadMore();
 
-        if (refreshType == TYPE_REFRESH) {
+        if (data == null || data.list == null) {
+            mAdapter.notifyDataSetChanged();
+            return;
+        }
 
+        if (refreshType == TYPE_REFRESH) {
+            mStart = 1;
+            mPointsRecordBeanList.clear();
+            mPointsRecordBeanList.addAll(data.list);
         } else {
-
+            mPointsRecordBeanList.addAll(data.list);
         }
-
+        mAdapter.notifyDataSetChanged();
     }
 
     @Override
@@ -168,11 +175,10 @@ public class PointsRecordActivity extends BaseActivity<PointsRecordPresenter> im
         mRefreshLayout.finishLoadMore();
 
         if (refreshType == TYPE_REFRESH) {
-
+            mStart = 1;
         } else {
-
-
+            mStart--;
         }
-
+        mAdapter.notifyDataSetChanged();
     }
 }

TMessagesProj/src/main/java/org/telegram/cricdit/utils/NewsIdReturnUtils.java

@@ -9,6 +9,8 @@ import org.telegram.cricdit.config.Constants;
 public class NewsIdReturnUtils {
 
     public static int h5UrlToNewsId(String newsUrl) {
-        return Integer.parseInt((newsUrl.split(Constants.WEB_URL_NEWS_H5_PREFIX)[1]).split(Constants.WEB_URL_NEWS_H5_SUFFIX)[0]);
+//        return Integer.parseInt((newsUrl.split(Constants.WEB_URL_NEWS_H5_PREFIX)[1]).split(Constants.WEB_URL_NEWS_H5_SUFFIX)[0]);
+//        return Integer.parseInt(newsUrl.split(Constants.WEB_URL_NEWS_H5_PREFIX)[1]);
+        return Integer.parseInt(newsUrl.split("=")[1]);
     }
 }

TMessagesProj/src/main/java/org/telegram/messenger/GcmPushListenerService.java

@@ -26,7 +26,7 @@ public class GcmPushListenerService extends FirebaseMessagingService {
         if (BuildVars.LOGS_ENABLED) {
             FileLog.d("FCM received data: " + data + " from: " + from);
         }
-
+        System.out.println("werwqeer 2   " + data.get("p"));
         PushListenerController.processRemoteMessage(PushListenerController.PUSH_TYPE_FIREBASE, data.get("p"), time);
     }
 
@@ -38,6 +38,8 @@ public class GcmPushListenerService extends FirebaseMessagingService {
             }
             ApplicationLoader.postInitApplication();
             PushListenerController.sendRegistrationToServer(PushListenerController.PUSH_TYPE_FIREBASE, token);
+
+            System.out.println("werwqeer 1   " + token);
         });
     }
 }

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

@@ -323,7 +323,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="3dp"
                             android:gravity="center"
-                            android:text="Points"
+                            android:text="Crcma"
                             android:textColor="#ff999999"
                             android:textSize="12sp"
                             android:textStyle="bold" />

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

@@ -17,6 +17,7 @@
             android:id="@+id/more_group_recycler_view"
             android:layout_width="match_parent"
             android:layout_marginEnd="12dp"
+            android:layout_marginBottom="16dp"
             android:layout_height="match_parent"
             android:overScrollMode="never" />
 

TMessagesProj/src/main/res/values/strings.xml

@@ -28,6 +28,7 @@
     <string name="CdExpiredUser">Expired User</string>
     <string name="CdPublishRanking">Create Poll</string>
     <string name="CdPublishRankingEdit">Edit Voting Options</string>
+    <string name="CdPointsRecord">Points record</string>
 
 
     <!--==============================Cricdit结束================================-->