yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

迁移Android X

Browse Source
This commit is contained in:
oujunhui
2020-04-08 21:55:17 +08:00
parent 01ea699722
commit 6df2d64ddb
1188 changed files with 2789 additions and 3323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android_crop_lib/build.gradle
View File

@@ -20,7 +20,7 @@ android {
}
dependencies {
api 'com.android.support:support-annotations:23.0.1'
api 'com.android.support:support-v4:26.0.1'
api 'androidx.annotation:annotation:1.1.0'
api 'androidx.legacy:legacy-support-v4:1.0.0'
}

8
android_crop_lib/src/main/java/com/soundcloud/android/crop/Crop.java
View File

@@ -124,7 +124,7 @@ public class Crop {
* @param context Context
* @param fragment Fragment to receive result
*/
public void start(Context context, android.support.v4.app.Fragment fragment) {
public void start(Context context, androidx.fragment.app.Fragment fragment) {
start(context, fragment, REQUEST_CROP);
}
@@ -147,7 +147,7 @@ public class Crop {
* @param fragment Fragment to receive result
* @param requestCode requestCode for result
*/
public void start(Context context, android.support.v4.app.Fragment fragment, int requestCode) {
public void start(Context context, androidx.fragment.app.Fragment fragment, int requestCode) {
fragment.startActivityForResult(getIntent(context), requestCode);
}
@@ -206,7 +206,7 @@ public class Crop {
* @param context Context
* @param fragment Fragment to receive result
*/
public static void pickImage(Context context, android.support.v4.app.Fragment fragment) {
public static void pickImage(Context context, androidx.fragment.app.Fragment fragment) {
pickImage(context, fragment, REQUEST_PICK);
}
@@ -247,7 +247,7 @@ public class Crop {
* @param fragment Fragment to receive result
* @param requestCode requestCode for result
*/
public static void pickImage(Context context, android.support.v4.app.Fragment fragment, int requestCode) {
public static void pickImage(Context context, androidx.fragment.app.Fragment fragment, int requestCode) {
try {
fragment.startActivityForResult(getImagePicker(), requestCode);
} catch (ActivityNotFoundException e) {

2
android_crop_lib/src/main/java/com/soundcloud/android/crop/CropImageView.java
View File

@@ -3,7 +3,7 @@ package com.soundcloud.android.crop;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.AttributeSet;
import android.view.MotionEvent;

2
android_crop_lib/src/main/java/com/soundcloud/android/crop/CropUtil.java
View File

@@ -25,7 +25,7 @@ import android.net.Uri;
import android.os.Handler;
import android.os.ParcelFileDescriptor;
import android.provider.MediaStore;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import java.io.Closeable;

28
app/build.gradle
View File

@@ -13,7 +13,7 @@ android {
versionCode Integer.valueOf(version_code)
versionName version_name
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
ndk {
@@ -182,16 +182,16 @@ def Lombok = "1.16.20"
dependencies {
api fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
testImplementation 'junit:junit:4.12'
androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})
api "com.android.support:recyclerview-v7:${supportLibraryVersion}"
api "com.android.support:cardview-v7:${supportLibraryVersion}"
api "com.android.support:gridlayout-v7:${supportLibraryVersion}"
api "com.android.support:multidex:1.0.3"
api 'androidx.recyclerview:recyclerview:1.1.0'
api 'androidx.cardview:cardview:1.0.0'
api 'androidx.gridlayout:gridlayout:1.0.0'
api 'androidx.multidex:multidex:2.0.1'
debugApi "com.squareup.leakcanary:leakcanary-android:1.6.3"
releaseApi "com.squareup.leakcanary:leakcanary-android-no-op:1.6.3"
@@ -204,7 +204,7 @@ dependencies {
api "com.github.flavienlaurent.datetimepicker:library:0.0.2"
api "com.darsh.multipleimageselect:multipleimageselect:1.0.4"
api "me.shaohui.advancedluban:library:1.3.2"
api "me.shaohui.advancedluban:library:1.3.5"
api "com.tencent.bugly:crashreport:2.8.6"
api "pl.droidsonroids.gif:android-gif-drawable:1.2.7"
// api "com.jude:rollviewpager:1.4.6"
@@ -213,12 +213,12 @@ dependencies {
api "com.jzxiang.pickerview:TimePickerDialog:1.0.1"
api "com.github.zyyoona7:EasyPopup:1.0.2"
api "com.github.donkingliang:LabelsView:1.2.0"
api "com.github.yyued:SVGAPlayer-Android:2.4.2"
api "com.github.yyued:SVGAPlayer-Android:2.4.7"
api "com.mcxiaoke.packer-ng:helper:2.0.0"
implementation "com.orhanobut:logger:2.1.1"
implementation "com.orhanobut:logger:2.2.0"
api "com.ms-square:expandableTextView:0.1.4"
api "com.jakewharton:butterknife:8.8.1"
annotationProcessor "com.jakewharton:butterknife-compiler:8.8.1"
api "com.jakewharton:butterknife:10.1.0"
annotationProcessor "com.jakewharton:butterknife-compiler:10.1.0"
implementation "com.llew.huawei:verifier:1.0.3"
api "com.flyco.tablayout:FlycoTabLayout_Lib:2.1.2@aar"
@@ -232,11 +232,11 @@ dependencies {
//支付密码输入框
api 'com.jungly:gridPasswordView:0.3'
api 'com.google.android:flexbox:1.0.0'
api 'com.google.android:flexbox:1.1.0'
compileOnly "org.projectlombok:lombok:${Lombok}"
annotationProcessor "org.projectlombok:lombok:${Lombok}"
api "android.arch.lifecycle:extensions:1.1.1"
api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'nl.dionsegijn:konfetti:1.1.2'
// 华为推送

8
app/src/androidTest/java/com/yizhuan/erban/ExampleInstrumentedTest.java
View File

@@ -1,17 +1,13 @@
package com.yizhuan.erban;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import android.text.TextUtils;
import android.util.Log;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.ArrayList;
import static org.junit.Assert.*;
/**

2
app/src/main/AndroidManifest.xml
View File

@@ -326,7 +326,7 @@
android:name="com.soundcloud.android.crop.CropImageActivity"
android:screenOrientation="portrait" /> <!-- tinker配置 begin ########################################################## -->
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">

2
app/src/main/java/com/jph/takephoto/app/TakePhotoActivity.java
View File

@@ -2,7 +2,7 @@ package com.jph.takephoto.app;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.CallSuper;
import androidx.annotation.CallSuper;
import android.util.Log;
import com.jph.takephoto.model.InvokeParam;

2
app/src/main/java/com/jph/takephoto/app/TakePhotoFragment.java
View File

@@ -2,7 +2,7 @@ package com.jph.takephoto.app;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import android.util.Log;
import com.jph.takephoto.model.InvokeParam;

2
app/src/main/java/com/jph/takephoto/app/TakePhotoFragmentActivity.java
View File

@@ -2,7 +2,7 @@ package com.jph.takephoto.app;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import androidx.fragment.app.FragmentActivity;
import android.util.Log;
import com.jph.takephoto.model.InvokeParam;

5
app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java
View File

@@ -7,9 +7,8 @@ import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import android.text.TextUtils;
import android.widget.Toast;
import com.darsh.multipleimageselect.helpers.Constants;
import com.darsh.multipleimageselect.models.Image;
@@ -33,10 +32,8 @@ import com.jph.takephoto.uitl.TFileUtils;
import com.jph.takephoto.uitl.TImageFiles;
import com.jph.takephoto.uitl.TUriParse;
import com.jph.takephoto.uitl.TUtils;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.orhanobut.logger.Logger;
import com.soundcloud.android.crop.Crop;
import com.soundcloud.android.crop.CropImageActivity;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;

2
app/src/main/java/com/jph/takephoto/model/TContextWrap.java
View File

@@ -1,7 +1,7 @@
package com.jph.takephoto.model;
import android.app.Activity;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
/**
* Author: JPH

7
app/src/main/java/com/jph/takephoto/permission/PermissionManager.java
View File

@@ -3,11 +3,10 @@ package com.jph.takephoto.permission;
import android.Manifest;
import android.app.Activity;
import android.content.pm.PackageManager;
import android.support.annotation.NonNull;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import android.text.TextUtils;
import android.widget.Toast;
import com.jph.takephoto.app.TakePhoto;
import com.jph.takephoto.model.InvokeParam;

2
app/src/main/java/com/jph/takephoto/uitl/TUriParse.java
View File

@@ -8,7 +8,7 @@ import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import android.provider.MediaStore;
import android.support.v4.content.FileProvider;
import androidx.core.content.FileProvider;
import android.text.TextUtils;
import android.util.Log;

3
app/src/main/java/com/jph/takephoto/uitl/TUtils.java
View File

@@ -7,10 +7,9 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
import android.support.v4.content.FileProvider;
import androidx.core.content.FileProvider;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
import com.darsh.multipleimageselect.models.Image;
import com.jph.takephoto.model.CropOptions;

2
app/src/main/java/com/yizhuan/erban/GuideAdapter.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.erban;
import android.content.Context;
import android.support.v4.view.PagerAdapter;
import androidx.viewpager.widget.PagerAdapter;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;

10
app/src/main/java/com/yizhuan/erban/MainActivity.java
View File

@@ -10,9 +10,9 @@ import android.content.Intent;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import android.text.TextUtils;
import android.util.Log;
import android.util.LongSparseArray;
@@ -66,10 +66,8 @@ import com.yizhuan.erban.home.dialog.RecommendRoomForNewerDialog;
import com.yizhuan.erban.home.fragment.CommunityNoticeAct;
import com.yizhuan.erban.home.fragment.ContactsListFragment;
import com.yizhuan.erban.home.fragment.FindTabFragment;
import com.yizhuan.erban.home.fragment.GameHomeFragment;
import com.yizhuan.erban.home.fragment.MeFragment;
import com.yizhuan.erban.home.fragment.MsgFragment;
import com.yizhuan.erban.home.fragment.RankingFragment;
import com.yizhuan.erban.home.presenter.MainPresenter;
import com.yizhuan.erban.home.view.IMainView;
@@ -111,7 +109,6 @@ import com.yizhuan.erban.ui.im.chat.SysMsgV2ViewHolder;
import com.yizhuan.erban.ui.im.chat.SysMsgViewHolder;
import com.yizhuan.erban.ui.im.chat.SysMsgVoiceViewHolder;
import com.yizhuan.erban.ui.login.BinderPhoneActivity;
import com.yizhuan.erban.ui.login.LoginActivity;
import com.yizhuan.erban.ui.patriarch.help.LimitEnterRoomHelper;
import com.yizhuan.erban.ui.patriarch.help.PmDialogShowMrg;
import com.yizhuan.erban.ui.user.UserInfoActivity;
@@ -217,7 +214,6 @@ import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent;
import com.yizhuan.xchat_android_core.user.event.NeedBindPhoneEvent;
import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
import com.yizhuan.xchat_android_library.threadmgr.ThreadPoolManager;
import com.yizhuan.xchat_android_library.utils.JavaUtil;

2
app/src/main/java/com/yizhuan/erban/UIHelper.java
View File

@@ -6,7 +6,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.provider.Settings;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import com.yizhuan.erban.audio.AudioRecordActivity;
import com.yizhuan.erban.audio.MyVoiceActivity;

2
app/src/main/java/com/yizhuan/erban/UserGuideActivity.java
View File

@@ -3,7 +3,7 @@ package com.yizhuan.erban;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.view.ViewPager;
import androidx.viewpager.widget.ViewPager;
import android.view.View;
import android.widget.ImageView;

3
app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
View File

@@ -10,7 +10,7 @@ import android.net.http.HttpResponseCache;
import android.os.Build;
import android.os.Environment;
import android.os.StrictMode;
import android.support.multidex.MultiDex;
import androidx.multidex.MultiDex;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
@@ -66,7 +66,6 @@ import com.yizhuan.xchat_android_core.family.model.FamilyModel;
import com.yizhuan.xchat_android_core.gift.GiftModel;
import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment;
import com.yizhuan.xchat_android_core.interceptor.DomainInterceptor;
import com.yizhuan.xchat_android_core.interceptor.NoParamsInterceptor;
import com.yizhuan.xchat_android_core.interceptor.ParamsInterceptor;
import com.yizhuan.xchat_android_core.manager.IMMessageManager;

6
app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java
View File

@@ -5,8 +5,8 @@ import android.content.Intent;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.yizhuan.erban.R;
@@ -20,8 +20,6 @@ import com.yizhuan.erban.common.NoDataFragment;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.ui.widget.recyclerview.decoration.HorizontalDecoration;
import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo;
import com.yizhuan.xchat_android_core.manager.RtcEngineManager;
import com.yizhuan.xchat_android_core.music.model.PlayerModel;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;

8
app/src/main/java/com/yizhuan/erban/audio/RecordingVoiceActivity.java
View File

@@ -14,10 +14,10 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.os.SystemClock;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.DefaultItemAnimator;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.helper.ItemTouchHelper;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.ItemTouchHelper;
import android.util.Log;
import android.view.View;
import android.widget.Chronometer;

3
app/src/main/java/com/yizhuan/erban/audio/VoiceMatchActivity.java
View File

@@ -3,7 +3,7 @@ package com.yizhuan.erban.audio;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.constraint.Group;
import androidx.constraintlayout.widget.Group;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -15,7 +15,6 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.opensource.svgaplayer.SVGACallback;
import com.opensource.svgaplayer.SVGAImageView;
import com.trello.rxlifecycle2.android.ActivityEvent;

4
app/src/main/java/com/yizhuan/erban/audio/adapter/CardAdapter.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.erban.audio.adapter;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.text.method.ScrollingMovementMethod;
import android.view.LayoutInflater;
import android.view.View;

2
app/src/main/java/com/yizhuan/erban/audio/adapter/MyVoiceListAdapter.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.erban.audio.adapter;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;

4
app/src/main/java/com/yizhuan/erban/audio/view/BottleContainer.java
View File

@@ -1,8 +1,8 @@
package com.yizhuan.erban.audio.view;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewTreeObserver;

2
app/src/main/java/com/yizhuan/erban/audio/view/BottleLayout.java
View File

@@ -4,7 +4,7 @@ import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import android.view.MotionEvent;
import android.widget.FrameLayout;

3
app/src/main/java/com/yizhuan/erban/audio/view/PlayLoadingImageView.java
View File

@@ -4,10 +4,9 @@ import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.RectF;
import android.support.v7.widget.AppCompatImageView;
import androidx.appcompat.widget.AppCompatImageView;
import android.util.AttributeSet;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;

2
app/src/main/java/com/yizhuan/erban/audio/widget/OnSwipeListener.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.erban.audio.widget;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
/**
* 录制声音页面.声音卡片滑动监听

2
app/src/main/java/com/yizhuan/erban/audio/widget/RingProgressView.java
View File

@@ -5,7 +5,7 @@ import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.RectF;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;

4
app/src/main/java/com/yizhuan/erban/audio/widget/VoiceBottleFilterGenderBottomDialog.java
View File

@@ -2,8 +2,8 @@ package com.yizhuan.erban.audio.widget;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.BottomSheetDialog;
import androidx.annotation.NonNull;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import android.util.DisplayMetrics;
import android.view.Display;
import android.view.View;

8
app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardItemTouchHelperCallback.java
View File

@@ -1,10 +1,10 @@
package com.yizhuan.erban.audio.widget;
import android.graphics.Canvas;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.helper.ItemTouchHelper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.ItemTouchHelper;
import android.util.Log;
import android.view.View;

8
app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardLayoutManager.java
View File

@@ -1,9 +1,9 @@
package com.yizhuan.erban.audio.widget;
import android.support.annotation.NonNull;
import android.support.v4.view.MotionEventCompat;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.helper.ItemTouchHelper;
import androidx.annotation.NonNull;
import androidx.core.view.MotionEventCompat;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.ItemTouchHelper;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;

4
app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardRecyclerView.java
View File

@@ -2,8 +2,8 @@ package com.yizhuan.erban.audio.widget;
import android.content.Context;
import android.graphics.Canvas;
import android.support.annotation.Nullable;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import android.util.AttributeSet;
/**

2
app/src/main/java/com/yizhuan/erban/avroom/ChatMemberDiffUtilCallback.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.erban.avroom;
import android.support.v7.util.DiffUtil;
import androidx.recyclerview.widget.DiffUtil;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;

9
app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
View File

@@ -7,10 +7,10 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewPager;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.core.content.ContextCompat;
import androidx.viewpager.widget.ViewPager;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
@@ -29,7 +29,6 @@ import com.netease.nim.uikit.common.util.log.LogUtil;
import com.netease.nimlib.sdk.NIMSDK;
import com.netease.nimlib.sdk.Observer;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
import com.netease.nimlib.sdk.msg.model.BroadcastMessage;
import com.opensource.svgaplayer.SVGADrawable;
import com.opensource.svgaplayer.SVGAImageView;

5
app/src/main/java/com/yizhuan/erban/avroom/activity/CreatePKActivity.java
View File

@@ -3,7 +3,7 @@ package com.yizhuan.erban.avroom.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.GridLayout;
import androidx.gridlayout.widget.GridLayout;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.ImageView;
@@ -30,11 +30,8 @@ import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import io.reactivex.Single;
import io.reactivex.SingleObserver;
import io.reactivex.disposables.Disposable;

7
app/src/main/java/com/yizhuan/erban/avroom/activity/RecordForPKActivity.java
View File

@@ -4,9 +4,9 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.trello.rxlifecycle2.android.ActivityEvent;
import com.yizhuan.erban.R;
@@ -24,7 +24,6 @@ import java.util.List;
import io.reactivex.SingleObserver;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Action;
/**
* @author jack

6
app/src/main/java/com/yizhuan/erban/avroom/activity/RoomBlackListActivity.java
View File

@@ -3,8 +3,8 @@ package com.yizhuan.erban.avroom.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.TextView;
@@ -33,8 +33,6 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Objects;
import io.reactivex.Single;
/**
* 黑名单
*

5
app/src/main/java/com/yizhuan/erban/avroom/activity/RoomInviteActivity.java
View File

@@ -2,10 +2,9 @@ package com.yizhuan.erban.avroom.activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.support.v7.widget.RecyclerView;
import androidx.fragment.app.FragmentActivity;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.widget.Toast;
import com.netease.nim.uikit.common.util.sys.NetworkUtil;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;

4
app/src/main/java/com/yizhuan/erban/avroom/activity/RoomManagerListActivity.java
View File

@@ -3,8 +3,8 @@ package com.yizhuan.erban.avroom.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.TextView;

4
app/src/main/java/com/yizhuan/erban/avroom/activity/RoomOnlineUserActivity.java
View File

@@ -2,15 +2,13 @@ package com.yizhuan.erban.avroom.activity;
import android.content.Context;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.fragment.OnlineUserFragment;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.base.TitleBar;
import com.yizhuan.erban.databinding.ActivityRoomOnlineUserBinding;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;

25
app/src/main/java/com/yizhuan/erban/avroom/activity/RoomRankListActivity.java
View File

@@ -2,34 +2,23 @@ package com.yizhuan.erban.avroom.activity;
import android.content.Context;
import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.orhanobut.logger.Logger;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.fragment.RoomCharmListFragment;
import com.yizhuan.erban.avroom.fragment.RoomContributeListFragment;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.base.BaseFragment;
import com.yizhuan.erban.databinding.ActivityRoomRankListBinding;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;

3
app/src/main/java/com/yizhuan/erban/avroom/activity/RoomSettingActivity.java
View File

@@ -2,7 +2,7 @@ package com.yizhuan.erban.avroom.activity;
import android.content.Context;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.os.Bundle;
import android.text.SpannableString;
import android.text.TextUtils;
@@ -41,7 +41,6 @@ import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo;
import com.yizhuan.xchat_android_core.room.giftvalue.GiftValueModel;
import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_core.room.model.HomePartyModel;
import com.yizhuan.xchat_android_core.room.model.RoomSettingModel;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;

4
app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.erban.avroom.adapter;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
@@ -11,7 +11,6 @@ import com.netease.nim.uikit.common.util.string.StringUtil;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.yizhuan.erban.R;
import com.yizhuan.erban.bindadapter.ViewAdapter;
import com.yizhuan.erban.common.widget.CircleImageView;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.bean.RoomMicInfo;
@@ -20,7 +19,6 @@ import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.noble.NobleResourceType;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
/**

8
app/src/main/java/com/yizhuan/erban/avroom/adapter/CpMicroViewAdapter.java
View File

@@ -1,10 +1,10 @@
package com.yizhuan.erban.avroom.adapter;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

6
app/src/main/java/com/yizhuan/erban/avroom/adapter/HomePartyPageAdapter.java
View File

@@ -1,8 +1,8 @@
package com.yizhuan.erban.avroom.adapter;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import java.util.List;

2
app/src/main/java/com/yizhuan/erban/avroom/adapter/InviteFriendListAdapter.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.erban.avroom.adapter;
import android.app.Activity;
import android.support.v7.widget.AppCompatImageView;
import androidx.appcompat.widget.AppCompatImageView;
import android.text.TextUtils;
import android.view.View;
import android.widget.CheckBox;

7
app/src/main/java/com/yizhuan/erban/avroom/adapter/KtvMicroViewAdapter.java
View File

@@ -1,16 +1,15 @@
package com.yizhuan.erban.avroom.adapter;
import android.content.Context;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.coorchice.library.SuperTextView;
import com.netease.nim.uikit.common.util.sys.ScreenUtil;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.yizhuan.erban.R;

2
app/src/main/java/com/yizhuan/erban/avroom/adapter/MicQueueAdapter.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.erban.avroom.adapter;
import android.graphics.drawable.GradientDrawable;
import android.support.v7.widget.AppCompatImageView;
import androidx.appcompat.widget.AppCompatImageView;
import android.view.View;
import android.widget.TextView;

9
app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java
View File

@@ -1,11 +1,11 @@
package com.yizhuan.erban.avroom.adapter;
import android.arch.lifecycle.Observer;
import androidx.lifecycle.Observer;
import android.content.Context;
import android.graphics.drawable.BitmapDrawable;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -26,7 +26,6 @@ import com.yizhuan.erban.common.widget.CircleImageView;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.xchat_android_core.bean.RoomMicInfo;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.noble.NobleUtil;

7
app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java
View File

@@ -2,11 +2,10 @@ package com.yizhuan.erban.avroom.adapter;
import android.content.Context;
import android.graphics.Color;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.AppCompatImageView;
import android.support.v7.widget.RecyclerView;
import androidx.core.content.ContextCompat;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;

2
app/src/main/java/com/yizhuan/erban/avroom/adapter/PKMicQueueAdapter.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.erban.avroom.adapter;
import android.support.v7.widget.AppCompatImageView;
import androidx.appcompat.widget.AppCompatImageView;
import android.view.View;
import android.widget.TextView;

3
app/src/main/java/com/yizhuan/erban/avroom/adapter/RecordForPKAdapter.java
View File

@@ -2,7 +2,7 @@ package com.yizhuan.erban.avroom.adapter;
import android.content.Context;
import android.graphics.drawable.GradientDrawable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -14,7 +14,6 @@ import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordInfo;
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.RoomPkData;
import com.yizhuan.xchat_android_core.room.pk.model.PkModel;
import com.yizhuan.xchat_android_library.utils.FormatUtils;
import java.text.SimpleDateFormat;

11
app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomBlackListAdapter.java
View File

@@ -1,24 +1,15 @@
package com.yizhuan.erban.avroom.adapter;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.widget.CircleImageView;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import java.util.List;
/**
* 右滑操作的，写了暂时不用

2
app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumeListAdapter.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.erban.avroom.adapter;
import android.content.Context;
import android.support.v7.widget.AppCompatImageView;
import androidx.appcompat.widget.AppCompatImageView;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;

2
app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumerListAdapterTemp.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.erban.avroom.adapter;
import android.content.Context;
import android.support.v7.widget.AppCompatImageView;
import androidx.appcompat.widget.AppCompatImageView;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;

6
app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomContributeListAdapter.java
View File

@@ -1,8 +1,8 @@
package com.yizhuan.erban.avroom.adapter;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import java.util.List;

4
app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomInviteAdapter.java
View File

@@ -1,8 +1,8 @@
package com.yizhuan.erban.avroom.adapter;
import android.content.Context;
import android.support.v7.util.DiffUtil;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

3
app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomNormalListAdapter.java
View File

@@ -1,11 +1,10 @@
package com.yizhuan.erban.avroom.adapter;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;

6
app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomRankFragmentPageAdapter.java
View File

@@ -1,8 +1,8 @@
package com.yizhuan.erban.avroom.adapter;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import java.util.List;

9
app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java
View File

@@ -3,10 +3,10 @@ package com.yizhuan.erban.avroom.dialog;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
@@ -18,7 +18,6 @@ import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.yizhuan.erban.R;

6
app/src/main/java/com/yizhuan/erban/avroom/dialog/NewUserTaskDialog.java
View File

@@ -2,9 +2,9 @@ package com.yizhuan.erban.avroom.dialog;
import android.app.Dialog;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;

8
app/src/main/java/com/yizhuan/erban/avroom/dialog/PKMicQueueDialog.java
View File

@@ -3,9 +3,9 @@ package com.yizhuan.erban.avroom.dialog;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
@@ -17,7 +17,6 @@ import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.yizhuan.erban.R;
@@ -52,7 +51,6 @@ import io.reactivex.SingleObserver;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.BiConsumer;
import io.reactivex.functions.Predicate;
/**
* @author jack

7
app/src/main/java/com/yizhuan/erban/avroom/dialog/PKResultDialog.java
View File

@@ -3,9 +3,9 @@ package com.yizhuan.erban.avroom.dialog;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.Gravity;
import android.view.View;
import android.view.Window;
@@ -26,7 +26,6 @@ import com.yizhuan.xchat_android_core.auth.AuthModel;
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.RoomPkData;
import com.yizhuan.xchat_android_core.room.pk.model.PkModel;
import java.util.ArrayList;
import java.util.List;

2
app/src/main/java/com/yizhuan/erban/avroom/dialog/PKScoreBoardDialog.java
View File

@@ -2,7 +2,7 @@ package com.yizhuan.erban.avroom.dialog;
import android.content.Context;
import android.os.Bundle;
import android.support.v7.widget.GridLayout;
import androidx.gridlayout.widget.GridLayout;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.ProgressBar;

6
app/src/main/java/com/yizhuan/erban/avroom/dialog/PKSelectPeopleDialog.java
View File

@@ -3,9 +3,9 @@ package com.yizhuan.erban.avroom.dialog;
import android.content.Context;
import android.graphics.Rect;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.util.SparseArray;
import android.view.View;

8
app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java
View File

@@ -2,10 +2,10 @@ package com.yizhuan.erban.avroom.dialog;
import android.content.Context;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.design.widget.BottomSheetBehavior;
import android.support.design.widget.BottomSheetDialog;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.view.Display;
@@ -29,8 +29,6 @@ import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import com.yizhuan.xchat_android_library.utils.codec.DESUtils;
import io.reactivex.functions.Consumer;
public class RoomImposeDialog extends BottomSheetDialog implements View.OnClickListener {
private Context context;
private DialogRoomImposeBinding binding;

9
app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java
View File

@@ -3,10 +3,10 @@ package com.yizhuan.erban.avroom.dialog;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.BottomSheetDialog;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import androidx.recyclerview.widget.RecyclerView;
import android.util.DisplayMetrics;
import android.view.Display;
import android.view.View;
@@ -16,7 +16,6 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.yizhuan.erban.module_hall.HallDataManager;
import com.yizhuan.erban.module_hall.hall.adapter.OptionAdapter;
import com.yizhuan.erban.ui.widget.marqueeview.Utils;
import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration;
import com.yizhuan.erban.ui.widget.recyclerview.layoutmanager.FullyGridLayoutManager;

6
app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationVm.java
View File

@@ -1,9 +1,9 @@
package com.yizhuan.erban.avroom.dialog;
import android.arch.lifecycle.MutableLiveData;
import androidx.lifecycle.MutableLiveData;
import android.content.Context;
import android.databinding.ObservableBoolean;
import android.databinding.ObservableField;
import androidx.databinding.ObservableBoolean;
import androidx.databinding.ObservableField;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.auth.AuthModel;

10
app/src/main/java/com/yizhuan/erban/avroom/fragment/DialogWebFragment.java
View File

@@ -12,10 +12,10 @@ import android.net.Uri;
import android.net.http.SslError;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentManager;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.view.Display;
@@ -32,7 +32,6 @@ import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.ImageView;
import android.widget.ProgressBar;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.orhanobut.logger.Logger;
@@ -41,7 +40,6 @@ import com.yizhuan.erban.ui.webview.JSInterface;
import com.yizhuan.erban.ui.webview.event.CloseDialogWebViewEvent;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.utils.WebViewUtils;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;

10
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
View File

@@ -4,13 +4,13 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.content.res.AssetFileDescriptor;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.graphics.Color;
import android.media.MediaPlayer;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.AppCompatImageView;
import androidx.annotation.Nullable;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.widget.AppCompatImageView;
import android.text.Html;
import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
@@ -67,7 +67,6 @@ 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.bean.SimplePartyRoomInfo;
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;
@@ -79,7 +78,6 @@ import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
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.JavaUtil;
import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;

16
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
View File

@@ -3,20 +3,20 @@ package com.yizhuan.erban.avroom.fragment;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.arch.lifecycle.ViewModelProviders;
import androidx.lifecycle.ViewModelProviders;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewPager;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.core.content.ContextCompat;
import androidx.viewpager.widget.ViewPager;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewStub;
@@ -72,7 +72,6 @@ import com.yizhuan.erban.avroom.ktv.KtvMusicManager;
import com.yizhuan.erban.avroom.ktv.KtvSelectSongActivity;
import com.yizhuan.erban.avroom.ktv.KtvSongListActivity;
import com.yizhuan.erban.avroom.presenter.HomePartyPresenter;
import com.yizhuan.erban.miniworld.widget.MiniWorldEditChooseClassifyDialog;
import com.yizhuan.erban.treasure_box.activity.TreasureBoxHonourActivity;
import com.yizhuan.erban.treasure_box.fragment.ChooseTreasureBoxDialogFragment;
import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper;
@@ -107,7 +106,6 @@ import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.bean.RoomMicInfo;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
import com.yizhuan.xchat_android_core.bean.attachmsg.RoomQueueMsgAttachment;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.gift.GiftModel;
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;

7
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyUserListFragment.java
View File

@@ -2,10 +2,9 @@ package com.yizhuan.erban.avroom.fragment;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import android.view.View;
import android.widget.TextView;

6
app/src/main/java/com/yizhuan/erban/avroom/fragment/InputPwdDialogFragment.java
View File

@@ -1,14 +1,12 @@
package com.yizhuan.erban.avroom.fragment;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.EditText;
import android.widget.TextView;

10
app/src/main/java/com/yizhuan/erban/avroom/fragment/InviteFriendListFragment.java
View File

@@ -1,16 +1,14 @@
package com.yizhuan.erban.avroom.fragment;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.Nullable;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.coorchice.library.utils.LogUtils;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.adapter.InviteFriendListAdapter;
import com.yizhuan.erban.base.BaseFragment;
import com.yizhuan.erban.public_chat_hall.adapter.PublicChatHallFriendListAdapter;
import com.yizhuan.erban.public_chat_hall.bean.PublicChatHallFriendInfo;
import com.yizhuan.xchat_android_core.im.friend.IMFriendModel;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;

4
app/src/main/java/com/yizhuan/erban/avroom/fragment/OnlineUserFragment.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.erban.avroom.fragment;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;

2
app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmListFragment.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.erban.avroom.fragment;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter;

6
app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmRankingListFragment.java
View File

@@ -1,9 +1,9 @@
package com.yizhuan.erban.avroom.fragment;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;

4
app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeFragment.java
View File

@@ -1,8 +1,8 @@
package com.yizhuan.erban.avroom.fragment;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;

4
app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.erban.avroom.fragment;
import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager;
import androidx.fragment.app.Fragment;
import androidx.viewpager.widget.ViewPager;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter;

10
app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java
View File

@@ -3,11 +3,11 @@ package com.yizhuan.erban.avroom.fragment;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatDialogFragment;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.app.AppCompatDialogFragment;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;

6
app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankHalfHourFragment.java
View File

@@ -2,9 +2,9 @@ package com.yizhuan.erban.avroom.fragment;
import android.content.Context;
import android.os.Bundle;
import android.support.v4.widget.NestedScrollView;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.core.widget.NestedScrollView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;

2
app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankListFragment.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.erban.avroom.fragment;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import android.view.View;
import com.yizhuan.erban.R;

8
app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomTitleDialogFragment.java
View File

@@ -1,10 +1,10 @@
package com.yizhuan.erban.avroom.fragment;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import android.text.TextUtils;
import android.text.method.ScrollingMovementMethod;
import android.view.LayoutInflater;

5
app/src/main/java/com/yizhuan/erban/avroom/game/GameAdapter.java
View File

@@ -1,10 +1,7 @@
package com.yizhuan.erban.avroom.game;
import android.databinding.ViewDataBinding;
import android.view.View;
import androidx.databinding.ViewDataBinding;
import com.yizhuan.erban.R;
import com.yizhuan.erban.databinding.ItemRoomGameBinding;
import com.yizhuan.erban.bindadapter.BaseAdapter;
import com.yizhuan.erban.bindadapter.BindingViewHolder;
import com.yizhuan.xchat_android_core.room.game.GameInfo;

26
app/src/main/java/com/yizhuan/erban/avroom/game/GameSelectDialog.java
View File

@@ -1,43 +1,31 @@
package com.yizhuan.erban.avroom.game;
import android.content.Context;
import android.databinding.DataBindingUtil;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import androidx.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.BottomSheetDialog;
import android.support.v4.view.PagerAdapter;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import androidx.viewpager.widget.PagerAdapter;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.util.DisplayMetrics;
import android.util.SparseArray;
import android.view.Display;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.yizhuan.erban.BR;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.widget.GalleryLayoutManager;
import com.yizhuan.erban.avroom.widget.ScaleTransformer;
import com.yizhuan.erban.bindadapter.BaseAdapter;
import com.yizhuan.erban.common.ViewPagerAdapter;
import com.yizhuan.erban.databinding.DialogGameSelectBinding;
import com.yizhuan.erban.ui.gift.dialog.GiftInfoVm;
import com.yizhuan.erban.ui.gift.dialog.MagicInfoVm;
import com.yizhuan.erban.ui.widget.OnPageSelectedListener;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
import com.yizhuan.xchat_android_core.magic.bean.MagicInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.game.GameInfo;
import com.yizhuan.xchat_android_core.room.game.GameModel;
import com.yizhuan.xchat_android_library.bindinglist.IItem;
import com.yizhuan.xchat_android_library.bindinglist.MultiTypeAdapter;
import com.yizhuan.xchat_android_library.utils.ListUtils;
import java.util.ArrayList;

12
app/src/main/java/com/yizhuan/erban/avroom/game/GameView.java
View File

@@ -3,24 +3,21 @@ package com.yizhuan.erban.avroom.game;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.databinding.DataBindingUtil;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.RecyclerView;
import androidx.databinding.DataBindingUtil;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.yizhuan.erban.BR;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.presenter.HomePartyPresenter;
import com.yizhuan.erban.avroom.widget.GalleryLayoutManager;
import com.yizhuan.erban.avroom.widget.ScaleTransformer;
import com.yizhuan.erban.bindadapter.BaseAdapter;
import com.yizhuan.erban.bindadapter.BindingViewHolder;
import com.yizhuan.erban.databinding.LayoutGameInviteSelfBinding;
import com.yizhuan.erban.databinding.LayoutGamePlayingBinding;
import com.yizhuan.erban.databinding.LayoutGamePreparedBinding;
@@ -54,7 +51,6 @@ import io.reactivex.Single;
import io.reactivex.SingleSource;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.functions.Function;
public class GameView extends FrameLayout {

3
app/src/main/java/com/yizhuan/erban/avroom/game/MatchViewModel.java
View File

@@ -1,12 +1,11 @@
package com.yizhuan.erban.avroom.game;
import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.room.game.GameInfo;
import com.yizhuan.xchat_android_core.room.game.GameMatchInfo;
import com.yizhuan.xchat_android_core.super_admin.model.exception.SAdminCannotGameException;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.net.ErrorConsumer;

36
app/src/main/java/com/yizhuan/erban/avroom/game/PlayGameActivity.java
View File

@@ -5,13 +5,10 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.Drawable;
import android.media.Image;
import android.net.http.SslError;
import android.os.Build;
import android.os.Environment;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
@@ -22,7 +19,6 @@ import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.ImageView;
import android.widget.Toast;
//import com.tongdaxing.tutu.R;
import com.alibaba.fastjson.JSON;
@@ -31,31 +27,19 @@ import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.GlideException;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.google.gson.Gson;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.Observer;
import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
import com.netease.nimlib.sdk.msg.MsgService;
import com.netease.nimlib.sdk.msg.MsgServiceObserve;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.CustomNotification;
import com.orhanobut.logger.Logger;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.base.TitleBar;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.databinding.ActivityPlayGameBinding;
import com.yizhuan.erban.friend.view.SelectFriendActivity;
import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.utils.KeyBoardUtils;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.GameAttachment;
import com.yizhuan.xchat_android_core.im.game.GameResultEvent;
import com.yizhuan.xchat_android_core.im.game.ImGameMode;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
@@ -64,37 +48,21 @@ import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.manager.RtcEngineManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.game.AiPlayEndEvent;
import com.yizhuan.xchat_android_core.room.game.GameAttachInfo;
import com.yizhuan.xchat_android_core.room.game.GameEvent;
import com.yizhuan.xchat_android_core.room.game.GameMatchInfo;
import com.yizhuan.xchat_android_core.room.game.GameModel;
import com.yizhuan.xchat_android_core.room.game.GameResultInfo;
import com.yizhuan.xchat_android_core.room.game.GameUidInfo;
import com.yizhuan.xchat_android_core.room.game.GameUrlInfo;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_core.share.bean.SessionType;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.ImageSplitter;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack;
import com.yizhuan.xchat_android_library.rxbus.RxBus;
import com.yizhuan.xchat_android_library.softinput.SoftHideKeyBoardUtil;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import io.agora.rtc.Constants;
import io.reactivex.Single;
import io.reactivex.functions.Consumer;
@ActLayoutRes(R.layout.activity_play_game)
public class PlayGameActivity extends BaseBindingActivity<ActivityPlayGameBinding> {

15
app/src/main/java/com/yizhuan/erban/avroom/game/PlayGameVm.java
View File

@@ -1,14 +1,12 @@
package com.yizhuan.erban.avroom.game;
import android.databinding.ObservableArrayList;
import android.databinding.ObservableBoolean;
import android.databinding.ObservableField;
import android.text.TextUtils;
import androidx.databinding.ObservableArrayList;
import androidx.databinding.ObservableBoolean;
import androidx.databinding.ObservableField;
import android.view.View;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
@@ -32,14 +30,9 @@ import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack;
import com.yizhuan.xchat_android_library.rxbus.RxBus;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
import com.yizhuan.xchat_android_library.utils.ListUtils;
import java.net.URL;
import java.util.List;
import io.reactivex.Single;
import io.reactivex.functions.Consumer;
public class PlayGameVm extends BaseViewModel {
public static final int AGAIN = 1;//再来一局

4
app/src/main/java/com/yizhuan/erban/avroom/helper/RoomViewModel.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.erban.avroom.helper;
import android.arch.lifecycle.MutableLiveData;
import android.arch.lifecycle.ViewModel;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import lombok.Getter;

8
app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvMusicManager.java
View File

@@ -1,10 +1,9 @@
package com.yizhuan.erban.avroom.ktv;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.coorchice.library.utils.LogUtils;
import com.orhanobut.logger.Logger;
import com.yizhuan.erban.utils.UserUtils;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
@@ -19,8 +18,6 @@ import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.rxbus.RxBus;
import com.yizhuan.xchat_android_library.utils.ListUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -30,7 +27,6 @@ import io.reactivex.Observable;
import io.reactivex.Single;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_DELETE_USER_ALL;

2
app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListActivity.java
View File

@@ -2,7 +2,7 @@ package com.yizhuan.erban.avroom.ktv;
import android.content.Context;
import android.content.Intent;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingActivity;

6
app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListFragment.java
View File

@@ -1,9 +1,9 @@
package com.yizhuan.erban.avroom.ktv;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.GridLayoutManager;
import androidx.annotation.Nullable;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.GridLayoutManager;
import com.chad.library.adapter.base.BaseQuickAdapter;

4
app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSearchSongActivity.java
View File

@@ -4,8 +4,8 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;

2
app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSelectSongActivity.java
View File

@@ -3,7 +3,7 @@ package com.yizhuan.erban.avroom.ktv;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.support.v7.widget.LinearLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;

6
app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListActivity.java
View File

@@ -3,9 +3,9 @@ package com.yizhuan.erban.avroom.ktv;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import androidx.annotation.Nullable;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import android.view.View;
import com.trello.rxlifecycle2.android.ActivityEvent;

2
app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListAdapter.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.erban.avroom.ktv;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.yizhuan.erban.R;
import com.yizhuan.erban.bindadapter.BaseAdapter;

4
app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListVm.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.erban.avroom.ktv;
import android.arch.lifecycle.MutableLiveData;
import android.databinding.ObservableInt;
import androidx.lifecycle.MutableLiveData;
import androidx.databinding.ObservableInt;
import com.yizhuan.erban.base.BaseMsListViewModel;

Some files were not shown because too many files have changed in this diff Show More