修改推送解析

BaseLibrary/src/main/java/com/cooleshow/base/utils/helper/PushIntentParseHelper.java

@@ -13,8 +13,8 @@ import org.json.JSONObject;
  */
 public class PushIntentParseHelper {
 
-    public static final String RONG_PUSH_SCHEME = "rong";//融云推送scheme
-    public static final String RONG_PUSH_ACTION_TAG = "rongIM";//融云推送action
+    public static final String TT_PUSH_SCHEME = "ttpushscheme";//腾讯推送scheme
+    public static final String TT_PUSH_ACTION_TAG = "tencent";//腾讯推送action
 
 
     /**
@@ -62,9 +62,9 @@ public class PushIntentParseHelper {
         String memo = "";
         Uri data = intent.getData();
         if (data != null && data.isHierarchical()) {
-            //判断是否是融云推送
-            if (TextUtils.equals(RONG_PUSH_SCHEME, data.getScheme())) {
-                memo = RONG_PUSH_ACTION_TAG;
+            //判断是否是腾讯推送
+            if (TextUtils.equals(TT_PUSH_SCHEME, data.getScheme())) {
+                memo = TT_PUSH_ACTION_TAG;
             }
         }
         if (TextUtils.isEmpty(memo)) {

institution/src/main/java/com/cooleshow/institution/stu/ui/main/MainActivity.java

@@ -16,7 +16,6 @@ import com.cooleshow.base.constanst.LoginStatusConstants;
 import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.event.LoginStatusEvent;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseActivity;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GsonUtils;
 import com.cooleshow.base.utils.JumpUtils;
@@ -52,8 +51,6 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import cn.jpush.android.api.JPushInterface;
 
-import static com.cooleshow.base.constanst.Constants.MAIN_PAGE_SELECT_POTION_KEY;
-
 /**
  * Author by pq, Date on 2023/9/11.
  */
@@ -135,7 +132,7 @@ public class MainActivity extends BaseMVPActivity<ActivityInstitutionMainLayoutB
         String intentResult = PushIntentParseHelper.getIntentMemoFrom(intent);
         LogUtils.i("pq", "intentResult:" + intentResult);
         if (!TextUtils.isEmpty(intentResult)) {
-            if (TextUtils.equals(intentResult, PushIntentParseHelper.RONG_PUSH_ACTION_TAG)) {
+            if (TextUtils.equals(intentResult, PushIntentParseHelper.TT_PUSH_ACTION_TAG)) {
                 //融云推送相关
                 //选中聊天
                 setPositionItem(2);

student/src/main/java/com/cooleshow/student/ui/main/MainActivity.java

@@ -7,7 +7,6 @@ import android.graphics.Typeface;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.KeyEvent;
-import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
@@ -20,13 +19,11 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.bean.RouteBean;
 import com.cooleshow.base.common.BaseApplication;
-import com.cooleshow.base.constanst.EventConstants;
 import com.cooleshow.base.constanst.LoginStatusConstants;
 import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.event.LoginStatusEvent;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
-import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.GsonUtils;
 import com.cooleshow.base.utils.JumpUtils;
@@ -43,21 +40,15 @@ import com.cooleshow.chatmodule.contract.IUnReadMessageObserver;
 import com.cooleshow.chatmodule.manager.IMCenter;
 import com.cooleshow.chatmodule.ui.ChatFragment;
 import com.cooleshow.chatmodule.utils.helper.IMThemManager;
-import com.cooleshow.student.App;
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.HomePageAdapter;
 import com.cooleshow.student.constants.CommonConfig;
 import com.cooleshow.student.contract.MainContract;
 import com.cooleshow.student.databinding.ActivityMainBinding;
-import com.cooleshow.student.helper.EventHelper;
 import com.cooleshow.student.presenter.main.MainPresenter;
 import com.cooleshow.usercenter.bean.StudentUserInfo;
-import com.cooleshow.usercenter.bean.UserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
-import com.google.android.material.bottomnavigation.BottomNavigationItemView;
-import com.google.android.material.bottomnavigation.BottomNavigationMenuView;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
-import com.google.gson.Gson;
 import com.tbruyelle.rxpermissions3.RxPermissions;
 import com.tencent.bugly.crashreport.CrashReport;
 
@@ -68,11 +59,6 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.util.ArrayList;
 
 import cn.jpush.android.api.JPushInterface;
-import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.core.ObservableEmitter;
-import io.reactivex.rxjava3.core.ObservableOnSubscribe;
-import io.reactivex.rxjava3.functions.Consumer;
-import io.reactivex.rxjava3.schedulers.Schedulers;
 
 import static com.cooleshow.base.constanst.Constants.MAIN_PAGE_SELECT_POTION_KEY;
 
@@ -147,7 +133,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
         String intentResult = PushIntentParseHelper.getIntentMemoFrom(intent);
         LogUtils.i("pq", "intentResult:" + intentResult);
         if (!TextUtils.isEmpty(intentResult)) {
-            if (TextUtils.equals(intentResult, PushIntentParseHelper.RONG_PUSH_ACTION_TAG)) {
+            if (TextUtils.equals(intentResult, PushIntentParseHelper.TT_PUSH_ACTION_TAG)) {
                 //融云推送相关
                 //选中聊天
                 setPositionItem(2);

tclive/build.gradle

@@ -70,7 +70,7 @@ dependencies {
     implementation 'com.alibaba:arouter-api:1.5.2'
     kapt 'com.alibaba:arouter-compiler:1.5.2'
 
-    compileOnly files('libs/LiteAVSDK_Professional_10.9.0.13102.aar')
+    compileOnly files('libs/LiteAVSDK_Professional_11.4.0.13189.aar')
     compileOnly files('libs/emoji-ios-release.aar')
     compileOnly files('libs/emoji-release.aar')
 }

teacher/src/main/java/com/cooleshow/teacher/ui/main/MainActivity.java

@@ -7,8 +7,6 @@ import android.graphics.Typeface;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
@@ -21,7 +19,6 @@ import com.cooleshow.base.event.LoginStatusEvent;
 import com.cooleshow.base.event.RefreshUserStatusEvent;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
-import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.GsonUtils;
 import com.cooleshow.base.utils.JumpUtils;
@@ -37,7 +34,6 @@ import com.cooleshow.base.widgets.TabAnimationView;
 import com.cooleshow.chatmodule.contract.IUnReadMessageObserver;
 import com.cooleshow.chatmodule.manager.IMCenter;
 import com.cooleshow.chatmodule.ui.ChatFragment;
-import com.cooleshow.teacher.App;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.HomePageAdapter;
 import com.cooleshow.teacher.bean.TeacherPromoteIncomeBean;
@@ -45,15 +41,9 @@ import com.cooleshow.teacher.contract.MainContract;
 import com.cooleshow.teacher.databinding.ActivityMainBinding;
 import com.cooleshow.teacher.presenter.main.MainPresenter;
 import com.cooleshow.usercenter.bean.TeacherUserInfo;
-import com.cooleshow.usercenter.bean.UserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
-import com.google.android.material.bottomnavigation.BottomNavigationItemView;
-import com.google.android.material.bottomnavigation.BottomNavigationMenuView;
-import com.google.android.material.bottomnavigation.BottomNavigationView;
-import com.google.android.material.snackbar.Snackbar;
 import com.tbruyelle.rxpermissions3.RxPermissions;
 import com.tencent.bugly.crashreport.CrashReport;
-import com.tencent.open.im.IM;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -66,11 +56,6 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import cn.jpush.android.api.JPushInterface;
-import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.core.ObservableEmitter;
-import io.reactivex.rxjava3.core.ObservableOnSubscribe;
-import io.reactivex.rxjava3.functions.Consumer;
-import io.reactivex.rxjava3.schedulers.Schedulers;
 
 import static com.cooleshow.base.constanst.Constants.MAIN_PAGE_SELECT_POTION_KEY;
 
@@ -147,7 +132,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
         String intentResult = PushIntentParseHelper.getIntentMemoFrom(intent);
         LogUtils.i("pq", "intentResult:" + intentResult);
         if (!TextUtils.isEmpty(intentResult)) {
-            if (TextUtils.equals(intentResult, PushIntentParseHelper.RONG_PUSH_ACTION_TAG)) {
+            if (TextUtils.equals(intentResult, PushIntentParseHelper.TT_PUSH_ACTION_TAG)) {
                 //融云推送相关
                 //选中聊天
                 setPositionItem(2);