diff --git a/app/build.gradle b/app/build.gradle index 63524e17e..3297a59cf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -65,11 +65,7 @@ android { storePassword "accompanyplay" keyAlias "66accompany" keyPassword "accompanyplay" - if (sign_mode == "v1v2") { - v2SigningEnabled true - } else { - v2SigningEnabled false - } + v2SigningEnabled false v1SigningEnabled true } @@ -158,7 +154,7 @@ android { minifyEnabled false shrinkResources false - signingConfig signingConfigs.v1 + signingConfig signingConfigs.v2 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -215,7 +211,6 @@ dependencies { api "com.github.zyyoona7:EasyPopup:1.0.2" api "com.github.donkingliang:LabelsView:1.2.0" api "com.github.yyued:SVGAPlayer-Android:2.5.3" - api "com.mcxiaoke.packer-ng:helper:2.0.0" implementation "com.orhanobut:logger:2.2.0" api "com.ms-square:expandableTextView:0.1.4" api "com.jakewharton:butterknife:10.1.0" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c91e509f7..0a1ec8fa2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -92,6 +92,11 @@ android:theme="@style/MyMaterialTheme" android:usesCleartextTraffic="true" tools:replace="android:name, android:allowBackup"> + + + private void updateDatas() { - if ("baidutg".equals(PackerNg.getChannel(this))) { + if ("baidutg".equals(AppMetaDataUtil.getChannelID())) { mMainTabLayout.select(MainTabLayout.MAIN_TAB_POS_HOME); } else { mMainTabLayout.select(mCurrentMainPosition); diff --git a/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java b/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java index 85e062dd4..5ad3054d2 100644 --- a/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java +++ b/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.application; import android.app.Activity; import com.tongdaxing.erban.upgrade.AppUpgradeHelper; -import com.trello.rxlifecycle2.components.support.RxAppCompatActivity; +import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; import com.yizhuan.erban.ui.widget.lottery_dialog.LotteryDialogManager; import com.yizhuan.xchat_android_core.activity.bean.LotteryInfo; import com.yizhuan.xchat_android_core.upgrade.event.ImPushUpdateAppEvent; diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java index 3e630c8bf..f8ac78fe2 100644 --- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java +++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java @@ -5,23 +5,26 @@ import android.annotation.TargetApi; import android.app.ActivityManager; import android.app.Application; import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; import android.graphics.Color; import android.net.http.HttpResponseCache; import android.os.Build; import android.os.Environment; import android.os.StrictMode; -import androidx.multidex.MultiDex; import android.text.TextUtils; import android.util.ArrayMap; import android.util.Log; +import androidx.multidex.MultiDex; + import com.alibaba.security.rp.RPSDK; import com.alipay.sdk.app.EnvUtils; import com.baidu.mobstat.StatService; import com.bumptech.glide.request.target.ViewTarget; +import com.coorchice.library.utils.LogUtils; import com.ishumei.smantifraud.SmAntiFraud; import com.llew.huawei.verifier.LoadedApkHuaWei; -import com.mcxiaoke.packer.helper.PackerNg; import com.microquation.linkedme.android.LinkedME; import com.mob.MobSDK; import com.netease.mobsec.rjsb.watchman; @@ -139,7 +142,17 @@ public class XChatApplication extends Application { super.onCreate(); instance = this; - String channel = PackerNg.getChannel(this); + String channel = "official"; + try { + ApplicationInfo appInfo = getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA); + channel = appInfo.metaData.getString("CHANNEL"); + } catch (Exception e) { + e.printStackTrace(); + } + if (TextUtils.isEmpty(channel)) { + channel = "official"; + } + LogUtils.d(channel + ""); initEnv(channel); // 注册自定义推送消息处理，这个是可选项 @@ -551,11 +564,11 @@ public class XChatApplication extends Application { // initBaiduStatistic(channel); 百度统计 initUmengAppStatistic(channel); - if (isDebug()) { + /* if (isDebug()) { //禁掉沙盒模式 EnvUtils.setEnv(EnvUtils.EnvEnum.SANDBOX); } - +*/ RPSDK.initialize(getApplicationContext()); } diff --git a/app/src/main/java/com/yizhuan/erban/audio/VoiceMatchActivity.java b/app/src/main/java/com/yizhuan/erban/audio/VoiceMatchActivity.java index 3e0ad93f1..3500756f9 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/VoiceMatchActivity.java +++ b/app/src/main/java/com/yizhuan/erban/audio/VoiceMatchActivity.java @@ -17,7 +17,7 @@ import android.widget.TextView; import com.opensource.svgaplayer.SVGACallback; import com.opensource.svgaplayer.SVGAImageView; -import com.trello.rxlifecycle2.android.ActivityEvent; +import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.UIHelper; import com.yizhuan.erban.audio.helper.AudioPlayerHelper; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/RecordForPKActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/RecordForPKActivity.java index 637f95538..ededc4a8d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/RecordForPKActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/RecordForPKActivity.java @@ -8,7 +8,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.trello.rxlifecycle2.android.ActivityEvent; +import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.adapter.RecordForPKAdapter; import com.yizhuan.erban.avroom.presenter.RecordForPKPresenter; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomBlackListActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomBlackListActivity.java index f9c955d6c..601fad33c 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomBlackListActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomBlackListActivity.java @@ -9,7 +9,7 @@ import android.view.View; import android.widget.TextView; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.trello.rxlifecycle2.android.ActivityEvent; +import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.adapter.RoomNormalListAdapter; import com.yizhuan.erban.avroom.presenter.RoomBlackPresenter; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java index a1dbdcda9..6c2c5be8f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java @@ -4,17 +4,9 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.content.res.AssetFileDescriptor; - -import androidx.databinding.DataBindingUtil; - import android.graphics.Color; import android.media.MediaPlayer; import android.os.Bundle; - -import androidx.annotation.Nullable; -import androidx.viewpager.widget.ViewPager; -import androidx.appcompat.widget.AppCompatImageView; - import android.text.TextUtils; import android.text.style.ForegroundColorSpan; import android.view.LayoutInflater; @@ -26,6 +18,11 @@ import android.view.animation.AnimationUtils; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatImageView; +import androidx.databinding.DataBindingUtil; +import androidx.viewpager.widget.ViewPager; + import com.coorchice.library.SuperTextView; import com.netease.nim.uikit.common.util.string.StringUtil; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; @@ -36,28 +33,27 @@ import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; -import com.trello.rxlifecycle2.android.FragmentEvent; +import com.trello.rxlifecycle3.android.FragmentEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.UIHelper; import com.yizhuan.erban.avroom.activity.AVRoomActivity; import com.yizhuan.erban.avroom.activity.RoomOnlineUserActivity; import com.yizhuan.erban.avroom.presenter.HomePartyPresenter; -import com.yizhuan.erban.home.event.FollowRoomEvent; -import com.yizhuan.erban.home.model.CollectionRoomModel; -import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper; import com.yizhuan.erban.avroom.widget.GiftV2View; import com.yizhuan.erban.avroom.widget.MessageView; import com.yizhuan.erban.base.BaseMvpActivity; import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.databinding.FragmentChatroomGameMainBinding; import com.yizhuan.erban.friend.view.SelectFriendActivity; +import com.yizhuan.erban.home.event.FollowRoomEvent; +import com.yizhuan.erban.home.model.CollectionRoomModel; +import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper; import com.yizhuan.erban.ui.widget.ButtonItem; import com.yizhuan.erban.ui.widget.ShareDialog; import com.yizhuan.erban.utils.RegexUtil; import com.yizhuan.xchat_android_constants.XChatConstants; import com.yizhuan.xchat_android_core.Constants; import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.KickOutEvent; import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; @@ -71,11 +67,9 @@ import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.redPacket.bean.ActionDialogInfo; import com.yizhuan.xchat_android_core.room.bean.RoomInfo; import com.yizhuan.xchat_android_core.room.game.GameEvent; import com.yizhuan.xchat_android_core.room.game.GameResultInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; import com.yizhuan.xchat_android_core.room.queuing_mic.event.HasAnimationEffect; import com.yizhuan.xchat_android_core.share.ShareModel; import com.yizhuan.xchat_android_core.statistic.StatisticManager; @@ -85,7 +79,6 @@ import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; import com.yizhuan.xchat_android_library.rxbus.RxBus; import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -750,13 +743,14 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi public void onSharePlatformClick(Platform platform) { RoomInfo currentRoomInfo = AvRoomDataManager.get().mCurrentRoomInfo; if (currentRoomInfo != null) { - ShareModel.get().shareRoom( - platform, - currentRoomInfo.getUid(), - currentRoomInfo.getRoomId(), - currentRoomInfo.getTitle(), - currentRoomInfo.getAvatar() - ) + UserModel.get().getUserInfo(currentRoomInfo.getUid()) + .flatMap(userInfo -> ShareModel.get().shareRoom( + platform, + currentRoomInfo.getUid(), + userInfo.getErbanNo(), + currentRoomInfo.getTitle(), + currentRoomInfo.getAvatar() + )) .compose(bindUntilEvent(FragmentEvent.DESTROY)) .doAfterTerminate(new Action() { @Override diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java index 6df9922c5..00b4b833b 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java @@ -46,7 +46,7 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomStatusChangeData; import com.orhanobut.logger.Logger; import com.tbruyelle.rxpermissions2.RxPermissions; import com.tongdaxing.erban.sadmin.RoomSAdminManagerActivity; -import com.trello.rxlifecycle2.android.FragmentEvent; +import com.trello.rxlifecycle3.android.FragmentEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.BottomViewListenerWrapper; import com.yizhuan.erban.avroom.ButtonItemFactory; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListActivity.java index 7a7c6b96c..ad79093b5 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListActivity.java @@ -8,7 +8,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.recyclerview.widget.LinearLayoutManager; import android.view.View; -import com.trello.rxlifecycle2.android.ActivityEvent; +import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.BR; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java index 777c020b6..38ecba722 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java @@ -10,7 +10,7 @@ import android.view.View; import android.view.ViewGroup; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.trello.rxlifecycle2.android.FragmentEvent; +import com.trello.rxlifecycle3.android.FragmentEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseFragment; import com.yizhuan.erban.base.list.BaseViewHolder; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java index 99f6affc4..9410f7b19 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java @@ -13,8 +13,8 @@ import android.view.View; import android.widget.EditText; import android.widget.TextView; -import com.trello.rxlifecycle2.android.ActivityEvent; -import com.trello.rxlifecycle2.components.support.RxAppCompatActivity; +import com.trello.rxlifecycle3.android.ActivityEvent; +import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; import com.yizhuan.erban.R; import com.yizhuan.erban.utils.KeyBoardUtils; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java index 2c5aec6f5..282403e64 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java @@ -46,7 +46,7 @@ import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.orhanobut.logger.Logger; import com.tongdaxing.erban.sadmin.utils.SaAttachmentToMsgUtil; -import com.trello.rxlifecycle2.android.FragmentEvent; +import com.trello.rxlifecycle3.android.FragmentEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.UIHelper; import com.yizhuan.erban.avroom.activity.AVRoomActivity; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java index 2e7ce6d77..3217887d5 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java @@ -32,8 +32,8 @@ import com.netease.nimlib.sdk.msg.model.BroadcastMessage; import com.orhanobut.logger.Logger; import com.readystatesoftware.systembartint.SystemBarTintManager; import com.tbruyelle.rxpermissions2.RxPermissions; -import com.trello.rxlifecycle2.android.ActivityEvent; -import com.trello.rxlifecycle2.components.support.RxAppCompatActivity; +import com.trello.rxlifecycle3.android.ActivityEvent; +import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; import com.yizhuan.erban.MiddleActivity; import com.yizhuan.erban.NimMiddleActivity; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseFragment.java b/app/src/main/java/com/yizhuan/erban/base/BaseFragment.java index 1e678e951..96f3bbd82 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseFragment.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseFragment.java @@ -17,7 +17,7 @@ import android.view.ViewGroup; import android.widget.Toast; import com.tbruyelle.rxpermissions2.RxPermissions; -import com.trello.rxlifecycle2.components.support.RxFragment; +import com.trello.rxlifecycle3.components.support.RxFragment; import com.yizhuan.erban.R; import com.yizhuan.erban.application.XChatApplication; import com.yizhuan.erban.common.AbsStatusFragment; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMsListViewModel.java b/app/src/main/java/com/yizhuan/erban/base/BaseMsListViewModel.java index abf8f4dca..9094bcb3b 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseMsListViewModel.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseMsListViewModel.java @@ -5,7 +5,7 @@ import androidx.databinding.ObservableBoolean; import androidx.databinding.ObservableField; import androidx.databinding.ViewDataBinding; -import com.trello.rxlifecycle2.LifecycleProvider; +import com.trello.rxlifecycle3.LifecycleProvider; import com.yizhuan.xchat_android_core.Constants; import com.yizhuan.xchat_android_core.bean.response.ServiceResult; import com.yizhuan.xchat_android_core.utils.net.RxHelper; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java index c29182055..ba7926d68 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java @@ -32,7 +32,7 @@ import com.netease.nimlib.sdk.msg.model.BroadcastMessage; import com.orhanobut.logger.Logger; import com.readystatesoftware.systembartint.SystemBarTintManager; import com.tbruyelle.rxpermissions2.RxPermissions; -import com.trello.rxlifecycle2.android.ActivityEvent; +import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.application.XChatApplication; import com.yizhuan.erban.common.LoadingFragment; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/BaseRecyclerView.java b/app/src/main/java/com/yizhuan/erban/base/list/BaseRecyclerView.java index 55301a02a..c59f29dc5 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/BaseRecyclerView.java +++ b/app/src/main/java/com/yizhuan/erban/base/list/BaseRecyclerView.java @@ -10,12 +10,12 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.StaggeredGridLayoutManager; import android.util.AttributeSet; -import com.trello.rxlifecycle2.LifecycleProvider; -import com.trello.rxlifecycle2.android.ActivityEvent; -import com.trello.rxlifecycle2.android.FragmentEvent; -import com.trello.rxlifecycle2.components.RxActivity; -import com.trello.rxlifecycle2.components.support.RxAppCompatActivity; -import com.trello.rxlifecycle2.components.support.RxFragment; +import com.trello.rxlifecycle3.LifecycleProvider; +import com.trello.rxlifecycle3.android.ActivityEvent; +import com.trello.rxlifecycle3.android.FragmentEvent; +import com.trello.rxlifecycle3.components.RxActivity; +import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; +import com.trello.rxlifecycle3.components.support.RxFragment; import com.yizhuan.xchat_android_library.utils.ListUtils; import java.util.ArrayList; @@ -329,9 +329,9 @@ public abstract class BaseRecyclerView extends S } else if (provider instanceof RxActivity) { RxActivity activity = (RxActivity) provider; return upstream.compose(activity.bindUntilEvent(ActivityEvent.DESTROY)); - } else if (provider instanceof com.trello.rxlifecycle2.components.RxFragment) { - com.trello.rxlifecycle2.components.RxFragment fragment = - (com.trello.rxlifecycle2.components.RxFragment) provider; + } else if (provider instanceof com.trello.rxlifecycle3.components.RxFragment) { + com.trello.rxlifecycle3.components.RxFragment fragment = + (com.trello.rxlifecycle3.components.RxFragment) provider; return upstream.compose(fragment.bindUntilEvent(FragmentEvent.DESTROY)); } return upstream; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java b/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java index d496a9bfd..748826a49 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; -import com.trello.rxlifecycle2.android.ActivityEvent; +import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseBindingActivity; import com.yizhuan.erban.databinding.ActivityMyDecorationBinding; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java b/app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java index b4f175ffd..425255f43 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java @@ -6,7 +6,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import android.util.Log; import android.view.View; -import com.trello.rxlifecycle2.android.FragmentEvent; +import com.trello.rxlifecycle3.android.FragmentEvent; import com.yizhuan.erban.BR; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseBindingFragment; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyNamePlateFragment.java b/app/src/main/java/com/yizhuan/erban/decoration/view/MyNamePlateFragment.java index 35ea70f3a..13cd540ed 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyNamePlateFragment.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/MyNamePlateFragment.java @@ -7,7 +7,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import android.view.View; -import com.trello.rxlifecycle2.android.FragmentEvent; +import com.trello.rxlifecycle3.android.FragmentEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseFragment; import com.yizhuan.erban.common.NoDataFragment; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyGameListActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyGameListActivity.java index a5cded4b0..5ab2782ad 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyGameListActivity.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyGameListActivity.java @@ -13,7 +13,7 @@ import com.netease.nim.uikit.common.util.sys.NetworkUtil; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; -import com.trello.rxlifecycle2.android.ActivityEvent; +import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseMvpActivity; import com.yizhuan.erban.family.contract.viewinterface.IFamilyGameListActivityView; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java index f89e8df09..cb1388255 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java @@ -19,7 +19,7 @@ import android.widget.TextView; import com.makeramen.roundedimageview.RoundedImageView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.trello.rxlifecycle2.android.ActivityEvent; +import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseMvpActivity; import com.yizhuan.erban.base.TitleBar; diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/AllGameActivity.java b/app/src/main/java/com/yizhuan/erban/home/activity/AllGameActivity.java index 247e70b14..73035ae2e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/activity/AllGameActivity.java +++ b/app/src/main/java/com/yizhuan/erban/home/activity/AllGameActivity.java @@ -6,7 +6,7 @@ import android.text.SpannableString; import android.text.TextUtils; import android.view.View; -import com.trello.rxlifecycle2.android.ActivityEvent; +import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.BR; import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.game.MatchActivity; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java index 1325c87ce..2d2655198 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java @@ -44,7 +44,7 @@ import com.jude.rollviewpager.hintview.ColorPointHintView; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nim.uikit.support.glide.GlideApp; -import com.trello.rxlifecycle2.android.FragmentEvent; +import com.trello.rxlifecycle3.android.FragmentEvent; import com.yizhuan.erban.MainActivity; import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.activity.AVRoomActivity; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeOtherTabFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeOtherTabFragment.java index 1fc00d119..29eefd31b 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeOtherTabFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeOtherTabFragment.java @@ -13,7 +13,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; -import com.trello.rxlifecycle2.android.FragmentEvent; +import com.trello.rxlifecycle3.android.FragmentEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseFragment; import com.yizhuan.erban.common.NoDataFragment; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java index 494d40faa..d4b07bab9 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java @@ -12,7 +12,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.coorchice.library.utils.LogUtils; -import com.trello.rxlifecycle2.android.FragmentEvent; +import com.trello.rxlifecycle3.android.FragmentEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.common.NoDataFragment; import com.yizhuan.erban.home.adapter.HomeRoomFragmentAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java index 1a0be6c8a..0ce64e75e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java @@ -1,9 +1,5 @@ package com.yizhuan.erban.home.fragment; -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; -import androidx.core.content.ContextCompat; -import androidx.viewpager.widget.ViewPager; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; @@ -11,7 +7,11 @@ import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; -import com.mcxiaoke.packer.helper.PackerNg; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.activity.AVRoomActivity; import com.yizhuan.erban.base.BaseMvpFragment; @@ -33,7 +33,6 @@ import com.yizhuan.erban.ui.widget.magicindicator.ext.MainCommonNavigatorAdapter import com.yizhuan.xchat_android_core.UriProvider; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.certification.CertificationModel; -import com.yizhuan.xchat_android_core.family.bean.HomeBannerInfo; import com.yizhuan.xchat_android_core.home.bean.BannerInfo; import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo; import com.yizhuan.xchat_android_core.home.bean.TagListInfo; @@ -45,6 +44,7 @@ import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; +import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; import java.util.ArrayList; import java.util.List; @@ -244,7 +244,7 @@ public class MainFragment extends BaseMvpFragment 1. 子类的Presenter必须继承自AbstractMvpPresenter； diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpFragment.java b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpFragment.java index cd2160958..c34d8b1d9 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpFragment.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpFragment.java @@ -8,7 +8,7 @@ import com.yizhuan.xchat_android_library.base.factory.BaseMvpProxy; import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactory; import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactoryImpl; import com.yizhuan.xchat_android_library.base.factory.PresenterProxyInterface; -import com.trello.rxlifecycle2.components.support.RxFragment; +import com.trello.rxlifecycle3.components.support.RxFragment; /** *

1. 子类的Presenter必须继承自AbstractMvpPresenter； diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpPresenter.java b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpPresenter.java index 3a8d94bc1..6e2d33c74 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpPresenter.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpPresenter.java @@ -5,10 +5,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import android.util.Log; -import com.trello.rxlifecycle2.LifecycleProvider; -import com.trello.rxlifecycle2.LifecycleTransformer; -import com.trello.rxlifecycle2.OutsideLifecycleException; -import com.trello.rxlifecycle2.RxLifecycle; +import com.trello.rxlifecycle3.LifecycleProvider; +import com.trello.rxlifecycle3.LifecycleTransformer; +import com.trello.rxlifecycle3.OutsideLifecycleException; +import com.trello.rxlifecycle3.RxLifecycle; import io.reactivex.Observable; import io.reactivex.functions.Function; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivity.java b/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivity.java index e4c3bdc34..8d95f303c 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivity.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivity.java @@ -6,7 +6,7 @@ import android.os.Bundle; import android.view.View; import android.view.inputmethod.InputMethodManager; -import com.trello.rxlifecycle2.components.support.RxAppCompatActivity; +import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; import java.lang.reflect.Field;