moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "迁移Android X"

Browse Source 
This reverts commit 6df2d64ddb.
This commit is contained in:
oujunhui
2020-04-09 12:35:00 +08:00
parent c8b351c82e
commit 06bd068125
1188 changed files with 3322 additions and 2788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/build.gradle
View File

@@ -9,7 +9,7 @@ android {
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
flavorDimensions 'default'
}
@@ -87,8 +87,8 @@ android {
}
def link_page = "1.1.9"
def loggerVersion = "2.2.0"
def link_page = "1.1.2"
def loggerVersion = "2.1.1"
def BaiduMtjVersion = "3.8.2.1"
def Lombok = "1.16.20"
def room_version = "1.1.1"
@@ -98,8 +98,8 @@ def umeng_analytics = "8.1.4"
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
api "cc.linkedme.deeplinks:link-page:${link_page}"
@@ -124,7 +124,7 @@ dependencies {
api 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:5.1.6'
// 声网
api 'io.agora.rtc:full-sdk:2.9.4'
api 'io.agora.rtc:full-sdk:2.4.1'
// 易盾
api 'com.netease.mobsec:netmobsecLib:4.2.4.1@aar'
@@ -139,10 +139,10 @@ dependencies {
// provide okhttp to connect to backend
implementation 'com.liulishuo.okdownload:okhttp:1.0.4'
// Room
api 'androidx.room:room-runtime:2.2.5'
annotationProcessor 'androidx.room:room-compiler:2.2.5'
api "android.arch.persistence.room:runtime:${room_version}"
annotationProcessor "android.arch.persistence.room:compiler:1.1.0"
// RxJava support for Room
api 'androidx.room:room-rxjava2:2.2.5'
api "android.arch.persistence.room:rxjava2:${room_version}"
api project(':nim_uikit')

4
core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java
View File

@@ -1,8 +1,8 @@
package com.yizhuan.xchat_android_core;
import android.content.Context;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.manager;
import androidx.annotation.NonNull;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.util.Log;
import android.util.SparseArray;

4
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java
View File

@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
@@ -149,7 +149,7 @@ public final class RtcEngineManager {
//设置频道模式为直播
mRtcEngine.setChannelProfile(Constants.CHANNEL_PROFILE_LIVE_BROADCASTING);
mRtcEngine.setAudioProfile(quality, audioShowRoom);
mRtcEngine.enableAudioVolumeIndication(600, 3,false);
mRtcEngine.enableAudioVolumeIndication(600, 3);
mRtcEngine.setDefaultAudioRoutetoSpeakerphone(true);
mRtcEngine.setExternalVideoSource(true, false, true);
mRtcEngine.setRecordingAudioFrameParameters(48000, 2, 2, 960);

2
core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
View File

@@ -2,7 +2,7 @@ package com.yizhuan.xchat_android_core.manager;
import android.os.Handler;
import android.os.Message;
import androidx.annotation.NonNull;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.util.Log;
import android.util.SparseArray;

2
core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java
View File

@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;

2
core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_core;
import android.content.Context;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import com.google.gson.Gson;

2
core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.exception;
import androidx.annotation.StringDef;
import android.support.annotation.StringDef;
/**
* <p> </p>

2
core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.family.bean;
import androidx.annotation.DrawableRes;
import android.support.annotation.DrawableRes;
import lombok.Data;

2
core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_core.family.model;
import android.annotation.SuppressLint;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import com.orhanobut.logger.Logger;

3
core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java
View File

@@ -1,8 +1,9 @@
package com.yizhuan.xchat_android_core.family.model;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import com.yizhuan.xchat_android_core.base.IModel;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.family.bean.FamilyCustomServiceInfo;
import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo;
import com.yizhuan.xchat_android_core.family.bean.FamilyInfo;

2
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldAttachment.java
View File

@@ -4,9 +4,7 @@ import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
public class JoinMiniWorldAttachment extends CustomAttachment {
private MiniWorldInWorldInfo miniWorldInfo;

2
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldNoticeAttachment.java
View File

@@ -5,12 +5,10 @@ import com.alibaba.fastjson.JSONObject;
import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 加入小世界的通知
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class JoinMiniWorldNoticeAttachment extends CustomAttachment {

3
core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.magic;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
import com.yizhuan.xchat_android_core.base.IModel;
@@ -8,6 +8,7 @@ import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.magic.bean.MagicInfo;
import com.yizhuan.xchat_android_core.magic.bean.MagicMultiReceiverInfo;
import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo;
import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo;
import java.util.List;

4
core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java
View File

@@ -3,7 +3,7 @@ package com.yizhuan.xchat_android_core.magic;
import android.annotation.SuppressLint;
import android.os.Handler;
import android.os.Message;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
@@ -21,6 +21,7 @@ import com.yizhuan.xchat_android_core.pay.PayModel;
import com.yizhuan.xchat_android_core.retry.ImRetryManager;
import com.yizhuan.xchat_android_core.retry.RetryChatRoomMessage;
import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueCommonUpdate;
import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue;
import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg;
import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption;
import com.yizhuan.xchat_android_core.utils.net.FreezeException;
@@ -42,6 +43,7 @@ import java.util.ArrayList;
import java.util.List;
import io.reactivex.Single;
import io.reactivex.functions.BiConsumer;
import io.reactivex.functions.Consumer;
import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded;

2
core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
View File

@@ -3,7 +3,7 @@ package com.yizhuan.xchat_android_core.manager;
import android.annotation.SuppressLint;
import android.graphics.Point;
import android.graphics.drawable.Drawable;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
import android.util.SparseArray;

2
core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.noble;
import androidx.collection.LongSparseArray;
import android.support.v4.util.LongSparseArray;
import android.text.TextUtils;
import android.util.Log;

8
core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java
View File

@@ -11,8 +11,8 @@ import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.NinePatchDrawable;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import android.support.annotation.Nullable;
import android.support.v4.app.FragmentActivity;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
@@ -27,6 +27,10 @@ import com.bumptech.glide.request.transition.Transition;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.FaceAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.RoomTipAttachment;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.ExtensionUtil;
import com.yizhuan.xchat_android_core.utils.ImageSplitter;

5
core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.room.bean;
import androidx.annotation.NonNull;
import android.support.annotation.NonNull;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
@@ -15,6 +15,9 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import lombok.Getter;
import lombok.Setter;
/**
* <p> 在线用户列表，包装 {@link ChatRoomMember} </p>
*

4
core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_core.room.giftvalue.bean;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.Observer;
import android.arch.lifecycle.MutableLiveData;
import android.arch.lifecycle.Observer;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;

2
core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/KtvEvent.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.room.ktv.event;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo;
public class KtvEvent {

3
core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.room.model;
import androidx.annotation.NonNull;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import com.netease.nimlib.sdk.chatroom.constant.MemberType;
@@ -16,6 +16,7 @@ import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.model.inteface.IHomePartyUserListModel;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
import com.yizhuan.xchat_android_library.utils.ListUtils;

6
core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java
View File

@@ -1,18 +1,22 @@
package com.yizhuan.xchat_android_core.room.pk.model;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import com.yizhuan.xchat_android_core.base.IModel;
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKQueuingMicMemberInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordListInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKRespQueuingMicListInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamMember;
import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember;
import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import java.util.List;
import io.reactivex.FlowableOnSubscribe;
import io.reactivex.Single;
public interface IPkModel extends IModel {

4
core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
View File

@@ -2,8 +2,9 @@ package com.yizhuan.xchat_android_core.room.pk.model;
import android.annotation.SuppressLint;
import android.os.CountDownTimer;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import android.util.SparseArray;
import android.widget.Toast;
import com.google.gson.Gson;
import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
@@ -54,6 +55,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.TimeUnit;

2
core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomQueueInfo.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.room.queue.bean;
import androidx.annotation.IntDef;
import android.support.annotation.IntDef;
import com.alibaba.fastjson.JSONObject;

2
core/src/main/java/com/yizhuan/xchat_android_core/statistic/AliyunLogToken.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.statistic;
import androidx.annotation.Keep;
import android.support.annotation.Keep;
/**
* <p> </p>

2
core/src/main/java/com/yizhuan/xchat_android_core/statistic/LogFile.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.statistic;
import androidx.annotation.Keep;
import android.support.annotation.Keep;
import com.orhanobut.logger.Logger;
import com.yizhuan.xchat_android_library.utils.FileUtils;

2
core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java
View File

@@ -2,7 +2,7 @@ package com.yizhuan.xchat_android_core.statistic;
import android.annotation.SuppressLint;
import android.content.Context;
import androidx.annotation.Keep;
import android.support.annotation.Keep;
import android.text.TextUtils;
import com.netease.nim.uikit.common.util.log.LogUtil;

2
core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_core.statistic;
import android.content.Context;
import androidx.annotation.Keep;
import android.support.annotation.Keep;
import com.baidu.mobstat.StatService;
import com.umeng.analytics.MobclickAgent;

3
core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java
View File

@@ -1,11 +1,12 @@
package com.yizhuan.xchat_android_core.user;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import com.yizhuan.xchat_android_core.base.IModel;
import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.user.bean.GiftAchievementInfo;
import com.yizhuan.xchat_android_core.user.bean.LiveTagInfo;
import com.yizhuan.xchat_android_core.user.bean.NewUserInfo;
import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo;
import com.yizhuan.xchat_android_core.user.bean.UserGameInfo;

8
core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java
View File

@@ -1,11 +1,13 @@
package com.yizhuan.xchat_android_core.user;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.Observer;
import android.arch.lifecycle.LifecycleOwner;
import android.arch.lifecycle.MutableLiveData;
import android.arch.lifecycle.Observer;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import org.greenrobot.eventbus.EventBus;
/**
* 个人主页/客态页用户信息监听
*/

4
core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java
View File

@@ -1,8 +1,8 @@
package com.yizhuan.xchat_android_core.user;
import android.annotation.SuppressLint;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.LruCache;

2
core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_core.utils;
import android.graphics.Bitmap;
import androidx.collection.LruCache;
import android.support.v4.util.LruCache;
import android.util.Log;
/**

2
core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/DynamicSysAttachment.java
View File

@@ -6,9 +6,7 @@ import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgInfo;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
public class DynamicSysAttachment extends CustomAttachment {
private ErbanSysMsgInfo erbanSysMsgInfo;

11
core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/DownloadModel.java
View File

@@ -1,10 +1,13 @@
package com.yizhuan.xchat_android_core.community.download;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.os.Environment;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.liulishuo.okdownload.DownloadListener;
import com.liulishuo.okdownload.DownloadSerialQueue;
import com.liulishuo.okdownload.DownloadTask;
import com.liulishuo.okdownload.core.breakpoint.BreakpointInfo;
import com.liulishuo.okdownload.core.cause.EndCause;
import com.liulishuo.okdownload.core.cause.ResumeFailedCause;
import com.liulishuo.okdownload.core.listener.DownloadListener1;
@@ -12,8 +15,12 @@ import com.liulishuo.okdownload.core.listener.assist.Listener1Assist;
import com.yizhuan.xchat_android_core.base.BaseModel;
import java.io.File;
import java.util.List;
import java.util.Map;
import io.reactivex.Single;
import io.reactivex.SingleEmitter;
import io.reactivex.SingleOnSubscribe;
/**
* create by lvzebiao @2019/11/22

6
core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java
View File

@@ -1,8 +1,8 @@
package com.yizhuan.tutu.database;
import androidx.room.Database;
import androidx.room.Room;
import androidx.room.RoomDatabase;
import android.arch.persistence.room.Database;
import android.arch.persistence.room.Room;
import android.arch.persistence.room.RoomDatabase;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean;

3
core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldModel.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.miniworld.model;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import com.google.gson.JsonElement;
import com.yizhuan.xchat_android_core.auth.AuthModel;
@@ -22,6 +22,7 @@ import com.yizhuan.xchat_android_core.miniworld.bean.TopicInfo;
import com.yizhuan.xchat_android_core.monsterhunting.model.MonsterHuntingModel;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import java.util.ArrayList;
import java.util.Collections;

2
core/src/model_multi_domain/java/com/yizhuan/xchat_android_core/domain/model/DomainModel.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.domain.model;
import androidx.annotation.NonNull;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.util.Log;

13
core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java
View File

@@ -1,9 +1,14 @@
package com.yizhuan.xchat_android_core.music.db.bean;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.Index;
import androidx.room.PrimaryKey;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
import android.arch.persistence.room.Index;
import android.arch.persistence.room.PrimaryKey;
import com.yizhuan.xchat_android_library.utils.BlankUtil;
import com.yizhuan.xchat_android_library.utils.json.JsonParser;
import java.util.List;
import lombok.Data;

8
core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java
View File

@@ -1,9 +1,9 @@
package com.yizhuan.xchat_android_core.music.db.bean;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.Index;
import androidx.room.PrimaryKey;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
import android.arch.persistence.room.Index;
import android.arch.persistence.room.PrimaryKey;
import lombok.Data;

10
core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java
View File

@@ -1,10 +1,10 @@
package com.yizhuan.xchat_android_core.music.db.dao;
import androidx.room.Dao;
import androidx.room.Delete;
import androidx.room.Insert;
import androidx.room.OnConflictStrategy;
import androidx.room.Query;
import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Delete;
import android.arch.persistence.room.Insert;
import android.arch.persistence.room.OnConflictStrategy;
import android.arch.persistence.room.Query;
import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean;

10
core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java
View File

@@ -1,10 +1,10 @@
package com.yizhuan.xchat_android_core.music.db.dao;
import androidx.room.Dao;
import androidx.room.Delete;
import androidx.room.Insert;
import androidx.room.OnConflictStrategy;
import androidx.room.Query;
import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Delete;
import android.arch.persistence.room.Insert;
import android.arch.persistence.room.OnConflictStrategy;
import android.arch.persistence.room.Query;
import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean;
import com.yizhuan.xchat_android_core.music.db.bean.SongBean;

2
core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java
View File

@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.database.Cursor;
import android.provider.MediaStore;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import com.yizhuan.tutu.database.AppDataBase;
import com.yizhuan.xchat_android_core.base.BaseModel;

2
core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentActivity.java
View File

@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import com.tencent.mm.opensdk.constants.Build;
import com.tencent.mm.opensdk.constants.ConstantsAPI;

4
core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/PublicChatHallModel.java
View File

@@ -1,8 +1,9 @@
package com.yizhuan.xchat_android_core.public_chat_hall.model;
import android.annotation.SuppressLint;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import com.netease.nim.uikit.business.session.event.MessageEvent;
import com.netease.nimlib.sdk.AbortableFuture;
import com.netease.nimlib.sdk.NIMChatRoomSDK;
import com.netease.nimlib.sdk.RequestCallback;
@@ -25,6 +26,7 @@ import com.yizhuan.xchat_android_core.public_chat_hall.bean.PublicChatHallMessag
import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.user.event.CurrentUserInfoCompleteEvent;
import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.net.rxnet.RxNet;

6
core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/UpgradeModel.java
View File

@@ -4,9 +4,9 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.FileProvider;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.FileProvider;
import android.text.TextUtils;
import android.util.Log;