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

@@ -56,6 +56,7 @@ public class CricketDetailPresenter extends BasePresenter<CricketDetailView> {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("id", matchId);
         jsonObject.put("type", 0);
+        jsonObject.put("app", "cricdit");
         addSubscription(apiStores.getCricketDetailUpdates(getRequestBody(jsonObject)), new ApiCallback() {
             @Override
             public void onSuccess(String data, String msg) {

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

@@ -514,7 +514,7 @@ public class CricketDetailActivity extends MvpActivity<CricketDetailPresenter> i
 
     private void getSubscribeType(CricketMatchBean item, ImageView subscribeIv) {//订阅推送消息
         showLoadingDialog();
-        new SubscribePresenter().getSubscribeType(item.getId(), new ApiCallback() {
+        new SubscribePresenter().getSubscribeType(item.getMatch_id(), new ApiCallback() {
             @Override
             public void onSuccess(String data, String msg) {
                 dismissLoadingDialog();
@@ -524,7 +524,7 @@ public class CricketDetailActivity extends MvpActivity<CricketDetailPresenter> i
                     DialogUtil.showSelectSubscribeDialog(CricketDetailActivity.this, item.getHome_name() + " VS " + item.getAway_name(), list, new DialogUtil.SelectSubscribeBack() {
                         @Override
                         public void onSelectSubscribe(String type) {
-                            doSubscribe(item.getId() + "", type, subscribeIv);
+                            doSubscribe(item.getMatch_id() + "", type, subscribeIv);
                         }
                     });
                 }

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

@@ -1599,7 +1599,7 @@ public class LaunchActivity extends BasePermissionsActivity implements ActionBar
         //
         // Handle possible data accompanying notification message.
         // [START handle_data_extras]
-        if (pintent.getExtras() != null) {
+        if (pintent.getExtras() != null && pintent.getExtras().containsKey("matchId")) {
 //            for (String key : getIntent().getExtras().keySet()) {
 //                Object value = getIntent().getExtras().get(key);
 //                Log.d(TAG, "Key: " + key + " Value: " + value);
@@ -1607,8 +1607,9 @@ public class LaunchActivity extends BasePermissionsActivity implements ActionBar
             Intent intent = new Intent();
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             Bundle bundle = pintent.getExtras();
+            int matchId = Integer.parseInt(bundle.getString("matchId"));
             intent.setClass(this, CricketDetailActivity.class);
-            intent.putExtra("matchId", Integer.parseInt(bundle.getString("matchId")));
+            intent.putExtra("matchId", matchId);
             intent.putExtra("isNotification", true);
             startActivity(intent);
         }