1

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

@@ -17,6 +17,7 @@ import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
 import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.core.app.NotificationCompat;
@@ -24,11 +25,14 @@ import androidx.core.app.NotificationCompat;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
+import org.telegram.cricdit.utils.GsonHel;
+import org.telegram.cricdit.utils.SPUtils;
 import org.telegram.onecric.ui.activity.CricketDetailActivity;
 
 import java.util.Map;
 
 public class GcmPushListenerService extends FirebaseMessagingService {
+    private static final String TAG = "GcmPushListenerService";
 
     @Override
     public void onMessageReceived(RemoteMessage message) {
@@ -48,6 +52,8 @@ public class GcmPushListenerService extends FirebaseMessagingService {
 
     @Override
     public void onNewToken(@NonNull String token) {
+        Log.d(TAG, "Refreshed token: " + token);
+        SPUtils.getInstance().save("registration_token", token);
         AndroidUtilities.runOnUIThread(() -> {
             if (BuildVars.LOGS_ENABLED) {
                 FileLog.d("Refreshed FCM token: " + token);

TMessagesProj/src/main/java/org/telegram/onecric/mvp/presenter/SubscribePresenter.java

@@ -3,6 +3,8 @@ package org.telegram.onecric.mvp.presenter;
 import com.alibaba.fastjson.JSONObject;
 
 
+import org.telegram.cricdit.utils.SPUtils;
+import org.telegram.messenger.UserConfig;
 import org.telegram.onecric.base.BasePresenter;
 import org.telegram.onecric.net.ApiCallback;
 import org.telegram.onecric.net.ApiClient;
@@ -18,6 +20,10 @@ public class SubscribePresenter extends BasePresenter {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("mid", mid);
         jsonObject.put("type", type);
+        jsonObject.put("registrationId", SPUtils.getInstance().get("registration_token",""));
+//        if (UserConfig.getInstance(UserConfig.selectedAccount).isClientActivated()) {
+//            jsonObject.put("user_id", UserConfig.getInstance(UserConfig.selectedAccount).getCurrentUser().id + "");
+//        }
         ApiClient.retrofit().create(ApiStores.class)
                 .doSubscribe(getRequestBody(jsonObject))
                 .subscribeOn(Schedulers.io())

TMessagesProj/src/main/java/org/telegram/onecric/ui/activity/CricketDetailActivity.java

@@ -328,11 +328,11 @@ public class CricketDetailActivity extends MvpActivity<CricketDetailPresenter> i
                 subscribeIv.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        if (!UserConfig.getInstance(UserConfig.selectedAccount).isClientActivated()) {
-                            ToastUtil.show(CricketDetailActivity.this, getString(R.string.please_login));
-                            // TODO: 2023/3/16  需要跳转到登陆界面
-//                            return;
-                        }
+//                        if (!UserConfig.getInstance(UserConfig.selectedAccount).isClientActivated()) {
+//                            ToastUtil.show(CricketDetailActivity.this, getString(R.string.please_login));
+//                            // TODO: 2023/3/16  需要跳转到登陆界面
+////                            return;
+//                        }
                         getSubscribeType(model, subscribeIv);
                         // TODO: 2023/2/14  订阅消息推送
 //                    //这里先弹出一个订阅消息的内容选择框  待选择好后点击确定订阅按钮再调用订阅接口

TMessagesProj/src/main/java/org/telegram/onecric/ui/activity/NewCricketDetailActivity.java

@@ -1,6 +1,5 @@
 //package org.telegram.onecric.ui.activity;
 //
-//import android.app.Activity;
 //import android.content.Context;
 //import android.content.Intent;
 //import android.text.SpannableStringBuilder;
@@ -29,7 +28,6 @@
 //import org.telegram.cricdit.view.popup.ReportBottomPopup;
 //import org.telegram.messenger.R;
 //import org.telegram.messenger.UserConfig;
-//import org.telegram.onecric.base.MvpActivity;
 //import org.telegram.onecric.config.HttpConstant;
 //import org.telegram.onecric.mvp.bean.CricketMatchBean;
 //import org.telegram.onecric.mvp.bean.SubscribeTypeBean;
@@ -280,17 +278,17 @@
 //                if (!TextUtils.isEmpty(model.getHome_name())) {
 //                    tv_home_name_two.setText(model.getHome_name());
 //                }
-//                GlideUtil.loadTeamImageDefault(this, model.getHome_logo(), iv_home_logo_two);
+//                GlideUtil.loadTeamImageDefault(getContext(), model.getHome_logo(), iv_home_logo_two);
 //
 //                if (!TextUtils.isEmpty(model.getAway_name())) {
 //                    tv_away_name_two.setText(model.getAway_name());
 //                }
-//                GlideUtil.loadTeamImageDefault(this, model.getAway_logo(), iv_away_logo_two);
+//                GlideUtil.loadTeamImageDefault(getContext(), model.getAway_logo(), iv_away_logo_two);
 //                String strOne = getContext().getString(R.string.match_starts_in);
 //                if (!TextUtils.isEmpty(model.getLive_time())) {
 //                    String strTwo = model.getLive_time();
 //                    SpannableStringBuilder builder = new SpannableStringBuilder(strOne + strTwo);
-//                    builder.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.c_DC3C23)), strOne.length(), (strOne.length() + strTwo.length()), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+//                    builder.setSpan(new ForegroundColorSpan(getContext().getResources().getColor(R.color.c_DC3C23)), strOne.length(), (strOne.length() + strTwo.length()), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
 //                    tv_center.setText(builder);
 //                } else {
 //                    tv_center.setText(strOne);

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

@@ -51,6 +51,7 @@ import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.util.Base64;
+import android.util.Log;
 import android.util.SparseIntArray;
 import android.util.TypedValue;
 import android.view.ActionMode;
@@ -83,9 +84,12 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.gms.common.api.Status;
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
 import com.google.firebase.appindexing.Action;
 import com.google.firebase.appindexing.FirebaseUserActions;
 import com.google.firebase.appindexing.builders.AssistActionBuilder;
+import com.google.firebase.messaging.FirebaseMessaging;
 import com.lxj.xpopup.XPopup;
 
 import org.telegram.PhoneFormat.PhoneFormat;
@@ -310,6 +314,30 @@ public class LaunchActivity extends BasePermissionsActivity implements ActionBar
     public static final int BLUETOOTH_CONNECT_TYPE = 0;
     private SparseIntArray requestedPermissions = new SparseIntArray();
     private int requsetPermissionsPointer = 5934;
+    private static final String TAG = "LaunchActivity";
+
+
+    private void getFCMToken() {
+        FirebaseMessaging.getInstance().getToken()
+                .addOnCompleteListener(new OnCompleteListener<String>() {
+                    @Override
+                    public void onComplete(@NonNull Task<String> task) {
+                        if (!task.isSuccessful()) {
+                            Log.w(TAG, "Fetching FCM registration token failed", task.getException());
+                            return;
+                        }
+
+                        // Get new FCM registration token
+                        String token = task.getResult();
+
+                        // Log and toast
+                        String msg = getString(R.string.msg_token_fmt, token);
+                        SPUtils.getInstance().save("registration_token", token);
+                        Log.e(TAG, msg);
+//                        Toast.makeText(MainActivity.this, msg, Toast.LENGTH_SHORT).show();
+                    }
+                });
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -318,6 +346,7 @@ public class LaunchActivity extends BasePermissionsActivity implements ActionBar
                     .detectLeakedClosableObjects()
                     .build());
         }
+        getFCMToken();
         ApplicationLoader.postInitApplication();
         AndroidUtilities.checkDisplaySize(this, getResources().getConfiguration());
         currentAccount = UserConfig.selectedAccount;

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

@@ -6067,6 +6067,7 @@
         "when a user tries to pick up one of cards.\n\n"
     </string>
     <string name="action_settings">Settings</string>
+    <string name="msg_token_fmt" translatable="false">FCM registration Token: %s</string>
 
 
 </resources>