diff --git a/android_crop_lib/build.gradle b/android_crop_lib/build.gradle index 5b9321c2f..4044a8451 100644 --- a/android_crop_lib/build.gradle +++ b/android_crop_lib/build.gradle @@ -20,7 +20,7 @@ android { } dependencies { - api 'androidx.annotation:annotation:1.1.0' - api 'androidx.legacy:legacy-support-v4:1.0.0' + api 'com.android.support:support-annotations:23.0.1' + api 'com.android.support:support-v4:26.0.1' } diff --git a/android_crop_lib/src/main/java/com/soundcloud/android/crop/Crop.java b/android_crop_lib/src/main/java/com/soundcloud/android/crop/Crop.java index 70a56e1a7..3ce06d618 100644 --- a/android_crop_lib/src/main/java/com/soundcloud/android/crop/Crop.java +++ b/android_crop_lib/src/main/java/com/soundcloud/android/crop/Crop.java @@ -124,7 +124,7 @@ public class Crop { * @param context Context * @param fragment Fragment to receive result */ - public void start(Context context, androidx.fragment.app.Fragment fragment) { + public void start(Context context, android.support.v4.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, androidx.fragment.app.Fragment fragment, int requestCode) { + public void start(Context context, android.support.v4.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, androidx.fragment.app.Fragment fragment) { + public static void pickImage(Context context, android.support.v4.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, androidx.fragment.app.Fragment fragment, int requestCode) { + public static void pickImage(Context context, android.support.v4.app.Fragment fragment, int requestCode) { try { fragment.startActivityForResult(getImagePicker(), requestCode); } catch (ActivityNotFoundException e) { diff --git a/android_crop_lib/src/main/java/com/soundcloud/android/crop/CropImageView.java b/android_crop_lib/src/main/java/com/soundcloud/android/crop/CropImageView.java index caa9841ee..f6350cc55 100644 --- a/android_crop_lib/src/main/java/com/soundcloud/android/crop/CropImageView.java +++ b/android_crop_lib/src/main/java/com/soundcloud/android/crop/CropImageView.java @@ -3,7 +3,7 @@ package com.soundcloud.android.crop; import android.content.Context; import android.graphics.Canvas; import android.graphics.Rect; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/android_crop_lib/src/main/java/com/soundcloud/android/crop/CropUtil.java b/android_crop_lib/src/main/java/com/soundcloud/android/crop/CropUtil.java index 6056b8462..0bd878f61 100644 --- a/android_crop_lib/src/main/java/com/soundcloud/android/crop/CropUtil.java +++ b/android_crop_lib/src/main/java/com/soundcloud/android/crop/CropUtil.java @@ -25,7 +25,7 @@ import android.net.Uri; import android.os.Handler; import android.os.ParcelFileDescriptor; import android.provider.MediaStore; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import java.io.Closeable; diff --git a/app/build.gradle b/app/build.gradle index 6c35d7e41..12b2a623b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { versionCode Integer.valueOf(version_code) versionName version_name - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true ndk { @@ -182,16 +182,16 @@ def Lombok = "1.16.20" dependencies { api fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' testImplementation 'junit:junit:4.12' - androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', { exclude group: 'com.android.support', module: 'support-annotations' }) - 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' + 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" 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.5" + api "me.shaohui.advancedluban:library:1.3.2" 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.7" + api "com.github.yyued:SVGAPlayer-Android:2.4.2" api "com.mcxiaoke.packer-ng:helper:2.0.0" - implementation "com.orhanobut:logger:2.2.0" + implementation "com.orhanobut:logger:2.1.1" api "com.ms-square:expandableTextView:0.1.4" - api "com.jakewharton:butterknife:10.1.0" - annotationProcessor "com.jakewharton:butterknife-compiler:10.1.0" + api "com.jakewharton:butterknife:8.8.1" + annotationProcessor "com.jakewharton:butterknife-compiler:8.8.1" 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.1.0' + api 'com.google.android:flexbox:1.0.0' compileOnly "org.projectlombok:lombok:${Lombok}" annotationProcessor "org.projectlombok:lombok:${Lombok}" - api 'androidx.lifecycle:lifecycle-extensions:2.2.0' + api "android.arch.lifecycle:extensions:1.1.1" implementation 'nl.dionsegijn:konfetti:1.1.2' // 华为推送 diff --git a/app/src/androidTest/java/com/yizhuan/erban/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/yizhuan/erban/ExampleInstrumentedTest.java index 768f45f57..df6b2eac5 100644 --- a/app/src/androidTest/java/com/yizhuan/erban/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/yizhuan/erban/ExampleInstrumentedTest.java @@ -1,13 +1,17 @@ package com.yizhuan.erban; 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 android.text.TextUtils; +import android.util.Log; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.ArrayList; + import static org.junit.Assert.*; /** diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a349ad079..11c9688a7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -326,7 +326,7 @@ android:name="com.soundcloud.android.crop.CropImageActivity" android:screenOrientation="portrait" /> diff --git a/app/src/main/java/com/jph/takephoto/app/TakePhotoActivity.java b/app/src/main/java/com/jph/takephoto/app/TakePhotoActivity.java index bc69a0810..cdd753fcd 100644 --- a/app/src/main/java/com/jph/takephoto/app/TakePhotoActivity.java +++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoActivity.java @@ -2,7 +2,7 @@ package com.jph.takephoto.app; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.CallSuper; +import android.support.annotation.CallSuper; import android.util.Log; import com.jph.takephoto.model.InvokeParam; diff --git a/app/src/main/java/com/jph/takephoto/app/TakePhotoFragment.java b/app/src/main/java/com/jph/takephoto/app/TakePhotoFragment.java index 3c73ab9d5..9ef37a620 100644 --- a/app/src/main/java/com/jph/takephoto/app/TakePhotoFragment.java +++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoFragment.java @@ -2,7 +2,7 @@ package com.jph.takephoto.app; import android.content.Intent; import android.os.Bundle; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.util.Log; import com.jph.takephoto.model.InvokeParam; diff --git a/app/src/main/java/com/jph/takephoto/app/TakePhotoFragmentActivity.java b/app/src/main/java/com/jph/takephoto/app/TakePhotoFragmentActivity.java index ee298e46b..da935da55 100644 --- a/app/src/main/java/com/jph/takephoto/app/TakePhotoFragmentActivity.java +++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoFragmentActivity.java @@ -2,7 +2,7 @@ package com.jph.takephoto.app; import android.content.Intent; import android.os.Bundle; -import androidx.fragment.app.FragmentActivity; +import android.support.v4.app.FragmentActivity; import android.util.Log; import com.jph.takephoto.model.InvokeParam; diff --git a/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java b/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java index 35bff0a64..96373efc3 100644 --- a/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java +++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java @@ -7,8 +7,9 @@ import android.graphics.Bitmap; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.text.TextUtils; +import android.widget.Toast; import com.darsh.multipleimageselect.helpers.Constants; import com.darsh.multipleimageselect.models.Image; @@ -32,8 +33,10 @@ 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; diff --git a/app/src/main/java/com/jph/takephoto/model/TContextWrap.java b/app/src/main/java/com/jph/takephoto/model/TContextWrap.java index 919b8b87a..439a30be6 100644 --- a/app/src/main/java/com/jph/takephoto/model/TContextWrap.java +++ b/app/src/main/java/com/jph/takephoto/model/TContextWrap.java @@ -1,7 +1,7 @@ package com.jph.takephoto.model; import android.app.Activity; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; /** * Author: JPH diff --git a/app/src/main/java/com/jph/takephoto/permission/PermissionManager.java b/app/src/main/java/com/jph/takephoto/permission/PermissionManager.java index 28e602007..66bb30aba 100644 --- a/app/src/main/java/com/jph/takephoto/permission/PermissionManager.java +++ b/app/src/main/java/com/jph/takephoto/permission/PermissionManager.java @@ -3,10 +3,11 @@ package com.jph.takephoto.permission; import android.Manifest; import android.app.Activity; import android.content.pm.PackageManager; -import androidx.annotation.NonNull; -import androidx.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; +import android.support.annotation.NonNull; +import android.support.v4.app.ActivityCompat; +import android.support.v4.content.ContextCompat; import android.text.TextUtils; +import android.widget.Toast; import com.jph.takephoto.app.TakePhoto; import com.jph.takephoto.model.InvokeParam; diff --git a/app/src/main/java/com/jph/takephoto/uitl/TUriParse.java b/app/src/main/java/com/jph/takephoto/uitl/TUriParse.java index 442838be2..ce93b4d76 100644 --- a/app/src/main/java/com/jph/takephoto/uitl/TUriParse.java +++ b/app/src/main/java/com/jph/takephoto/uitl/TUriParse.java @@ -8,7 +8,7 @@ import android.net.Uri; import android.os.Build; import android.os.Environment; import android.provider.MediaStore; -import androidx.core.content.FileProvider; +import android.support.v4.content.FileProvider; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/jph/takephoto/uitl/TUtils.java b/app/src/main/java/com/jph/takephoto/uitl/TUtils.java index 67dcf0abe..cbb1ac613 100644 --- a/app/src/main/java/com/jph/takephoto/uitl/TUtils.java +++ b/app/src/main/java/com/jph/takephoto/uitl/TUtils.java @@ -7,9 +7,10 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; -import androidx.core.content.FileProvider; +import android.support.v4.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; diff --git a/app/src/main/java/com/yizhuan/erban/GuideAdapter.java b/app/src/main/java/com/yizhuan/erban/GuideAdapter.java index 0dbc2f47f..247679abd 100644 --- a/app/src/main/java/com/yizhuan/erban/GuideAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/GuideAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban; import android.content.Context; -import androidx.viewpager.widget.PagerAdapter; +import android.support.v4.view.PagerAdapter; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index cc931e63f..4524dfe31 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -10,9 +10,9 @@ import android.content.Intent; import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; import android.text.TextUtils; import android.util.Log; import android.util.LongSparseArray; @@ -66,8 +66,10 @@ 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; @@ -109,6 +111,7 @@ 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; @@ -214,6 +217,7 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/UIHelper.java b/app/src/main/java/com/yizhuan/erban/UIHelper.java index aaef7a3d3..3eaa1e8fc 100644 --- a/app/src/main/java/com/yizhuan/erban/UIHelper.java +++ b/app/src/main/java/com/yizhuan/erban/UIHelper.java @@ -6,7 +6,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.provider.Settings; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import com.yizhuan.erban.audio.AudioRecordActivity; import com.yizhuan.erban.audio.MyVoiceActivity; diff --git a/app/src/main/java/com/yizhuan/erban/UserGuideActivity.java b/app/src/main/java/com/yizhuan/erban/UserGuideActivity.java index 1ac99c395..c220082bf 100644 --- a/app/src/main/java/com/yizhuan/erban/UserGuideActivity.java +++ b/app/src/main/java/com/yizhuan/erban/UserGuideActivity.java @@ -3,7 +3,7 @@ package com.yizhuan.erban; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.ViewPager; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java index 47fcc89d9..be117b2d4 100644 --- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java +++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java @@ -10,7 +10,7 @@ import android.net.http.HttpResponseCache; import android.os.Build; import android.os.Environment; import android.os.StrictMode; -import androidx.multidex.MultiDex; +import android.support.multidex.MultiDex; import android.text.TextUtils; import android.util.ArrayMap; import android.util.Log; @@ -66,6 +66,7 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java b/app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java index c5b19be81..6e4dee8c1 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java +++ b/app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java @@ -5,8 +5,8 @@ import android.content.Intent; import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.yizhuan.erban.R; @@ -20,6 +20,8 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/audio/RecordingVoiceActivity.java b/app/src/main/java/com/yizhuan/erban/audio/RecordingVoiceActivity.java index 1d1fc3a73..86bdf41dc 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/RecordingVoiceActivity.java +++ b/app/src/main/java/com/yizhuan/erban/audio/RecordingVoiceActivity.java @@ -14,10 +14,10 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.os.SystemClock; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.DefaultItemAnimator; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; +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 android.util.Log; import android.view.View; import android.widget.Chronometer; diff --git a/app/src/main/java/com/yizhuan/erban/audio/VoiceMatchActivity.java b/app/src/main/java/com/yizhuan/erban/audio/VoiceMatchActivity.java index 3e0ad93f1..33a246e41 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/VoiceMatchActivity.java +++ b/app/src/main/java/com/yizhuan/erban/audio/VoiceMatchActivity.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.audio; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.constraintlayout.widget.Group; +import android.support.constraint.Group; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -15,6 +15,7 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/audio/adapter/CardAdapter.java b/app/src/main/java/com/yizhuan/erban/audio/adapter/CardAdapter.java index 524e720d8..79bcee410 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/adapter/CardAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/audio/adapter/CardAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.audio.adapter; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.v7.widget.RecyclerView; import android.text.method.ScrollingMovementMethod; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/audio/adapter/MyVoiceListAdapter.java b/app/src/main/java/com/yizhuan/erban/audio/adapter/MyVoiceListAdapter.java index 360f005a3..d1b46e554 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/adapter/MyVoiceListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/audio/adapter/MyVoiceListAdapter.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.audio.adapter; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/app/src/main/java/com/yizhuan/erban/audio/view/BottleContainer.java b/app/src/main/java/com/yizhuan/erban/audio/view/BottleContainer.java index 4eb6c76fc..10269a58d 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/view/BottleContainer.java +++ b/app/src/main/java/com/yizhuan/erban/audio/view/BottleContainer.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.audio.view; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.view.ViewTreeObserver; diff --git a/app/src/main/java/com/yizhuan/erban/audio/view/BottleLayout.java b/app/src/main/java/com/yizhuan/erban/audio/view/BottleLayout.java index 4b5a97395..82fc123f0 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/view/BottleLayout.java +++ b/app/src/main/java/com/yizhuan/erban/audio/view/BottleLayout.java @@ -4,7 +4,7 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; import android.content.Context; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.text.TextUtils; import android.view.MotionEvent; import android.widget.FrameLayout; diff --git a/app/src/main/java/com/yizhuan/erban/audio/view/PlayLoadingImageView.java b/app/src/main/java/com/yizhuan/erban/audio/view/PlayLoadingImageView.java index 2fe62cac1..cb9fc3769 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/view/PlayLoadingImageView.java +++ b/app/src/main/java/com/yizhuan/erban/audio/view/PlayLoadingImageView.java @@ -4,9 +4,10 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.RectF; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.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; diff --git a/app/src/main/java/com/yizhuan/erban/audio/widget/OnSwipeListener.java b/app/src/main/java/com/yizhuan/erban/audio/widget/OnSwipeListener.java index 196d8faa9..9af8d51e2 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/widget/OnSwipeListener.java +++ b/app/src/main/java/com/yizhuan/erban/audio/widget/OnSwipeListener.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.audio.widget; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; /** * 录制声音页面.声音卡片滑动监听 diff --git a/app/src/main/java/com/yizhuan/erban/audio/widget/RingProgressView.java b/app/src/main/java/com/yizhuan/erban/audio/widget/RingProgressView.java index d40121d58..d2784d39d 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/widget/RingProgressView.java +++ b/app/src/main/java/com/yizhuan/erban/audio/widget/RingProgressView.java @@ -5,7 +5,7 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.RectF; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceBottleFilterGenderBottomDialog.java b/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceBottleFilterGenderBottomDialog.java index 7fddb1bcf..eff17af1b 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceBottleFilterGenderBottomDialog.java +++ b/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceBottleFilterGenderBottomDialog.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.audio.widget; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; -import com.google.android.material.bottomsheet.BottomSheetDialog; +import android.support.annotation.NonNull; +import android.support.design.widget.BottomSheetDialog; import android.util.DisplayMetrics; import android.view.Display; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardItemTouchHelperCallback.java b/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardItemTouchHelperCallback.java index c8ea5c060..a32a33277 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardItemTouchHelperCallback.java +++ b/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardItemTouchHelperCallback.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.audio.widget; import android.graphics.Canvas; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.helper.ItemTouchHelper; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardLayoutManager.java b/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardLayoutManager.java index 7a57d43b1..d5ba0ab13 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardLayoutManager.java +++ b/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardLayoutManager.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.audio.widget; -import androidx.annotation.NonNull; -import androidx.core.view.MotionEventCompat; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; +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 android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardRecyclerView.java b/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardRecyclerView.java index b92d350b5..c32990c58 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardRecyclerView.java +++ b/app/src/main/java/com/yizhuan/erban/audio/widget/VoiceCardRecyclerView.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.audio.widget; import android.content.Context; import android.graphics.Canvas; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; /** diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ChatMemberDiffUtilCallback.java b/app/src/main/java/com/yizhuan/erban/avroom/ChatMemberDiffUtilCallback.java index 677d0d579..06538a375 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ChatMemberDiffUtilCallback.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/ChatMemberDiffUtilCallback.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.avroom; -import androidx.recyclerview.widget.DiffUtil; +import android.support.v7.util.DiffUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java index 744c0bfcf..6217298d9 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java @@ -7,10 +7,10 @@ import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Bundle; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.Fragment; -import androidx.core.content.ContextCompat; -import androidx.viewpager.widget.ViewPager; +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 android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextUtils; @@ -29,6 +29,7 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/CreatePKActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/CreatePKActivity.java index d68ba748d..8765f7e3d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/CreatePKActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/CreatePKActivity.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.avroom.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.gridlayout.widget.GridLayout; +import android.support.v7.widget.GridLayout; import android.view.View; import android.widget.CompoundButton; import android.widget.ImageView; @@ -30,8 +30,11 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/RecordForPKActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/RecordForPKActivity.java index 637f95538..e4274f2db 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/RecordForPKActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/RecordForPKActivity.java @@ -4,9 +4,9 @@ import android.content.Context; import android.content.Intent; import android.graphics.Color; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import com.trello.rxlifecycle2.android.ActivityEvent; import com.yizhuan.erban.R; @@ -24,6 +24,7 @@ import java.util.List; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; +import io.reactivex.functions.Action; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomBlackListActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomBlackListActivity.java index f9c955d6c..ddb4f7c6c 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomBlackListActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomBlackListActivity.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.avroom.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; @@ -33,6 +33,8 @@ import java.util.List; import java.util.ListIterator; import java.util.Objects; +import io.reactivex.Single; + /** * 黑名单 * diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomInviteActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomInviteActivity.java index ba79f6760..24b9822a9 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomInviteActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomInviteActivity.java @@ -2,9 +2,10 @@ package com.yizhuan.erban.avroom.activity; import android.content.Intent; import android.os.Bundle; -import androidx.fragment.app.FragmentActivity; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.app.FragmentActivity; +import android.support.v7.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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomManagerListActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomManagerListActivity.java index ff2380764..58df52fc9 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomManagerListActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomManagerListActivity.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.avroom.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomOnlineUserActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomOnlineUserActivity.java index 671dc1fa3..934dd80f2 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomOnlineUserActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomOnlineUserActivity.java @@ -2,13 +2,15 @@ package com.yizhuan.erban.avroom.activity; import android.content.Context; import android.content.Intent; -import androidx.appcompat.app.AppCompatActivity; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomRankListActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomRankListActivity.java index 4af21e27c..fd59c291d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomRankListActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomRankListActivity.java @@ -2,23 +2,34 @@ package com.yizhuan.erban.avroom.activity; import android.content.Context; import android.content.Intent; -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.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 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomSettingActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomSettingActivity.java index 8e7eb54ba..c1871c9f4 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomSettingActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomSettingActivity.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.avroom.activity; import android.content.Context; import android.content.Intent; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; import android.os.Bundle; import android.text.SpannableString; import android.text.TextUtils; @@ -41,6 +41,7 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java index 6e210627a..7afc81fdf 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.avroom.adapter; import android.content.Context; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; @@ -11,6 +11,7 @@ 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; @@ -19,6 +20,7 @@ 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; /** diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/CpMicroViewAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/CpMicroViewAdapter.java index 83bc847d2..9bae1eca2 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/CpMicroViewAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/CpMicroViewAdapter.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.avroom.adapter; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/HomePartyPageAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/HomePartyPageAdapter.java index 92c57b03a..8b0462a91 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/HomePartyPageAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/HomePartyPageAdapter.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.avroom.adapter; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/InviteFriendListAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/InviteFriendListAdapter.java index 91a86d8e7..4dd47ae00 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/InviteFriendListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/InviteFriendListAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.avroom.adapter; import android.app.Activity; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.text.TextUtils; import android.view.View; import android.widget.CheckBox; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/KtvMicroViewAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/KtvMicroViewAdapter.java index a20b55b4f..04e052dec 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/KtvMicroViewAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/KtvMicroViewAdapter.java @@ -1,15 +1,16 @@ package com.yizhuan.erban.avroom.adapter; import android.content.Context; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +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.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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicQueueAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicQueueAdapter.java index 540d750a5..2eac4400e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicQueueAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicQueueAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.avroom.adapter; import android.graphics.drawable.GradientDrawable; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java index 546fc032c..5e22b5837 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java @@ -1,11 +1,11 @@ package com.yizhuan.erban.avroom.adapter; -import androidx.lifecycle.Observer; +import android.arch.lifecycle.Observer; import android.content.Context; import android.graphics.drawable.BitmapDrawable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -26,6 +26,7 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java index 234f3bf51..6515b3f08 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java @@ -2,10 +2,11 @@ package com.yizhuan.erban.avroom.adapter; import android.content.Context; import android.graphics.Color; -import androidx.core.content.ContextCompat; -import androidx.appcompat.widget.AppCompatImageView; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.content.ContextCompat; +import android.support.v7.widget.AppCompatImageView; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/PKMicQueueAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/PKMicQueueAdapter.java index 935492f67..d6581abb9 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/PKMicQueueAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/PKMicQueueAdapter.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.avroom.adapter; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RecordForPKAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RecordForPKAdapter.java index ab29a5e05..45c0f9df1 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RecordForPKAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RecordForPKAdapter.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.avroom.adapter; import android.content.Context; import android.graphics.drawable.GradientDrawable; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; @@ -14,6 +14,7 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomBlackListAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomBlackListAdapter.java index 56d1e8695..0b012edab 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomBlackListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomBlackListAdapter.java @@ -1,15 +1,24 @@ package com.yizhuan.erban.avroom.adapter; import android.content.Context; -import androidx.annotation.NonNull; +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 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; + /** * 右滑操作的，写了暂时不用 diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumeListAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumeListAdapter.java index d8fee27c6..60c7260a1 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumeListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumeListAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.avroom.adapter; import android.content.Context; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumerListAdapterTemp.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumerListAdapterTemp.java index 125cf37b3..ac8982793 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumerListAdapterTemp.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumerListAdapterTemp.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.avroom.adapter; import android.content.Context; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomContributeListAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomContributeListAdapter.java index 850c94708..169207780 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomContributeListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomContributeListAdapter.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.avroom.adapter; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomInviteAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomInviteAdapter.java index 7ec7d56fd..33fa40115 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomInviteAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomInviteAdapter.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.avroom.adapter; import android.content.Context; -import androidx.recyclerview.widget.DiffUtil; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.util.DiffUtil; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomNormalListAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomNormalListAdapter.java index 7e3ffbd75..72a51f763 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomNormalListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomNormalListAdapter.java @@ -1,10 +1,11 @@ package com.yizhuan.erban.avroom.adapter; import android.content.Context; -import androidx.recyclerview.widget.RecyclerView; +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 com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomRankFragmentPageAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomRankFragmentPageAdapter.java index ea8177900..4df26181b 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomRankFragmentPageAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomRankFragmentPageAdapter.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.avroom.adapter; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java index 75e58594d..171829819 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java @@ -3,10 +3,10 @@ package com.yizhuan.erban.avroom.dialog; import android.content.Context; import android.graphics.Color; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.Spannable; import android.text.SpannableString; import android.text.SpannableStringBuilder; @@ -18,6 +18,7 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/NewUserTaskDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/NewUserTaskDialog.java index 35667c10d..cc5a9eb9e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/NewUserTaskDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/NewUserTaskDialog.java @@ -2,9 +2,9 @@ package com.yizhuan.erban.avroom.dialog; import android.app.Dialog; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.DialogFragment; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKMicQueueDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKMicQueueDialog.java index 67539f3c3..627c18dd0 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKMicQueueDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKMicQueueDialog.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.avroom.dialog; import android.content.Context; import android.graphics.Color; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.Spannable; import android.text.SpannableString; import android.text.SpannableStringBuilder; @@ -17,6 +17,7 @@ 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; @@ -51,6 +52,7 @@ 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 diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKResultDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKResultDialog.java index 64fbc2fd7..002edfb07 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKResultDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKResultDialog.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.avroom.dialog; import android.content.Context; import android.graphics.Color; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.Gravity; import android.view.View; import android.view.Window; @@ -26,6 +26,7 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKScoreBoardDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKScoreBoardDialog.java index 44cce555e..1e4acca40 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKScoreBoardDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKScoreBoardDialog.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.avroom.dialog; import android.content.Context; import android.os.Bundle; -import androidx.gridlayout.widget.GridLayout; +import android.support.v7.widget.GridLayout; import android.view.View; import android.widget.LinearLayout; import android.widget.ProgressBar; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKSelectPeopleDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKSelectPeopleDialog.java index f828ad516..0b02d658b 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKSelectPeopleDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKSelectPeopleDialog.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.avroom.dialog; import android.content.Context; import android.graphics.Rect; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.util.SparseArray; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java index e8a9eccb2..30ced4d12 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java @@ -2,10 +2,10 @@ package com.yizhuan.erban.avroom.dialog; import android.content.Context; import android.content.Intent; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; import android.os.Bundle; -import com.google.android.material.bottomsheet.BottomSheetBehavior; -import com.google.android.material.bottomsheet.BottomSheetDialog; +import android.support.design.widget.BottomSheetBehavior; +import android.support.design.widget.BottomSheetDialog; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.Display; @@ -29,6 +29,8 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java index 636263437..11ef8cc79 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java @@ -3,10 +3,10 @@ package com.yizhuan.erban.avroom.dialog; import android.content.Context; import android.graphics.Color; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.android.material.bottomsheet.BottomSheetDialog; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.design.widget.BottomSheetDialog; +import android.support.v7.widget.RecyclerView; import android.util.DisplayMetrics; import android.view.Display; import android.view.View; @@ -16,6 +16,7 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationVm.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationVm.java index 706545a84..491d191df 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationVm.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationVm.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.avroom.dialog; -import androidx.lifecycle.MutableLiveData; +import android.arch.lifecycle.MutableLiveData; import android.content.Context; -import androidx.databinding.ObservableBoolean; -import androidx.databinding.ObservableField; +import android.databinding.ObservableBoolean; +import android.databinding.ObservableField; import com.yizhuan.erban.R; import com.yizhuan.xchat_android_core.auth.AuthModel; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/DialogWebFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/DialogWebFragment.java index d39d532e6..f8f08e5f5 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/DialogWebFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/DialogWebFragment.java @@ -12,10 +12,10 @@ import android.net.Uri; import android.net.http.SslError; import android.os.Build; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.FragmentManager; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.DialogFragment; +import android.support.v4.app.FragmentManager; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.Display; @@ -32,6 +32,7 @@ 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; @@ -40,6 +41,7 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java index 1353831c3..5707b5b16 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java @@ -4,13 +4,13 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.content.res.AssetFileDescriptor; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; import android.graphics.Color; import android.media.MediaPlayer; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.viewpager.widget.ViewPager; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.annotation.Nullable; +import android.support.v4.view.ViewPager; +import android.support.v7.widget.AppCompatImageView; import android.text.Html; import android.text.TextUtils; import android.text.style.ForegroundColorSpan; @@ -67,6 +67,7 @@ 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; @@ -78,6 +79,7 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java index 34be50d7d..027dc1054 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java @@ -3,20 +3,20 @@ package com.yizhuan.erban.avroom.fragment; import android.Manifest; import android.annotation.SuppressLint; import android.app.Activity; -import androidx.lifecycle.ViewModelProviders; +import android.arch.lifecycle.ViewModelProviders; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; import android.os.Bundle; -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.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 android.text.TextUtils; import android.view.View; import android.view.ViewStub; @@ -72,6 +72,7 @@ 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; @@ -106,6 +107,7 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyUserListFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyUserListFragment.java index 0b165a098..bc4554685 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyUserListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyUserListFragment.java @@ -2,9 +2,10 @@ package com.yizhuan.erban.avroom.fragment; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/InputPwdDialogFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/InputPwdDialogFragment.java index acb921623..69c28282c 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/InputPwdDialogFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/InputPwdDialogFragment.java @@ -1,12 +1,14 @@ package com.yizhuan.erban.avroom.fragment; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; +import android.support.annotation.Nullable; +import android.support.v4.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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/InviteFriendListFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/InviteFriendListFragment.java index b1f5133ae..a25f77b5d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/InviteFriendListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/InviteFriendListFragment.java @@ -1,14 +1,16 @@ package com.yizhuan.erban.avroom.fragment; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/OnlineUserFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/OnlineUserFragment.java index 7d9e79fcf..64711e376 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/OnlineUserFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/OnlineUserFragment.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.avroom.fragment; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmListFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmListFragment.java index 138b61f3d..6189af0e4 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmListFragment.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.avroom.fragment; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmRankingListFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmRankingListFragment.java index d2490695c..446b6b180 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmRankingListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmRankingListFragment.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.avroom.fragment; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.app.Fragment; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeFragment.java index e6a4fda89..831a11210 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeFragment.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.avroom.fragment; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java index 830f58073..097df08f8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.avroom.fragment; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java index d387a7fa0..5f55b2185 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java @@ -3,11 +3,11 @@ package com.yizhuan.erban.avroom.fragment; import android.app.Dialog; import android.content.Context; import android.os.Bundle; -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.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 android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankHalfHourFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankHalfHourFragment.java index f10aba3bb..eb01a4bf6 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankHalfHourFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankHalfHourFragment.java @@ -2,9 +2,9 @@ package com.yizhuan.erban.avroom.fragment; import android.content.Context; import android.os.Bundle; -import androidx.core.widget.NestedScrollView; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.NestedScrollView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankListFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankListFragment.java index c2aceec1e..26c1cfaca 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankListFragment.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.avroom.fragment; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.view.View; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomTitleDialogFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomTitleDialogFragment.java index 60469ff7b..ca7810944 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomTitleDialogFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomTitleDialogFragment.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.avroom.fragment; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; - +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.DialogFragment; +import android.support.v4.app.FragmentManager; import android.text.TextUtils; import android.text.method.ScrollingMovementMethod; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/GameAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/game/GameAdapter.java index 778d24d2f..bae3c8aab 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/game/GameAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/game/GameAdapter.java @@ -1,7 +1,10 @@ package com.yizhuan.erban.avroom.game; -import androidx.databinding.ViewDataBinding; +import android.databinding.ViewDataBinding; +import android.view.View; +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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/GameSelectDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/game/GameSelectDialog.java index 81219fb37..720b0b4f7 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/game/GameSelectDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/game/GameSelectDialog.java @@ -1,31 +1,43 @@ package com.yizhuan.erban.avroom.game; import android.content.Context; -import androidx.databinding.DataBindingUtil; - +import android.databinding.DataBindingUtil; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -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.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 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/GameView.java b/app/src/main/java/com/yizhuan/erban/avroom/game/GameView.java index 2b342c8d1..b4c621f54 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/game/GameView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/game/GameView.java @@ -3,21 +3,24 @@ package com.yizhuan.erban.avroom.game; import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; -import androidx.databinding.DataBindingUtil; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - +import android.databinding.DataBindingUtil; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.widget.RecyclerView; 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; @@ -51,6 +54,7 @@ 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 { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/MatchViewModel.java b/app/src/main/java/com/yizhuan/erban/avroom/game/MatchViewModel.java index e660a3c3e..6129d1f47 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/game/MatchViewModel.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/game/MatchViewModel.java @@ -1,11 +1,12 @@ package com.yizhuan.erban.avroom.game; -import androidx.databinding.ObservableField; +import android.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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/PlayGameActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/game/PlayGameActivity.java index 7bb08fa11..2c4ba4cf9 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/game/PlayGameActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/game/PlayGameActivity.java @@ -5,10 +5,13 @@ 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 androidx.annotation.Nullable; +import android.os.Environment; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; @@ -19,6 +22,7 @@ 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; @@ -27,19 +31,31 @@ 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; @@ -48,21 +64,37 @@ 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 { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/PlayGameVm.java b/app/src/main/java/com/yizhuan/erban/avroom/game/PlayGameVm.java index 51ae25232..da4f8510d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/game/PlayGameVm.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/game/PlayGameVm.java @@ -1,12 +1,14 @@ package com.yizhuan.erban.avroom.game; -import androidx.databinding.ObservableArrayList; -import androidx.databinding.ObservableBoolean; -import androidx.databinding.ObservableField; - +import android.databinding.ObservableArrayList; +import android.databinding.ObservableBoolean; +import android.databinding.ObservableField; +import android.text.TextUtils; 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; @@ -30,9 +32,14 @@ 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;//再来一局 diff --git a/app/src/main/java/com/yizhuan/erban/avroom/helper/RoomViewModel.java b/app/src/main/java/com/yizhuan/erban/avroom/helper/RoomViewModel.java index 8d4b97d7f..d66eabe44 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/helper/RoomViewModel.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/helper/RoomViewModel.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.avroom.helper; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; +import android.arch.lifecycle.MutableLiveData; +import android.arch.lifecycle.ViewModel; import lombok.Getter; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvMusicManager.java b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvMusicManager.java index 6922bd1fd..0bfa79351 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvMusicManager.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvMusicManager.java @@ -1,9 +1,10 @@ package com.yizhuan.erban.avroom.ktv; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.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; @@ -18,6 +19,8 @@ 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; @@ -27,6 +30,7 @@ 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; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListActivity.java index e22672263..dd4148a1c 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListActivity.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.avroom.ktv; import android.content.Context; import android.content.Intent; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseBindingActivity; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListFragment.java index 9781dfd80..b4d039b33 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListFragment.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.avroom.ktv; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.GridLayoutManager; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.GridLayoutManager; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSearchSongActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSearchSongActivity.java index 14cd25032..b77dcbfe3 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSearchSongActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSearchSongActivity.java @@ -4,8 +4,8 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.LinearLayoutManager; +import android.support.annotation.Nullable; +import android.support.v7.widget.LinearLayoutManager; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSelectSongActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSelectSongActivity.java index e8576229a..0bb5c451d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSelectSongActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSelectSongActivity.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.avroom.ktv; import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; -import androidx.recyclerview.widget.LinearLayoutManager; +import android.support.v7.widget.LinearLayoutManager; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListActivity.java index 7a7c6b96c..fd115f7cb 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListActivity.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.avroom.ktv; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; import android.view.View; import com.trello.rxlifecycle2.android.ActivityEvent; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListAdapter.java index 0d1debb6f..3767bd2e4 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListAdapter.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.avroom.ktv; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.yizhuan.erban.R; import com.yizhuan.erban.bindadapter.BaseAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListVm.java b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListVm.java index 37f9100ed..5be4f8228 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListVm.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListVm.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.avroom.ktv; -import androidx.lifecycle.MutableLiveData; -import androidx.databinding.ObservableInt; +import android.arch.lifecycle.MutableLiveData; +import android.databinding.ObservableInt; import com.yizhuan.erban.base.BaseMsListViewModel; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvView.java b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvView.java index ddbebc044..cf39b1d04 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvView.java @@ -2,10 +2,10 @@ package com.yizhuan.erban.avroom.ktv; import android.annotation.SuppressLint; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.constraintlayout.widget.Group; -import androidx.cardview.widget.CardView; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.constraint.Group; +import android.support.v7.widget.CardView; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.SurfaceView; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java index 83070adc9..43dfbc17f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.avroom.presenter; import android.annotation.SuppressLint; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.Log; import android.util.SparseArray; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomRankPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomRankPresenter.java index 419c73af9..b5bf69bae 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomRankPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomRankPresenter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.avroom.presenter; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.yizhuan.erban.avroom.adapter.RoomConsumerListAdapterTemp; import com.yizhuan.erban.base.BaseMvpPresenter; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java index 188bc1289..cacb63ec9 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java @@ -1,18 +1,20 @@ package com.yizhuan.erban.avroom.presenter; import android.annotation.SuppressLint; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.text.TextUtils; import android.util.Log; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; 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.netease.nimlib.sdk.util.Entry; import com.orhanobut.logger.Logger; +import com.trello.rxlifecycle2.android.ActivityEvent; import com.yizhuan.erban.avroom.view.IHomePartyView; import com.yizhuan.erban.base.BaseMvpPresenter; import com.yizhuan.xchat_android_core.Constants; @@ -21,6 +23,7 @@ import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; 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.RoomInfoAttachment; +import com.yizhuan.xchat_android_core.kick.KickModel; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; import com.yizhuan.xchat_android_core.manager.RoomEvent; @@ -39,7 +42,9 @@ 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.super_admin.model.ISuperAdminModel; import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel; +import com.yizhuan.xchat_android_core.super_admin.util.SaAttachmentFactory; 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.BaseInfo; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/MyRecommendCardActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/MyRecommendCardActivity.java index 428b0e649..08a0410aa 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/MyRecommendCardActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/MyRecommendCardActivity.java @@ -3,22 +3,26 @@ package com.yizhuan.erban.avroom.recommendcard; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentStatePagerAdapter; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentStatePagerAdapter; +import android.support.v4.view.ViewPager; import android.view.View; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseActivity; import com.yizhuan.erban.base.TitleBar; import com.yizhuan.erban.module_hall.hall.view.indicator.StatisticsIndicatorAdapter; +import com.yizhuan.erban.module_hall.income.presenter.IncomeStatisticsPresenter; import com.yizhuan.erban.ui.webview.CommonWebViewActivity; import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator; import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import com.yizhuan.xchat_android_core.UriProvider; import com.yizhuan.xchat_android_core.room.recommendpos.bean.RcmdCardType; +import com.yizhuan.xchat_android_core.statistic.StatisticManager; +import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; +import com.yizhuan.xchat_android_library.utils.config.BasicConfig; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java index 777c020b6..0cfac3a11 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java @@ -2,9 +2,9 @@ package com.yizhuan.erban.avroom.recommendcard; import android.content.Context; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/ActivityTimerView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/ActivityTimerView.java index c4d52b17f..942d6034d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/ActivityTimerView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/ActivityTimerView.java @@ -2,11 +2,12 @@ package com.yizhuan.erban.avroom.widget; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.AttributeSet; import android.widget.LinearLayout; import android.widget.TextView; +import com.netease.nim.uikit.common.util.log.LogUtil; import com.yizhuan.erban.R; import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean; @@ -15,6 +16,7 @@ import java.util.concurrent.TimeUnit; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; +import io.reactivex.functions.Consumer; import io.reactivex.schedulers.Schedulers; /** diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java index 99f6affc4..09b9e6faf 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.avroom.widget; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import androidx.appcompat.app.AppCompatDialog; +import android.support.v7.app.AppCompatDialog; import android.text.Editable; import android.text.InputFilter; import android.text.InputType; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java index 3b9e16ab7..12e1aa4b5 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.avroom.widget; import android.content.Context; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.v7.widget.AppCompatTextView; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/GalleryLayoutManager.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/GalleryLayoutManager.java index 90f8a5151..f8b349ad8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GalleryLayoutManager.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/GalleryLayoutManager.java @@ -3,25 +3,24 @@ package com.yizhuan.erban.avroom.widget; import android.content.Context; import android.graphics.PointF; import android.graphics.Rect; -import androidx.recyclerview.widget.LinearSmoothScroller; -import androidx.recyclerview.widget.LinearSnapHelper; -import androidx.recyclerview.widget.OrientationHelper; -import androidx.recyclerview.widget.RecyclerView; -import androidx.viewpager.widget.ViewPager; - +import android.support.v7.widget.LinearSmoothScroller; +import android.support.v7.widget.LinearSnapHelper; +import android.support.v7.widget.OrientationHelper; +import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.util.Log; import android.util.SparseArray; import android.view.View; import android.view.ViewGroup; +import com.netease.nim.uikit.common.util.log.LogUtil; import com.yizhuan.erban.BuildConfig; import com.yizhuan.erban.application.XChatApplication; -import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; +import static android.support.v7.widget.RecyclerView.SCROLL_STATE_IDLE; /** - * A custom LayoutManager to build a {@link android.widget.Gallery} or a {@link ViewPager}like {@link RecyclerView} and + * A custom LayoutManager to build a {@link android.widget.Gallery} or a {@link android.support.v4.view.ViewPager}like {@link RecyclerView} and * support both {@link GalleryLayoutManager#HORIZONTAL} and {@link GalleryLayoutManager#VERTICAL} scroll. * Created by chensuilun on 2016/11/18. */ diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java index 994ed69de..963d4d0bf 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java @@ -4,13 +4,13 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; -import androidx.core.content.res.ResourcesCompat; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.OrientationHelper; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.SimpleItemAnimator; +import android.support.annotation.NonNull; +import android.support.v4.content.ContextCompat; +import android.support.v4.content.res.ResourcesCompat; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.OrientationHelper; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.SimpleItemAnimator; import android.text.Editable; import android.text.SpannableStringBuilder; import android.text.Spanned; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java index a1663bd86..2440b4223 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java @@ -1,11 +1,11 @@ package com.yizhuan.erban.avroom.widget; import android.content.Context; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; import android.graphics.Point; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.Drawable; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.util.AttributeSet; import android.util.SparseArray; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java index d668be31d..520593ee0 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.avroom.widget; import android.content.Context; import android.graphics.Color; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankNavigatorAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankNavigatorAdapter.java index d73f2d236..2e37d037e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankNavigatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankNavigatorAdapter.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.avroom.widget; import android.content.Context; import android.graphics.Color; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankWrapViewPager.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankWrapViewPager.java index 70fd61ae8..32a6797bc 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankWrapViewPager.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankWrapViewPager.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.avroom.widget; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.view.MotionEvent; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/ScrollSpeedLinearLayoutManger.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/ScrollSpeedLinearLayoutManger.java index 9569ac51a..daab1bbe8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/ScrollSpeedLinearLayoutManger.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/ScrollSpeedLinearLayoutManger.java @@ -2,9 +2,9 @@ package com.yizhuan.erban.avroom.widget; import android.content.Context; import android.graphics.PointF; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.LinearSmoothScroller; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.LinearSmoothScroller; +import android.support.v7.widget.RecyclerView; import android.util.DisplayMetrics; import android.util.Log; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java index 255d29327..20264cbaf 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java @@ -8,8 +8,8 @@ import android.graphics.Typeface; import android.os.Build; import android.os.Bundle; import android.os.Handler; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseBindingActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseBindingActivity.java index f31dd78d0..e0a6de21c 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseBindingActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseBindingActivity.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.base; import android.content.Intent; -import androidx.databinding.DataBindingUtil; -import androidx.databinding.ViewDataBinding; +import android.databinding.DataBindingUtil; +import android.databinding.ViewDataBinding; import android.os.Bundle; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseBindingFragment.java b/app/src/main/java/com/yizhuan/erban/base/BaseBindingFragment.java index 3c4b1b8b6..d95fb3f92 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseBindingFragment.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseBindingFragment.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.base; -import androidx.databinding.DataBindingUtil; -import androidx.databinding.ViewDataBinding; +import android.databinding.DataBindingUtil; +import android.databinding.ViewDataBinding; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseBindingTakePhotoActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseBindingTakePhotoActivity.java index 9d46bd777..45d142864 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseBindingTakePhotoActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseBindingTakePhotoActivity.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.base; import android.annotation.SuppressLint; -import androidx.databinding.DataBindingUtil; -import androidx.databinding.ViewDataBinding; +import android.databinding.DataBindingUtil; +import android.databinding.ViewDataBinding; import android.net.Uri; import android.os.Bundle; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseBsDialog.java b/app/src/main/java/com/yizhuan/erban/base/BaseBsDialog.java index ea504ff68..d019fc53a 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseBsDialog.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseBsDialog.java @@ -2,9 +2,9 @@ package com.yizhuan.erban.base; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; -import com.google.android.material.bottomsheet.BottomSheetBehavior; -import com.google.android.material.bottomsheet.BottomSheetDialog; +import android.support.annotation.NonNull; +import android.support.design.widget.BottomSheetBehavior; +import android.support.design.widget.BottomSheetDialog; import android.view.WindowManager; import android.widget.FrameLayout; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseFragment.java b/app/src/main/java/com/yizhuan/erban/base/BaseFragment.java index 1e678e951..299552500 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseFragment.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseFragment.java @@ -5,10 +5,10 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; -import androidx.fragment.app.FragmentManager; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentActivity; +import android.support.v4.app.FragmentManager; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MenuItem; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseLazyFragment.java b/app/src/main/java/com/yizhuan/erban/base/BaseLazyFragment.java index 36129982c..06ebb156c 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseLazyFragment.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseLazyFragment.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.base; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.view.View; /** diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseListViewModel.java b/app/src/main/java/com/yizhuan/erban/base/BaseListViewModel.java index 1a79226ba..fa9adb76b 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseListViewModel.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseListViewModel.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.base; -import androidx.databinding.ObservableArrayList; -import androidx.databinding.ObservableBoolean; -import androidx.databinding.ObservableField; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import android.databinding.ObservableArrayList; +import android.databinding.ObservableBoolean; +import android.databinding.ObservableField; +import android.support.v4.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; import com.yizhuan.xchat_android_core.Constants; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java b/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java index ab52325c4..a2a98694a 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.base; import android.annotation.SuppressLint; import android.graphics.Color; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; +import android.support.annotation.NonNull; +import android.support.v4.content.ContextCompat; import android.text.SpannableString; import android.text.SpannableStringBuilder; import android.text.Spanned; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMsListViewModel.java b/app/src/main/java/com/yizhuan/erban/base/BaseMsListViewModel.java index abf8f4dca..3cdb79b76 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseMsListViewModel.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseMsListViewModel.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.base; -import androidx.databinding.ObservableArrayList; -import androidx.databinding.ObservableBoolean; -import androidx.databinding.ObservableField; -import androidx.databinding.ViewDataBinding; +import android.databinding.ObservableArrayList; +import android.databinding.ObservableBoolean; +import android.databinding.ObservableField; +import android.databinding.ViewDataBinding; import com.trello.rxlifecycle2.LifecycleProvider; import com.yizhuan.xchat_android_core.Constants; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java index 53200dbdd..65090b7d2 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java @@ -7,9 +7,9 @@ import android.graphics.Color; import android.graphics.Typeface; import android.os.Build; import android.os.Bundle; -import androidx.annotation.ColorInt; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; +import android.support.annotation.ColorInt; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMvpFragment.java b/app/src/main/java/com/yizhuan/erban/base/BaseMvpFragment.java index 026767982..9c353cf93 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseMvpFragment.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseMvpFragment.java @@ -6,9 +6,9 @@ import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MenuItem; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMvpPresenter.java b/app/src/main/java/com/yizhuan/erban/base/BaseMvpPresenter.java index 3ba08106a..cc385595d 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseMvpPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseMvpPresenter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.base; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.yizhuan.xchat_android_library.base.AbstractMvpPresenter; import com.yizhuan.xchat_android_library.base.IMvpBaseView; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMvpTakePhotoActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseMvpTakePhotoActivity.java index 505a18fe0..88f6eb3bc 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseMvpTakePhotoActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseMvpTakePhotoActivity.java @@ -2,13 +2,15 @@ package com.yizhuan.erban.base; import android.annotation.SuppressLint; import android.content.Intent; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.CallSuper; +import android.support.annotation.CallSuper; import android.util.Log; +import android.view.View; import com.jph.takephoto.app.TakePhoto; +import com.jph.takephoto.app.TakePhotoActivity; import com.jph.takephoto.app.TakePhotoImpl; import com.jph.takephoto.compress.CompressConfig; import com.jph.takephoto.model.CropOptions; @@ -22,6 +24,7 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.common.permission.PermissionActivity; import com.yizhuan.erban.ui.widget.ButtonItem; import com.yizhuan.xchat_android_core.file.FileModel; +import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; import com.yizhuan.xchat_android_library.base.AbstractMvpPresenter; import com.yizhuan.xchat_android_library.base.IMvpBaseView; import com.yizhuan.xchat_android_library.utils.file.JXFileUtils; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseSdDialog.java b/app/src/main/java/com/yizhuan/erban/base/BaseSdDialog.java index 5ee84eb71..b20f771a5 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseSdDialog.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseSdDialog.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.base; import android.content.Context; -import androidx.appcompat.app.AppCompatDialog; +import android.support.v7.app.AppCompatDialog; /** diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseViewModel.java b/app/src/main/java/com/yizhuan/erban/base/BaseViewModel.java index 0e63467f9..e1c4eaada 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseViewModel.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseViewModel.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.base; -import androidx.databinding.ObservableBoolean; -import androidx.databinding.ViewDataBinding; +import android.databinding.ObservableBoolean; +import android.databinding.ViewDataBinding; /** * Created by huangmeng1 on 2018/5/7. diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseYAdapter.java b/app/src/main/java/com/yizhuan/erban/base/BaseYAdapter.java index a64aa1eb7..2561f293c 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseYAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseYAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.base; import android.content.Context; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.yizhuan.erban.ui.utils.ArrayUtils; diff --git a/app/src/main/java/com/yizhuan/erban/base/LRecyclerView.java b/app/src/main/java/com/yizhuan/erban/base/LRecyclerView.java index 1c0d0b891..0a1e5d575 100644 --- a/app/src/main/java/com/yizhuan/erban/base/LRecyclerView.java +++ b/app/src/main/java/com/yizhuan/erban/base/LRecyclerView.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.base; import android.content.Context; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/BaseRecyclerView.java b/app/src/main/java/com/yizhuan/erban/base/list/BaseRecyclerView.java index 55301a02a..6dec883e3 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/BaseRecyclerView.java +++ b/app/src/main/java/com/yizhuan/erban/base/list/BaseRecyclerView.java @@ -2,12 +2,13 @@ package com.yizhuan.erban.base.list; import android.annotation.SuppressLint; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.StaggeredGridLayoutManager; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.StaggeredGridLayoutManager; import android.util.AttributeSet; import com.trello.rxlifecycle2.LifecycleProvider; @@ -22,7 +23,9 @@ import java.util.ArrayList; import java.util.List; import io.reactivex.Single; +import io.reactivex.SingleSource; import io.reactivex.SingleTransformer; +import io.reactivex.functions.BiConsumer; /** * 通用的刷新列表控件 diff --git a/app/src/main/java/com/yizhuan/erban/base/list/BaseViewHolder.java b/app/src/main/java/com/yizhuan/erban/base/list/BaseViewHolder.java index 43df7c450..8a2fb90d0 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/BaseViewHolder.java +++ b/app/src/main/java/com/yizhuan/erban/base/list/BaseViewHolder.java @@ -20,11 +20,11 @@ import android.graphics.Paint; import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Build; -import androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; -import androidx.annotation.IdRes; -import androidx.annotation.StringRes; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.ColorInt; +import android.support.annotation.DrawableRes; +import android.support.annotation.IdRes; +import android.support.annotation.StringRes; +import android.support.v7.widget.RecyclerView; import android.text.util.Linkify; import android.util.SparseArray; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/CommonAdapter.java b/app/src/main/java/com/yizhuan/erban/base/list/CommonAdapter.java index bffe78371..c197b6873 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/CommonAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/base/list/CommonAdapter.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.base.list; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/IRecyclerListener.java b/app/src/main/java/com/yizhuan/erban/base/list/IRecyclerListener.java index 3fa266c23..2b83ee061 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/IRecyclerListener.java +++ b/app/src/main/java/com/yizhuan/erban/base/list/IRecyclerListener.java @@ -1,9 +1,10 @@ package com.yizhuan.erban.base.list; import android.content.Context; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import com.yizhuan.erban.R; +import com.yizhuan.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/LineColorDecoration.java b/app/src/main/java/com/yizhuan/erban/base/list/LineColorDecoration.java index 14b7724cb..5ea05168e 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/LineColorDecoration.java +++ b/app/src/main/java/com/yizhuan/erban/base/list/LineColorDecoration.java @@ -5,9 +5,10 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.View; +import com.yizhuan.xchat_android_library.bindinglist.MultiTypeAdapter; import com.yizhuan.xchat_android_library.utils.SizeUtils; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/MultiCommonAdapter.java b/app/src/main/java/com/yizhuan/erban/base/list/MultiCommonAdapter.java index c6289d837..71154f182 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/MultiCommonAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/base/list/MultiCommonAdapter.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.base.list; -import androidx.annotation.LayoutRes; +import android.support.annotation.LayoutRes; import android.util.SparseIntArray; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/RefreshRecyclerView.java b/app/src/main/java/com/yizhuan/erban/base/list/RefreshRecyclerView.java index 0ceca4d88..b4acb76ac 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/RefreshRecyclerView.java +++ b/app/src/main/java/com/yizhuan/erban/base/list/RefreshRecyclerView.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.base.list; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.util.AttributeSet; /** diff --git a/app/src/main/java/com/yizhuan/erban/base/list/WrapperAdapter.java b/app/src/main/java/com/yizhuan/erban/base/list/WrapperAdapter.java index cea770e06..fcef4d477 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/WrapperAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/base/list/WrapperAdapter.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.base.list; import android.content.Context; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillBaseActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/BillBaseActivity.java index faa5a9c98..1cf8461c0 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillBaseActivity.java +++ b/app/src/main/java/com/yizhuan/erban/bills/activities/BillBaseActivity.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.bills.activities; import android.annotation.SuppressLint; -import androidx.databinding.ViewDataBinding; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.RecyclerView; +import android.databinding.ViewDataBinding; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftIncomeGroupActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftIncomeGroupActivity.java index 9aa13069a..356a9f195 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftIncomeGroupActivity.java +++ b/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftIncomeGroupActivity.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.bills.activities; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -18,6 +18,7 @@ import com.yizhuan.erban.bills.fragmemt.GiftOutputFragment; import com.yizhuan.erban.bills.fragmemt.RadishGiftFragment; import com.yizhuan.erban.bills.presenter.BillGiftIncomeGroupPresenter; import com.yizhuan.erban.bills.view.IBillGiftIncomeGroupView; +import com.yizhuan.erban.bills.view.IGiftIncomeView; import com.yizhuan.erban.bills.view.ISmoothToTopView; import com.yizhuan.erban.bills.widget.BillGiftIncomeGroupNavigatorAdapter; import com.yizhuan.erban.ui.pay.ChargeActivity; diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/RadishGiftAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/adapter/RadishGiftAdapter.java index 72e5a8044..76285ea15 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/RadishGiftAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/bills/adapter/RadishGiftAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.bills.adapter; -import androidx.core.content.ContextCompat; - +import android.support.v4.content.ContextCompat; +import android.view.View; import android.widget.ImageView; import com.chad.library.adapter.base.BaseViewHolder; diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsIndicatorAdapter.java index 082ae43a4..cbf21490d 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsIndicatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsIndicatorAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.bills.adapter; import android.content.Context; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.v7.widget.AppCompatTextView; import android.view.Gravity; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/BaseBillsFragment.java b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/BaseBillsFragment.java index c7e51be48..5d236f240 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/BaseBillsFragment.java +++ b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/BaseBillsFragment.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.bills.fragmemt; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftIncomeFragment.java b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftIncomeFragment.java index 6e148c64e..bda86907b 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftIncomeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftIncomeFragment.java @@ -1,9 +1,13 @@ package com.yizhuan.erban.bills.fragmemt; import android.annotation.SuppressLint; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; +import android.text.TextUtils; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; +import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.yizhuan.erban.R; @@ -17,6 +21,9 @@ import com.yizhuan.xchat_android_core.Constants; import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; +import com.yizhuan.xchat_android_core.bills.BillModel; +import com.yizhuan.xchat_android_core.pay.PayModel; +import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.ListUtils; diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftOutputFragment.java b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftOutputFragment.java index 079c06f0b..4bcc0a901 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftOutputFragment.java +++ b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftOutputFragment.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.bills.fragmemt; import android.annotation.SuppressLint; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.text.TextUtils; import android.view.View; @@ -9,7 +9,9 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.yizhuan.erban.R; import com.yizhuan.erban.bills.adapter.BillBaseAdapter; import com.yizhuan.erban.bills.adapter.GiftExpendAdapter; +import com.yizhuan.erban.bills.presenter.GiftIncomePresenter; import com.yizhuan.erban.bills.presenter.GiftOutputPresenter; +import com.yizhuan.erban.bills.view.IGiftIncomeView; import com.yizhuan.erban.bills.view.IGiftOutputView; import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; import com.yizhuan.xchat_android_constants.XChatConstants; diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/RadishGiftFragment.java b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/RadishGiftFragment.java index 3a2ffb716..5c73d1d67 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/RadishGiftFragment.java +++ b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/RadishGiftFragment.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.bills.fragmemt; import android.os.Bundle; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.text.TextUtils; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/WithdrawBillsFragment.java b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/WithdrawBillsFragment.java index 7e13c891f..5aa80f727 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/WithdrawBillsFragment.java +++ b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/WithdrawBillsFragment.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.bills.fragmemt; import android.annotation.SuppressLint; import android.content.Context; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java index 82aa48158..3964b95b1 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.bills.widget; import android.content.Context; - -import androidx.core.content.ContextCompat; +import android.graphics.Color; +import android.support.v4.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/app/src/main/java/com/yizhuan/erban/bills/widget/BillItemView.java b/app/src/main/java/com/yizhuan/erban/bills/widget/BillItemView.java index 20ac4508d..d6c4c708f 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/widget/BillItemView.java +++ b/app/src/main/java/com/yizhuan/erban/bills/widget/BillItemView.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.bills.widget; import android.content.Context; import android.content.res.TypedArray; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/com/yizhuan/erban/bindadapter/BaseAdapter.java b/app/src/main/java/com/yizhuan/erban/bindadapter/BaseAdapter.java index ed77488b0..0c8a48649 100644 --- a/app/src/main/java/com/yizhuan/erban/bindadapter/BaseAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/bindadapter/BaseAdapter.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.bindadapter; -import androidx.databinding.DataBindingUtil; -import androidx.databinding.ViewDataBinding; -import androidx.annotation.LayoutRes; -import androidx.annotation.Nullable; +import android.databinding.DataBindingUtil; +import android.databinding.ViewDataBinding; +import android.support.annotation.LayoutRes; +import android.support.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/bindadapter/BindingViewHolder.java b/app/src/main/java/com/yizhuan/erban/bindadapter/BindingViewHolder.java index 84532da32..1392971f3 100644 --- a/app/src/main/java/com/yizhuan/erban/bindadapter/BindingViewHolder.java +++ b/app/src/main/java/com/yizhuan/erban/bindadapter/BindingViewHolder.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.bindadapter; -import androidx.databinding.ViewDataBinding; +import android.databinding.ViewDataBinding; import android.view.View; import com.chad.library.adapter.base.BaseViewHolder; diff --git a/app/src/main/java/com/yizhuan/erban/bindadapter/RvAdapter.java b/app/src/main/java/com/yizhuan/erban/bindadapter/RvAdapter.java index 89af91718..a122d2c4b 100644 --- a/app/src/main/java/com/yizhuan/erban/bindadapter/RvAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/bindadapter/RvAdapter.java @@ -1,10 +1,11 @@ package com.yizhuan.erban.bindadapter; -import androidx.databinding.BindingAdapter; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.RecyclerView; +import android.databinding.BindingAdapter; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; +import com.netease.nim.uikit.common.util.log.LogUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bindadapter/ViewAdapter.java b/app/src/main/java/com/yizhuan/erban/bindadapter/ViewAdapter.java index e06e5b77a..9a6f739e8 100644 --- a/app/src/main/java/com/yizhuan/erban/bindadapter/ViewAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/bindadapter/ViewAdapter.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.bindadapter; -import androidx.databinding.BindingAdapter; +import android.databinding.BindingAdapter; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; @@ -14,9 +14,12 @@ 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.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.yizhuan.xchat_android_library.utils.ScreenUtils; +import com.yizhuan.xchat_android_library.utils.UIUtils; import com.yizhuan.xchat_android_library.widget.IOSSwitchView; import com.yizhuan.erban.ui.utils.ImageLoadUtils; import com.yizhuan.xchat_android_core.utils.StarUtils; diff --git a/app/src/main/java/com/yizhuan/erban/common/AbsStatusFragment.java b/app/src/main/java/com/yizhuan/erban/common/AbsStatusFragment.java index 5b0704c14..fa9012a06 100644 --- a/app/src/main/java/com/yizhuan/erban/common/AbsStatusFragment.java +++ b/app/src/main/java/com/yizhuan/erban/common/AbsStatusFragment.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.common; import android.os.Bundle; -import androidx.fragment.app.Fragment; - +import android.support.v4.app.Fragment; +import android.view.MotionEvent; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/com/yizhuan/erban/common/ReloadFragment.java b/app/src/main/java/com/yizhuan/erban/common/ReloadFragment.java index 564851d48..f6d0ddca7 100644 --- a/app/src/main/java/com/yizhuan/erban/common/ReloadFragment.java +++ b/app/src/main/java/com/yizhuan/erban/common/ReloadFragment.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.common; import android.annotation.TargetApi; import android.os.Build; import android.os.Bundle; -import androidx.annotation.ColorInt; +import android.support.annotation.ColorInt; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/common/ViewPagerAdapter.java b/app/src/main/java/com/yizhuan/erban/common/ViewPagerAdapter.java index 8d83e2d1c..2c907ba10 100644 --- a/app/src/main/java/com/yizhuan/erban/common/ViewPagerAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/common/ViewPagerAdapter.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.common; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; import com.yizhuan.xchat_android_core.home.bean.TabInfo; diff --git a/app/src/main/java/com/yizhuan/erban/common/permission/EasyPermissions.java b/app/src/main/java/com/yizhuan/erban/common/permission/EasyPermissions.java index d18536ae4..c3f3f30eb 100644 --- a/app/src/main/java/com/yizhuan/erban/common/permission/EasyPermissions.java +++ b/app/src/main/java/com/yizhuan/erban/common/permission/EasyPermissions.java @@ -25,12 +25,12 @@ import android.graphics.Color; import android.net.Uri; import android.os.Build; import android.provider.Settings; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.core.app.ActivityCompat; -import androidx.fragment.app.Fragment; -import androidx.core.content.ContextCompat; -import androidx.appcompat.app.AlertDialog; +import android.support.annotation.Nullable; +import android.support.annotation.StringRes; +import android.support.v4.app.ActivityCompat; +import android.support.v4.app.Fragment; +import android.support.v4.content.ContextCompat; +import android.support.v7.app.AlertDialog; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/com/yizhuan/erban/common/permission/PermissionActivity.java b/app/src/main/java/com/yizhuan/erban/common/permission/PermissionActivity.java index 142bdfc73..227d8271e 100644 --- a/app/src/main/java/com/yizhuan/erban/common/permission/PermissionActivity.java +++ b/app/src/main/java/com/yizhuan/erban/common/permission/PermissionActivity.java @@ -4,8 +4,8 @@ package com.yizhuan.erban.common.permission; import android.content.Intent; import android.graphics.Color; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; +import android.support.annotation.NonNull; +import android.support.v7.app.AppCompatActivity; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/common/permission/StatusBarCompat.java b/app/src/main/java/com/yizhuan/erban/common/permission/StatusBarCompat.java index 7382df933..b491c5a9b 100644 --- a/app/src/main/java/com/yizhuan/erban/common/permission/StatusBarCompat.java +++ b/app/src/main/java/com/yizhuan/erban/common/permission/StatusBarCompat.java @@ -4,7 +4,7 @@ import android.app.Activity; import android.content.Context; import android.graphics.Color; import android.os.Build; -import androidx.core.view.ViewCompat; +import android.support.v4.view.ViewCompat; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/CircleGradualImageView.java b/app/src/main/java/com/yizhuan/erban/common/widget/CircleGradualImageView.java index 34229a489..b2b65fb20 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/CircleGradualImageView.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/CircleGradualImageView.java @@ -9,9 +9,9 @@ import android.graphics.RadialGradient; import android.graphics.Rect; import android.graphics.Shader; import android.graphics.drawable.Drawable; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import com.bumptech.glide.load.DataSource; @@ -29,7 +29,7 @@ import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; * Created by MadisonRong on 23/04/2018. */ -public class CircleGradualImageView extends androidx.appcompat.widget.AppCompatImageView { +public class CircleGradualImageView extends android.support.v7.widget.AppCompatImageView { private static final String TAG = "CircleGradualImageView"; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/CustomImageSpan.java b/app/src/main/java/com/yizhuan/erban/common/widget/CustomImageSpan.java index 94f68a3b7..07f90d382 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/CustomImageSpan.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/CustomImageSpan.java @@ -7,7 +7,7 @@ import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.text.style.ImageSpan; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/FloatingLiveMiniView.java b/app/src/main/java/com/yizhuan/erban/common/widget/FloatingLiveMiniView.java index 88902632d..beaf22e6d 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/FloatingLiveMiniView.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/FloatingLiveMiniView.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.common.widget; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.RelativeLayout; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/LimitEditText.java b/app/src/main/java/com/yizhuan/erban/common/widget/LimitEditText.java index 2589f3eb7..ef2feaf2b 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/LimitEditText.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/LimitEditText.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.common.widget; import android.content.Context; import android.content.res.TypedArray; -import androidx.appcompat.widget.AppCompatEditText; +import android.support.v7.widget.AppCompatEditText; import android.text.InputFilter; import android.util.AttributeSet; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/OriginalDrawStatusClickSpan.java b/app/src/main/java/com/yizhuan/erban/common/widget/OriginalDrawStatusClickSpan.java index ed47d0f0c..a1008cfe6 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/OriginalDrawStatusClickSpan.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/OriginalDrawStatusClickSpan.java @@ -1,7 +1,8 @@ package com.yizhuan.erban.common.widget; -import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; +import android.graphics.Color; +import android.support.annotation.ColorInt; +import android.support.annotation.NonNull; import android.text.TextPaint; import android.text.style.ClickableSpan; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/SlideListViewPager.java b/app/src/main/java/com/yizhuan/erban/common/widget/SlideListViewPager.java index e72a96c5d..0e257e9ff 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/SlideListViewPager.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/SlideListViewPager.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.common.widget; import android.content.Context; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.view.Display; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/TextDrawable.java b/app/src/main/java/com/yizhuan/erban/common/widget/TextDrawable.java index 2cc44688c..69ab8ce73 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/TextDrawable.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/TextDrawable.java @@ -6,8 +6,8 @@ import android.graphics.ColorFilter; import android.graphics.Paint; import android.graphics.PixelFormat; import android.graphics.drawable.Drawable; -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.Log; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java index 196399876..eff7c01c9 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java @@ -4,11 +4,11 @@ import android.app.Activity; import android.app.Dialog; import android.content.Context; import android.os.Bundle; -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.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 android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsIndicatorAdapter.java index a9ba2b9b8..def6b63ae 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsIndicatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsIndicatorAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.common.widget.dialog; import android.content.Context; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CommonPopupDialog.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CommonPopupDialog.java index 496e79517..c72f8604a 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CommonPopupDialog.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CommonPopupDialog.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.common.widget.dialog; import android.content.Context; import android.os.Bundle; -import com.google.android.material.bottomsheet.BottomSheetBehavior; -import com.google.android.material.bottomsheet.BottomSheetDialog; +import android.support.design.widget.BottomSheetBehavior; +import android.support.design.widget.BottomSheetDialog; import android.util.DisplayMetrics; import android.view.Display; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java index 2d55ae9ad..2b9122858 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java @@ -1,36 +1,45 @@ package com.yizhuan.erban.common.widget.dialog; +import android.animation.ObjectAnimator; import android.annotation.TargetApi; import android.app.Activity; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Build; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; - +import android.support.annotation.NonNull; +import android.support.v7.app.AlertDialog; +import android.text.Html; import android.text.SpannableString; import android.text.TextUtils; +import android.text.method.LinkMovementMethod; import android.text.style.ForegroundColorSpan; +import android.util.Log; import android.view.Gravity; import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; +import android.view.animation.LinearInterpolator; import android.widget.Button; +import android.widget.CompoundButton; import android.widget.EditText; import android.widget.FrameLayout; import android.widget.ImageView; +import android.widget.RadioButton; import android.widget.Switch; import android.widget.TextView; +import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.common.util.string.StringUtil; import com.yizhuan.erban.R; +import com.yizhuan.erban.avroom.widget.MessageView; import com.yizhuan.erban.ui.utils.ImageLoadUtils; import com.yizhuan.erban.ui.widget.ButtonItem; import com.yizhuan.erban.utils.SpannableBuilder; import com.yizhuan.xchat_android_core.utils.ActivityUtil; +import com.yizhuan.xchat_android_library.utils.FP; import com.yizhuan.xchat_android_library.utils.log.MLog; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoadingImageView.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoadingImageView.java index 7af012fb6..c00873a44 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoadingImageView.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoadingImageView.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.common.widget.dialog; import android.animation.ObjectAnimator; import android.content.Context; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; import android.view.animation.LinearInterpolator; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java index 35379c100..fb0a92965 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.decoration.adapter; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -10,6 +10,7 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.bindadapter.BaseAdapter; import com.yizhuan.erban.bindadapter.BindingViewHolder; import com.yizhuan.erban.databinding.ItemCarGarageNormalBinding; +import com.yizhuan.xchat_android_core.decoration.bean.BaseDecoration; import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; import com.yizhuan.xchat_android_library.utils.ListUtils; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/CarShopFragment.java b/app/src/main/java/com/yizhuan/erban/decoration/view/CarShopFragment.java index 9d53c2c6f..99b04eca0 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/CarShopFragment.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/CarShopFragment.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.decoration.view; import android.app.Activity; import android.os.Bundle; -import androidx.recyclerview.widget.GridLayoutManager; +import android.support.v7.widget.GridLayoutManager; import com.netease.nim.uikit.common.ui.recyclerview.decoration.SpacingDecoration; import com.yizhuan.erban.BR; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.java b/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.java index 2cb9a16ab..d17a7ebb8 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.java @@ -4,9 +4,9 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.graphics.Paint; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentPagerAdapter; -import androidx.core.content.ContextCompat; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentPagerAdapter; +import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/HeadWearFragment.java b/app/src/main/java/com/yizhuan/erban/decoration/view/HeadWearFragment.java index d205169da..4f50236f3 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/HeadWearFragment.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/HeadWearFragment.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.decoration.view; import android.app.Activity; import android.os.Bundle; -import androidx.recyclerview.widget.GridLayoutManager; +import android.support.v7.widget.GridLayoutManager; import com.netease.nim.uikit.common.ui.recyclerview.decoration.SpacingDecoration; import com.yizhuan.erban.BR; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyCarFragment.java b/app/src/main/java/com/yizhuan/erban/decoration/view/MyCarFragment.java index 8c661bd64..01e39b431 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyCarFragment.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/MyCarFragment.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.decoration.view; import android.annotation.SuppressLint; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.LinearLayoutManager; +import android.support.annotation.Nullable; +import android.support.v7.widget.LinearLayoutManager; import android.view.View; import com.yizhuan.erban.BR; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java b/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java index e4f1b16bf..443885643 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java @@ -2,9 +2,9 @@ package com.yizhuan.erban.decoration.view; import android.content.Context; import android.content.Intent; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentPagerAdapter; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentPagerAdapter; +import android.support.v4.view.ViewPager; import android.view.View; import android.view.ViewStub; import android.widget.RelativeLayout; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java b/app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java index e771262a5..f3e20f5d9 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.decoration.view; import android.app.Activity; -import androidx.recyclerview.widget.LinearLayoutManager; +import android.support.v7.widget.LinearLayoutManager; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/CarMagicIndicator.java b/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/CarMagicIndicator.java index a05268c5c..3e1329401 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/CarMagicIndicator.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/CarMagicIndicator.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.decoration.view.widgets; import android.content.Context; - -import androidx.core.content.ContextCompat; +import android.graphics.Color; +import android.support.v4.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/ShowCarGuideDialog.java b/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/ShowCarGuideDialog.java index bc0b410a5..daea5e1d2 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/ShowCarGuideDialog.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/ShowCarGuideDialog.java @@ -4,8 +4,8 @@ import android.app.DialogFragment; import android.content.DialogInterface; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatButton; +import android.support.annotation.Nullable; +import android.support.v7.widget.AppCompatButton; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyCurrencyPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyCurrencyPresenter.java index aa7cc232c..064953839 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyCurrencyPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyCurrencyPresenter.java @@ -1,13 +1,14 @@ package com.yizhuan.erban.family.presenter; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import com.yizhuan.erban.base.BaseMvpPresenter; import com.yizhuan.erban.family.contract.viewinterface.IFamilyCurrencyView; import com.yizhuan.xchat_android_core.Constants; import com.yizhuan.xchat_android_core.auth.AuthModel; +import com.yizhuan.xchat_android_core.bean.response.ServiceResult; import com.yizhuan.xchat_android_core.family.bean.BillDateDivInfo; import com.yizhuan.xchat_android_core.family.bean.TransactionRecordInfo; import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyHomePresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyHomePresenter.java index e8d81e580..980539333 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyHomePresenter.java +++ b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyHomePresenter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.family.presenter; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.yizhuan.erban.base.BaseMvpPresenter; import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberCurrencyPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberCurrencyPresenter.java index 1f2b23d0c..b61f87fa2 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberCurrencyPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberCurrencyPresenter.java @@ -1,12 +1,13 @@ package com.yizhuan.erban.family.presenter; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import com.yizhuan.erban.base.BaseMvpPresenter; import com.yizhuan.erban.family.contract.viewinterface.IFamilyCurrencyView; import com.yizhuan.xchat_android_core.Constants; +import com.yizhuan.xchat_android_core.bean.response.ServiceResult; import com.yizhuan.xchat_android_core.family.bean.BillDateDivInfo; import com.yizhuan.xchat_android_core.family.bean.TransactionRecordInfo; import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberListPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberListPresenter.java index 60fe1daf7..b04cb37ee 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberListPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberListPresenter.java @@ -1,16 +1,19 @@ package com.yizhuan.erban.family.presenter; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.yizhuan.erban.base.BaseMvpPresenter; import com.yizhuan.erban.family.contract.viewinterface.IFamilyMemberListView; +import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_library.base.PresenterEvent; import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; import com.yizhuan.xchat_android_core.Constants; +import com.yizhuan.xchat_android_core.bean.response.ServiceResult; import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; +import com.yizhuan.xchat_android_core.family.event.FamilyCurrencyUpdateEvent; import com.yizhuan.xchat_android_core.family.event.FamilyMemberUpdateEvent; import com.yizhuan.xchat_android_core.family.model.FamilyModel; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyCurrencyActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyCurrencyActivity.java index 45626a6c2..47daf845c 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyCurrencyActivity.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyCurrencyActivity.java @@ -5,9 +5,9 @@ import android.content.DialogInterface; import android.content.Intent; import android.graphics.Typeface; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.SpannableString; import android.text.Spanned; import android.text.style.StyleSpan; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyGameListActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyGameListActivity.java index a5cded4b0..d3050af53 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyGameListActivity.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyGameListActivity.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.family.view.activity; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java index f89e8df09..dde48f47c 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java @@ -6,8 +6,8 @@ import android.content.Intent; import android.graphics.Color; import android.graphics.Typeface; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.SpannableString; import android.text.Spanned; import android.text.TextUtils; @@ -16,6 +16,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import android.widget.Toast; import com.makeramen.roundedimageview.RoundedImageView; import com.netease.nim.uikit.support.glide.GlideApp; @@ -24,6 +25,7 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseMvpActivity; import com.yizhuan.erban.base.TitleBar; import com.yizhuan.erban.common.widget.CircleImageView; +import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.constants.BundleKeys; import com.yizhuan.erban.family.presenter.FamilyHomePresenter; import com.yizhuan.erban.family.view.adapter.FamilyGamesAdapter; @@ -59,6 +61,7 @@ import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.FormatUtils; import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.yizhuan.xchat_android_library.utils.SizeUtils; import com.yizhuan.xchat_android_library.utils.config.BasicConfig; import com.yizhuan.xchat_android_library.utils.log.MLog; import com.yizhuan.xchat_android_library.widget.DrawableCenterTextView; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyListActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyListActivity.java index d8275c577..fa7c384d5 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyListActivity.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyListActivity.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.family.view.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyManageActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyManageActivity.java index 1e54df036..c1e805449 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyManageActivity.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyManageActivity.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.family.view.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; @@ -14,6 +14,7 @@ import com.yizhuan.erban.base.BaseMvpActivity; import com.yizhuan.erban.family.contract.viewinterface.IFamilyManageActivityView; import com.yizhuan.erban.family.view.adapter.FamilyManageAdapter; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; +import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration; import com.yizhuan.xchat_android_core.family.bean.FamilyManageItemInfo; import com.yizhuan.xchat_android_core.family.model.FamilyModel; import com.yizhuan.erban.family.presenter.FamilyManagePresenter; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberCurrencyActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberCurrencyActivity.java index 9f881f209..5c421adc5 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberCurrencyActivity.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberCurrencyActivity.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.family.view.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.jay.widget.StickyHeadersLinearLayoutManager; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberListActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberListActivity.java index 190053f92..04b6dc589 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberListActivity.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberListActivity.java @@ -4,9 +4,9 @@ import android.app.Activity; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; @@ -15,10 +15,14 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseMvpActivity; import com.yizhuan.erban.base.TitleBar; +import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.constants.BundleKeys; import com.yizhuan.erban.family.contract.viewinterface.IFamilyMemberListView; import com.yizhuan.erban.family.view.adapter.FamilyMemberListAdapter; +import com.yizhuan.erban.family.view.dialog.FamilyRemoveMemberDialog; import com.yizhuan.erban.family.view.dialog.FamilyTransferDialog; +import com.yizhuan.erban.team.view.TeamMemberListActivity; +import com.yizhuan.erban.team.view.TeamMemberSearchListActivity; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.erban.ui.user.UserInfoActivity; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberSearchActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberSearchActivity.java index adb506970..b5c598f0f 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberSearchActivity.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberSearchActivity.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -16,6 +16,7 @@ import android.view.inputmethod.EditorInfo; import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; +import android.widget.Toast; import com.chad.library.adapter.base.BaseQuickAdapter; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyPlazaActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyPlazaActivity.java index 330759312..e4e2f4871 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyPlazaActivity.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyPlazaActivity.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.family.view.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySearchActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySearchActivity.java index 558411c0d..d4336560e 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySearchActivity.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySearchActivity.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.family.view.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -15,6 +15,7 @@ import android.view.inputmethod.EditorInfo; import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; +import android.widget.Toast; import com.chad.library.adapter.base.BaseQuickAdapter; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySelectFriendActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySelectFriendActivity.java index 6ae005d23..71d8de92d 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySelectFriendActivity.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySelectFriendActivity.java @@ -5,8 +5,8 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseMvpActivity; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAdapter.java index 8ba51ce0e..17b051c3a 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.family.view.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.widget.TextView; import com.bumptech.glide.load.resource.bitmap.CenterCrop; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAttentionListAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAttentionListAdapter.java index 58658c4ae..de0a1ceaa 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAttentionListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAttentionListAdapter.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.family.view.adapter; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.text.TextUtils; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyCurrencyBillAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyCurrencyBillAdapter.java index 49e2e302b..95e66038e 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyCurrencyBillAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyCurrencyBillAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.family.view.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFansViewAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFansViewAdapter.java index a44cb3209..db0c4eeaa 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFansViewAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFansViewAdapter.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.family.view.adapter; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.text.TextUtils; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFriendListAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFriendListAdapter.java index a8dd54cbe..25b70eddd 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFriendListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFriendListAdapter.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.family.view.adapter; import android.content.Context; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.annotation.Nullable; +import android.support.v7.widget.AppCompatImageView; import android.text.TextUtils; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGameListAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGameListAdapter.java index 08c3367a8..b04dc2e2b 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGameListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGameListAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.family.view.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGamesAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGamesAdapter.java index 05ac6d40f..c926ac4c1 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGamesAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGamesAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.family.view.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGroupAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGroupAdapter.java index 274dc68b3..4c0f82eea 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGroupAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGroupAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.family.view.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyManageAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyManageAdapter.java index 37c9264e7..f130d0818 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyManageAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyManageAdapter.java @@ -1,6 +1,7 @@ package com.yizhuan.erban.family.view.adapter; -import androidx.annotation.Nullable; +import android.content.Context; +import android.support.annotation.Nullable; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberAdapter.java index 60e47f17d..87ebc396e 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.family.view.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberListAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberListAdapter.java index 312e2a1be..154406d59 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberListAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.family.view.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.widget.ImageButton; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyWeeklyRankBoardAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyWeeklyRankBoardAdapter.java index ebe5e282d..69f18e032 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyWeeklyRankBoardAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyWeeklyRankBoardAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.family.view.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyContributionDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyContributionDialog.java index b86940be1..c73593612 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyContributionDialog.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyContributionDialog.java @@ -4,13 +4,14 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; import android.view.View; import android.widget.EditText; import android.widget.TextView; +import android.widget.Toast; import com.yizhuan.erban.R; import com.yizhuan.xchat_android_library.utils.FormatUtils; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyDisbandDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyDisbandDialog.java index e8163d4be..03ee2ae2b 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyDisbandDialog.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyDisbandDialog.java @@ -3,8 +3,9 @@ package com.yizhuan.erban.family.view.dialog; import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.widget.TextView; +import android.widget.Toast; import com.yizhuan.erban.R; import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyExitTipDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyExitTipDialog.java index e0007ddfd..fa710db32 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyExitTipDialog.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyExitTipDialog.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.family.view.dialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyGuideDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyGuideDialog.java index d9b8277c8..9a3d35620 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyGuideDialog.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyGuideDialog.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.family.view.dialog; import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.view.Gravity; import android.view.View; import android.view.Window; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyInviteConfirmDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyInviteConfirmDialog.java index e4d02cc97..07156baba 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyInviteConfirmDialog.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyInviteConfirmDialog.java @@ -4,7 +4,7 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyJoinDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyJoinDialog.java index 17524318b..3d7067dc7 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyJoinDialog.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyJoinDialog.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.family.view.dialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.text.TextUtils; import android.view.View; import android.widget.EditText; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyMenuDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyMenuDialog.java index 3e6e0c2a3..faeee3e79 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyMenuDialog.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyMenuDialog.java @@ -4,8 +4,8 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.graphics.drawable.Drawable; -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; +import android.support.annotation.NonNull; +import android.support.v4.content.ContextCompat; import android.view.Gravity; import android.view.View; import android.view.Window; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyRemoveMemberDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyRemoveMemberDialog.java index 40116c062..8332ef79c 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyRemoveMemberDialog.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyRemoveMemberDialog.java @@ -4,7 +4,7 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyTransferDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyTransferDialog.java index cb8137879..0502a90bc 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyTransferDialog.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyTransferDialog.java @@ -3,13 +3,14 @@ package com.yizhuan.erban.family.view.dialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; import android.view.View; import android.widget.EditText; import android.widget.TextView; +import android.widget.Toast; import com.yizhuan.erban.R; import com.yizhuan.xchat_android_library.utils.FormatUtils; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyAttentionFragment.java b/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyAttentionFragment.java index 32d14e134..df68bee57 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyAttentionFragment.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyAttentionFragment.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.family.view.fragment; import android.app.Activity; -import androidx.fragment.app.Fragment; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.app.Fragment; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFansListFragment.java b/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFansListFragment.java index ae4a960b6..458935544 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFansListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFansListFragment.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.family.view.fragment; import android.app.Activity; -import androidx.fragment.app.Fragment; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.app.Fragment; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFriendListFragment.java b/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFriendListFragment.java index c09f6799f..c27c09822 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFriendListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFriendListFragment.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.family.view.fragment; import android.content.Context; -import androidx.fragment.app.Fragment; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.app.Fragment; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java b/app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java index 8310176f1..2039d3e40 100644 --- a/app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java +++ b/app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.friend.view; import android.app.Activity; import android.content.Context; import android.content.Intent; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.view.View; import com.netease.nimlib.sdk.msg.model.IMMessage; @@ -31,6 +31,7 @@ import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; import com.yizhuan.xchat_android_core.share.bean.SessionType; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.yizhuan.xchat_android_library.utils.JavaUtil; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/guide/GuideActivity.java b/app/src/main/java/com/yizhuan/erban/guide/GuideActivity.java index 9922d4026..424178ae6 100644 --- a/app/src/main/java/com/yizhuan/erban/guide/GuideActivity.java +++ b/app/src/main/java/com/yizhuan/erban/guide/GuideActivity.java @@ -3,17 +3,19 @@ package com.yizhuan.erban.guide; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.NonNull; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseActivity; +import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import java.net.URI; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/AllGameActivity.java b/app/src/main/java/com/yizhuan/erban/home/activity/AllGameActivity.java index 247e70b14..d65079bf1 100644 --- a/app/src/main/java/com/yizhuan/erban/home/activity/AllGameActivity.java +++ b/app/src/main/java/com/yizhuan/erban/home/activity/AllGameActivity.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.home.activity; import android.content.Intent; -import androidx.recyclerview.widget.GridLayoutManager; +import android.support.v7.widget.GridLayoutManager; import android.text.SpannableString; import android.text.TextUtils; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/NewUserListActivity.java b/app/src/main/java/com/yizhuan/erban/home/activity/NewUserListActivity.java index 0456fa6fa..03893eb5b 100644 --- a/app/src/main/java/com/yizhuan/erban/home/activity/NewUserListActivity.java +++ b/app/src/main/java/com/yizhuan/erban/home/activity/NewUserListActivity.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.home.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/CommonMagicIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/CommonMagicIndicatorAdapter.java index ac296bc94..765f38576 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/CommonMagicIndicatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/CommonMagicIndicatorAdapter.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; - -import androidx.core.content.ContextCompat; +import android.graphics.Color; +import android.support.v4.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java index f32062af6..a82e6ca2d 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.v7.widget.AppCompatTextView; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/ErbanRecommendAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/ErbanRecommendAdapter.java index 8a1704f02..d62dfe9f9 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/ErbanRecommendAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/ErbanRecommendAdapter.java @@ -3,8 +3,9 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.Drawable; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; @@ -23,6 +24,7 @@ import com.yizhuan.erban.avroom.activity.AVRoomActivity; import com.yizhuan.erban.ui.utils.ImageLoadUtils; import com.yizhuan.erban.ui.widget.LivingIconView; import com.yizhuan.erban.ui.widget.RoomItemView; +import com.yizhuan.erban.ui.widget.SquareImageView; import com.yizhuan.erban.ui.widget.marqueeview.Utils; import com.yizhuan.xchat_android_core.home.bean.HomeRoom; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/FindAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/FindAdapter.java index b6faa84da..123582909 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/FindAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/FindAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/FindNewUserListAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/FindNewUserListAdapter.java index 1fcbe122e..e6cb1b14c 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/FindNewUserListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/FindNewUserListAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/FindNewerListAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/FindNewerListAdapter.java index 115b01fc5..a0c1db367 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/FindNewerListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/FindNewerListAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/FindStarFamilyAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/FindStarFamilyAdapter.java index 35989adbf..6fdcd56e4 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/FindStarFamilyAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/FindStarFamilyAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.widget.ImageView; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/FragmentViewPagerAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/FragmentViewPagerAdapter.java index e12ad3245..6bd9cf6b6 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/FragmentViewPagerAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/FragmentViewPagerAdapter.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.home.adapter; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HallChatAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HallChatAdapter.java index ada548411..28037173f 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HallChatAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HallChatAdapter.java @@ -1,16 +1,25 @@ package com.yizhuan.erban.home.adapter; -import androidx.annotation.Nullable; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.support.annotation.Nullable; import android.text.SpannableStringBuilder; +import android.text.Spanned; import android.text.TextUtils; +import android.text.style.ForegroundColorSpan; +import android.text.style.ImageSpan; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; +import com.netease.nim.uikit.business.session.emoji.MoonUtil; import com.netease.nim.uikit.support.glide.GlideApp; +import com.netease.nim.uikit.support.glide.ImageLoaderKit; import com.yizhuan.erban.R; import com.yizhuan.erban.common.widget.CircleImageView; +import com.yizhuan.erban.common.widget.CustomImageSpan; import com.yizhuan.erban.ui.utils.ImageLoadUtils; +import com.yizhuan.erban.ui.widget.marqueeview.Utils; import com.yizhuan.xchat_android_core.home.bean.HomeHallMsgInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeFragmentAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeFragmentAdapter.java index b835aa528..b5a0467bc 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeFragmentAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeFragmentAdapter.java @@ -5,12 +5,12 @@ import android.graphics.Color; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.viewpager.widget.ViewPager; -import androidx.appcompat.widget.AppCompatImageView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.view.ViewPager; +import android.support.v7.widget.AppCompatImageView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeHallAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeHallAdapter.java index e5b5397f1..4c3a208c0 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeHallAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeHallAdapter.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.annotation.Nullable; +import android.support.v7.widget.AppCompatImageView; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextUtils; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeItemVPAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeItemVPAdapter.java index 4ba7dcc34..371860f0b 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeItemVPAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeItemVPAdapter.java @@ -2,10 +2,10 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; import android.graphics.Color; -import androidx.annotation.NonNull; -import androidx.viewpager.widget.PagerAdapter; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.v4.view.PagerAdapter; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/KTVMagicIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/KTVMagicIndicatorAdapter.java index 18f90783c..45d916403 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/KTVMagicIndicatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/KTVMagicIndicatorAdapter.java @@ -1,16 +1,20 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; -import androidx.core.content.ContextCompat; - +import android.support.v4.content.ContextCompat; +import android.view.LayoutInflater; import android.view.View; +import android.widget.LinearLayout; import android.widget.RelativeLayout; import com.yizhuan.erban.R; +import com.yizhuan.erban.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import java.util.List; + /** *

公共多个滑动tab样式

* diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/KTVRoomAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/KTVRoomAdapter.java index b39169e8d..5cc7d5efd 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/KTVRoomAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/KTVRoomAdapter.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; import android.graphics.Color; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/KTVTypeRoomAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/KTVTypeRoomAdapter.java index da3260407..4b915f571 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/KTVTypeRoomAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/KTVTypeRoomAdapter.java @@ -1,16 +1,19 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; +import com.bumptech.glide.load.resource.bitmap.CenterCrop; +import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.activity.AVRoomActivity; +import com.yizhuan.erban.ui.utils.ImageLoadUtils; import com.yizhuan.xchat_android_core.home.bean.KTVRoom; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java index 104a81615..1270e2eab 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.widget.TextView; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/MakeFriendAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/MakeFriendAdapter.java index 2c271076d..c90906381 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/MakeFriendAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/MakeFriendAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RecommendThreeNModelDecoration.java b/app/src/main/java/com/yizhuan/erban/home/adapter/RecommendThreeNModelDecoration.java index b49beebfa..f887874cf 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RecommendThreeNModelDecoration.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RecommendThreeNModelDecoration.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.home.adapter; import android.graphics.Rect; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; /** diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java index 90a87ec5f..8f0baef09 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java @@ -1,6 +1,8 @@ package com.yizhuan.erban.home.adapter; +import android.app.Activity; import android.content.Context; +import android.support.v4.app.FragmentActivity; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -8,13 +10,16 @@ import android.view.ViewGroup; import android.widget.ImageView; import com.jude.rollviewpager.adapter.StaticPagerAdapter; +import com.netease.nim.uikit.common.util.log.LogUtil; import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; import com.yizhuan.erban.R; +import com.yizhuan.erban.avroom.fragment.DialogWebFragment; import com.yizhuan.erban.ui.im.RouterHandler; import com.yizhuan.erban.ui.utils.ImageLoadUtils; +import com.yizhuan.erban.ui.webview.CommonWebViewActivity; import com.yizhuan.xchat_android_core.im.custom.bean.RouterType; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.redPacket.bean.ActionDialogInfo; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomCategoryViewPagerAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomCategoryViewPagerAdapter.java index 89bfdd093..466996d8a 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomCategoryViewPagerAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomCategoryViewPagerAdapter.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.home.adapter; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; import android.util.SparseArray; import com.yizhuan.erban.home.fragment.RoomListFragment; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomTabAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomTabAdapter.java index d686999be..2423aa7fe 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomTabAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomTabAdapter.java @@ -4,10 +4,11 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; @@ -18,6 +19,7 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.ui.widget.RoomItemView; import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; import com.yizhuan.erban.ui.widget.marqueeview.Utils; +import com.yizhuan.erban.ui.widget.recyclerview.decoration.SpacingDecoration; import com.yizhuan.xchat_android_core.home.bean.BannerInfo; import com.yizhuan.xchat_android_core.home.bean.HomeRoom; import com.yizhuan.xchat_android_core.home.bean.HomeRoomItem; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java index 1573bed7b..849ac464f 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java @@ -1,13 +1,18 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; +import android.util.TypedValue; +import android.view.ViewGroup; +import android.widget.FrameLayout; import com.yizhuan.erban.R; import com.yizhuan.erban.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import com.yizhuan.xchat_android_core.home.bean.TabInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/dialog/FiltrateDialog.java b/app/src/main/java/com/yizhuan/erban/home/dialog/FiltrateDialog.java index 5c2fa55ec..76db51205 100644 --- a/app/src/main/java/com/yizhuan/erban/home/dialog/FiltrateDialog.java +++ b/app/src/main/java/com/yizhuan/erban/home/dialog/FiltrateDialog.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.home.dialog; import android.content.Context; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; import android.os.Bundle; -import androidx.annotation.NonNull; -import com.google.android.material.bottomsheet.BottomSheetDialog; +import android.support.annotation.NonNull; +import android.support.design.widget.BottomSheetDialog; import android.util.DisplayMetrics; import android.view.Display; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/home/dialog/RecommendRoomForNewerDialog.java b/app/src/main/java/com/yizhuan/erban/home/dialog/RecommendRoomForNewerDialog.java index fa9136350..1eff2ce83 100644 --- a/app/src/main/java/com/yizhuan/erban/home/dialog/RecommendRoomForNewerDialog.java +++ b/app/src/main/java/com/yizhuan/erban/home/dialog/RecommendRoomForNewerDialog.java @@ -3,14 +3,16 @@ package com.yizhuan.erban.home.dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import androidx.appcompat.app.AppCompatDialog; +import android.support.v7.app.AppCompatDialog; import android.view.Gravity; import android.view.View; import android.view.Window; import android.view.WindowManager; import android.widget.ImageView; +import android.widget.TextView; import com.yizhuan.erban.R; +import com.yizhuan.xchat_android_core.user.IUserModel; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/AttentionFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/AttentionFragment.java index a21b013ae..32ca711f1 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/AttentionFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/AttentionFragment.java @@ -3,10 +3,10 @@ package com.yizhuan.erban.home.fragment; import android.annotation.SuppressLint; import android.app.Activity; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/CommunityNoticeAct.java b/app/src/main/java/com/yizhuan/erban/home/fragment/CommunityNoticeAct.java index 0a4351d2b..451620509 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/CommunityNoticeAct.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/CommunityNoticeAct.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.home.fragment; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.java index 7cab69066..fb704e87e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.java @@ -1,12 +1,13 @@ package com.yizhuan.erban.home.fragment; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; import android.widget.LinearLayout; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseFragment; import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; +import com.yizhuan.erban.home.adapter.CommonMagicIndicatorAdapter; import com.yizhuan.erban.home.adapter.ContactsIndicatorAdapter; import com.yizhuan.erban.home.adapter.FragmentViewPagerAdapter; import com.yizhuan.erban.ui.im.friend.FriendListFragment; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/FamilyFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/FamilyFragment.java index ffe57a681..822c4598e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/FamilyFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/FamilyFragment.java @@ -3,10 +3,10 @@ package com.yizhuan.erban.home.fragment; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; -import androidx.fragment.app.Fragment; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.app.Fragment; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/FindFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/FindFragment.java index 1e7ef67ca..590e8b4c4 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/FindFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/FindFragment.java @@ -5,12 +5,12 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/FindTabFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/FindTabFragment.java index 1cd652d3a..250181ab8 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/FindTabFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/FindTabFragment.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.home.fragment; import android.annotation.SuppressLint; -import com.google.android.material.appbar.AppBarLayout; -import androidx.coordinatorlayout.widget.CoordinatorLayout; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import android.support.design.widget.AppBarLayout; +import android.support.design.widget.CoordinatorLayout; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; import android.view.View; import android.widget.FrameLayout; import android.widget.RelativeLayout; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java index 85a238d90..cd7119697 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java @@ -3,20 +3,20 @@ package com.yizhuan.erban.home.fragment; import android.Manifest; import android.annotation.SuppressLint; import android.app.Activity; - -import androidx.databinding.DataBindingUtil; +import android.content.Intent; +import android.databinding.DataBindingUtil; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v4.content.ContextCompat; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.Spannable; import android.text.SpannableString; import android.text.SpannableStringBuilder; @@ -50,6 +50,7 @@ import com.jude.rollviewpager.hintview.ColorPointHintView; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nim.uikit.support.glide.GlideApp; +import com.trello.rxlifecycle2.android.ActivityEvent; import com.trello.rxlifecycle2.android.FragmentEvent; import com.yizhuan.erban.MainActivity; import com.yizhuan.erban.R; @@ -100,6 +101,7 @@ 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.user.event.CurrentUserInfoCompleteEvent; import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; import com.yizhuan.xchat_android_core.utils.net.RxHelper; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeOtherTabFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeOtherTabFragment.java index 1fc00d119..480e6eabc 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeOtherTabFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeOtherTabFragment.java @@ -2,10 +2,10 @@ package com.yizhuan.erban.home.fragment; import android.annotation.SuppressLint; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HottestKTVRoomFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HottestKTVRoomFragment.java index 4a2080ff0..5603f77ef 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HottestKTVRoomFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HottestKTVRoomFragment.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.home.fragment; import android.graphics.Color; -import androidx.fragment.app.Fragment; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.app.Fragment; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/KTVFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/KTVFragment.java index 16bb83780..9af944580 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/KTVFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/KTVFragment.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.home.fragment; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; import android.widget.LinearLayout; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java index 8a4f5c18e..90406722b 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.home.fragment; -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; -import androidx.core.content.ContextCompat; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.NonNull; +import android.support.v4.app.Fragment; +import android.support.v4.content.ContextCompat; +import android.support.v4.view.ViewPager; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; @@ -12,6 +12,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import com.mcxiaoke.packer.helper.PackerNg; +import com.yizhuan.erban.MainActivity; import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.activity.AVRoomActivity; import com.yizhuan.erban.base.BaseMvpFragment; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java index fb46904a2..41eb12490 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.home.fragment; import android.content.Intent; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.view.View; import com.yizhuan.erban.MainActivity; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MsgFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MsgFragment.java index ca33b9773..08aa9673b 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MsgFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MsgFragment.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.home.fragment; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; - +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; +import android.util.Log; import android.widget.LinearLayout; import com.yizhuan.erban.MainActivity; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/NewestKTVRoomFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/NewestKTVRoomFragment.java index 0be491590..0406f969f 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/NewestKTVRoomFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/NewestKTVRoomFragment.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.home.fragment; import android.graphics.Color; -import androidx.fragment.app.Fragment; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.app.Fragment; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.java index 8f19a34eb..902500ea6 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.java @@ -1,9 +1,10 @@ package com.yizhuan.erban.home.fragment; -import androidx.fragment.app.Fragment; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.app.Fragment; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendationFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendationFragment.java index 5ab374c1b..062be249e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendationFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendationFragment.java @@ -2,10 +2,11 @@ package com.yizhuan.erban.home.fragment; import android.annotation.SuppressLint; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.app.Fragment; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; +import android.util.Log; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomCategoryFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomCategoryFragment.java index c50b8b4bc..927f5f58e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomCategoryFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomCategoryFragment.java @@ -1,20 +1,23 @@ package com.yizhuan.erban.home.fragment; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseMvpFragment; +import com.yizhuan.erban.home.adapter.CommonMagicIndicatorAdapter; import com.yizhuan.erban.home.adapter.RoomCategoryIndicatorAdapter; import com.yizhuan.erban.home.adapter.RoomCategoryViewPagerAdapter; import com.yizhuan.erban.home.presenter.RoomCategoryFragmentPresenter; import com.yizhuan.erban.home.view.IRoomCategoryFragmentView; import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator; import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; +import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import com.yizhuan.xchat_android_core.home.bean.TabInfo; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.yizhuan.xchat_android_library.utils.config.BasicConfig; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomListFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomListFragment.java index 76cd39773..71a2ea2bf 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomListFragment.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.home.fragment; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.app.Fragment; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomTabFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomTabFragment.java index bf6cb6822..06994c188 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomTabFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomTabFragment.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.home.fragment; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.app.Fragment; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/home/model/UserMatchVm.java b/app/src/main/java/com/yizhuan/erban/home/model/UserMatchVm.java index 768807273..1fc52ac5f 100644 --- a/app/src/main/java/com/yizhuan/erban/home/model/UserMatchVm.java +++ b/app/src/main/java/com/yizhuan/erban/home/model/UserMatchVm.java @@ -1,9 +1,10 @@ package com.yizhuan.erban.home.model; -import androidx.databinding.Observable; -import androidx.databinding.ObservableBoolean; -import androidx.databinding.ObservableField; -import androidx.databinding.ObservableInt; +import android.databinding.Observable; +import android.databinding.ObservableBoolean; +import android.databinding.ObservableField; +import android.databinding.ObservableInt; +import android.view.View; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -13,17 +14,25 @@ import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.Observer; import com.netease.nimlib.sdk.msg.MsgServiceObserve; import com.netease.nimlib.sdk.msg.model.CustomNotification; +import com.yizhuan.erban.avroom.activity.AVRoomActivity; +import com.yizhuan.erban.avroom.game.MatchActivity; import com.yizhuan.erban.base.BaseViewModel; import com.yizhuan.xchat_android_core.DemoCache; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; +import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; import com.yizhuan.xchat_android_core.room.game.GameMatchInfo; 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.net.DontWarnObserver; 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.concurrent.TimeUnit; import io.reactivex.Single; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/FamilyFragmentPresenter.java b/app/src/main/java/com/yizhuan/erban/home/presenter/FamilyFragmentPresenter.java index 6704c3f09..f6b85f36b 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/FamilyFragmentPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/FamilyFragmentPresenter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.home.presenter; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import com.orhanobut.logger.Logger; diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/FindFragmentPresenter.java b/app/src/main/java/com/yizhuan/erban/home/presenter/FindFragmentPresenter.java index 69845b019..4c461f42d 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/FindFragmentPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/FindFragmentPresenter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.home.presenter; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.yizhuan.erban.base.BaseMvpPresenter; import com.yizhuan.erban.home.view.IFindFragmentView; diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java b/app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java index 441fa7fe8..f4f2aefc1 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.home.presenter; import android.annotation.SuppressLint; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import com.yizhuan.erban.base.BaseMvpPresenter; @@ -15,11 +15,13 @@ import com.yizhuan.xchat_android_core.market_verify.event.MarketVerifyUpdateEven import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.yizhuan.xchat_android_core.room.bean.RoomResult; import com.yizhuan.xchat_android_core.room.model.AvRoomModel; import com.yizhuan.xchat_android_core.user.AttentionModel; import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; import com.yizhuan.xchat_android_core.utils.net.BeanObserver; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.base.PresenterEvent; import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/RecommendFragmentPresenter.java b/app/src/main/java/com/yizhuan/erban/home/presenter/RecommendFragmentPresenter.java index b19a83200..c65536d5e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/RecommendFragmentPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/RecommendFragmentPresenter.java @@ -2,8 +2,9 @@ package com.yizhuan.erban.home.presenter; import android.os.Bundle; import android.os.Parcelable; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; +import android.util.Log; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -27,20 +28,29 @@ import com.yizhuan.xchat_android_core.home.bean.TopMessage; import com.yizhuan.xchat_android_core.home.bean.VMTopMessage; import com.yizhuan.xchat_android_core.home.bean.VMTopMessageInfo; import com.yizhuan.xchat_android_core.home.model.HomeModel; +import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.yizhuan.xchat_android_core.im.custom.bean.GameRespondAttachment; +import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; +import com.yizhuan.xchat_android_core.im.custom.bean.ImGameAttachment; +import com.yizhuan.xchat_android_core.im.custom.bean.ImTipAttachment; +import com.yizhuan.xchat_android_core.level.UserLevelResourceType; import com.yizhuan.xchat_android_core.market_verify.event.MarketVerifyUpdateEvent; import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol; +import com.yizhuan.xchat_android_core.monsterhunting.model.MonsterHuntingModel; import com.yizhuan.xchat_android_core.monsterhunting.rxevent.MonsterUpdateEvent; import com.yizhuan.xchat_android_core.utils.net.BeanObserver; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.base.PresenterEvent; import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.yizhuan.xchat_android_library.utils.config.BasicConfig; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.io.Serializable; +import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/RoomCategoryFragmentPresenter.java b/app/src/main/java/com/yizhuan/erban/home/presenter/RoomCategoryFragmentPresenter.java index dd296f6ef..eafdd1694 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/RoomCategoryFragmentPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/RoomCategoryFragmentPresenter.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.home.presenter; import android.os.Bundle; import android.os.Parcelable; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.yizhuan.erban.base.BaseMvpPresenter; import com.yizhuan.erban.home.view.IRoomCategoryFragmentView; diff --git a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameBase.java b/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameBase.java index 830ffd8ca..32b763e7d 100644 --- a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameBase.java +++ b/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameBase.java @@ -2,10 +2,10 @@ package com.yizhuan.erban.home.refresh; import android.content.Context; import android.os.Build; -import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; +import android.support.annotation.ColorInt; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.annotation.RequiresApi; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameHeader.java b/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameHeader.java index 7c4a2c9f6..feedb4bea 100644 --- a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameHeader.java +++ b/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameHeader.java @@ -8,9 +8,9 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; import android.os.Build; -import androidx.annotation.ColorInt; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; +import android.support.annotation.ColorInt; +import android.support.annotation.Nullable; +import android.support.annotation.RequiresApi; import android.util.AttributeSet; import android.util.TypedValue; import android.view.Gravity; diff --git a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameHitBlockHeader.java b/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameHitBlockHeader.java index 20ba924d0..dc786da69 100644 --- a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameHitBlockHeader.java +++ b/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameHitBlockHeader.java @@ -7,8 +7,8 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Point; import android.os.Build; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; +import android.support.annotation.Nullable; +import android.support.annotation.RequiresApi; import android.util.AttributeSet; import com.scwang.smartrefresh.layout.util.ColorUtils; diff --git a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameView.java b/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameView.java index 465ad7f38..0be00ed7b 100644 --- a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameView.java +++ b/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameView.java @@ -6,9 +6,9 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; import android.os.Build; -import androidx.annotation.ColorInt; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; +import android.support.annotation.ColorInt; +import android.support.annotation.Nullable; +import android.support.annotation.RequiresApi; import android.text.TextPaint; import android.util.AttributeSet; import android.util.DisplayMetrics; diff --git a/app/src/main/java/com/yizhuan/erban/home/view/Home3PlusNDecoration.java b/app/src/main/java/com/yizhuan/erban/home/view/Home3PlusNDecoration.java index 01c6164e3..6e9892e5f 100644 --- a/app/src/main/java/com/yizhuan/erban/home/view/Home3PlusNDecoration.java +++ b/app/src/main/java/com/yizhuan/erban/home/view/Home3PlusNDecoration.java @@ -1,11 +1,12 @@ package com.yizhuan.erban.home.view; import android.content.Context; +import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.yizhuan.erban.R; diff --git a/app/src/main/java/com/yizhuan/erban/home/view/HomeConfigModule.java b/app/src/main/java/com/yizhuan/erban/home/view/HomeConfigModule.java index 5a839d28a..dd7e24428 100644 --- a/app/src/main/java/com/yizhuan/erban/home/view/HomeConfigModule.java +++ b/app/src/main/java/com/yizhuan/erban/home/view/HomeConfigModule.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.home.view; import android.content.Context; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java b/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java index 89437f6b2..a73d1054e 100644 --- a/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java +++ b/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.luckymoney.dialog; import android.content.Context; -import androidx.appcompat.app.AppCompatDialog; +import android.support.v7.app.AppCompatDialog; import android.view.View; /** diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyDialog.java b/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyDialog.java index a6d6cabe5..b410133f3 100644 --- a/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyDialog.java +++ b/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyDialog.java @@ -4,8 +4,8 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatDialog; +import android.support.annotation.NonNull; +import android.support.v7.app.AppCompatDialog; import android.util.DisplayMetrics; import android.view.Display; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java b/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java index ad072ea8b..4cf7ef9a8 100644 --- a/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java +++ b/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.luckymoney.view; import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.text.Editable; import android.text.TextWatcher; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyDetailActivity.java b/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyDetailActivity.java index 7fa7b2d5f..2695d6af7 100644 --- a/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyDetailActivity.java +++ b/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyDetailActivity.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.luckymoney.view; import android.content.Context; import android.content.Intent; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.LinearLayoutManager; +import android.support.v4.content.ContextCompat; +import android.support.v7.widget.LinearLayoutManager; import android.view.View; import com.yizhuan.erban.R; @@ -21,6 +21,7 @@ import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; import com.yizhuan.xchat_android_core.family.model.FamilyModel; import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyUserInfo; +import com.yizhuan.xchat_android_core.user.IUserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java b/app/src/main/java/com/yizhuan/erban/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java index 332b8f88b..7f5f09724 100644 --- a/app/src/main/java/com/yizhuan/erban/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java +++ b/app/src/main/java/com/yizhuan/erban/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.luckymoney.viewholder; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.ForegroundColorSpan; diff --git a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterEscapeDialog.java b/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterEscapeDialog.java index e41ad08a3..67e8ae0af 100644 --- a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterEscapeDialog.java +++ b/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterEscapeDialog.java @@ -3,10 +3,10 @@ package com.yizhuan.erban.monsterhunting; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.FragmentManager; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.DialogFragment; +import android.support.v4.app.FragmentManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingActivity.java b/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingActivity.java index 351844afa..8335fbfb8 100644 --- a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingActivity.java +++ b/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingActivity.java @@ -3,9 +3,10 @@ package com.yizhuan.erban.monsterhunting; import android.content.Context; import android.content.Intent; import android.os.CountDownTimer; -import androidx.recyclerview.widget.LinearLayoutManager; +import android.support.v7.widget.LinearLayoutManager; import android.util.Log; import android.view.View; +import android.widget.Toast; import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.widget.GiftV2View; @@ -425,9 +426,9 @@ public class MonsterHuntingActivity extends BaseBindingActivity main tab 控件

* Created by Administrator on 2017/11/14. */ -public class MainTab extends androidx.appcompat.widget.AppCompatTextView { +public class MainTab extends android.support.v7.widget.AppCompatTextView { private static final int DEFAULT_COLOR = Color.parseColor("#333333"); private int mTabIcon, mTabIconSelect; private int mTabtextColor, mTabTextSelectColor; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MainTabLayout.java b/app/src/main/java/com/yizhuan/erban/ui/widget/MainTabLayout.java index 76b7880e9..291d1fe1a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/MainTabLayout.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/MainTabLayout.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.ui.widget; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MarqueeLayout.java b/app/src/main/java/com/yizhuan/erban/ui/widget/MarqueeLayout.java index 9755b7e04..b4adeeeef 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/MarqueeLayout.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/MarqueeLayout.java @@ -5,8 +5,8 @@ import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.text.TextPaint; import android.util.AttributeSet; import android.view.animation.LinearInterpolator; @@ -15,6 +15,7 @@ import android.widget.TextView; import com.yizhuan.erban.R; import com.yizhuan.xchat_android_library.utils.ScreenUtils; +import com.yizhuan.xchat_android_library.utils.SizeUtils; import com.yizhuan.xchat_android_library.utils.log.MLog; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MyItemAnimator.java b/app/src/main/java/com/yizhuan/erban/ui/widget/MyItemAnimator.java index 16ed93f33..33e7b0e57 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/MyItemAnimator.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/MyItemAnimator.java @@ -4,10 +4,10 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.TimeInterpolator; import android.animation.ValueAnimator; -import androidx.annotation.NonNull; -import androidx.core.view.ViewCompat; -import androidx.recyclerview.widget.SimpleItemAnimator; -import androidx.recyclerview.widget.RecyclerView.ViewHolder; +import android.support.annotation.NonNull; +import android.support.v4.view.ViewCompat; +import android.support.v7.widget.SimpleItemAnimator; +import android.support.v7.widget.RecyclerView.ViewHolder; import android.view.View; import android.view.ViewPropertyAnimator; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/NobleAvatarView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/NobleAvatarView.java index 824d3448e..e5232cc99 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/NobleAvatarView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/NobleAvatarView.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.ui.widget; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.AttributeSet; import android.widget.ImageView; @@ -15,6 +15,7 @@ import com.yizhuan.xchat_android_core.noble.NobleInfo; import com.yizhuan.xchat_android_core.noble.NobleResourceType; import com.yizhuan.xchat_android_core.noble.NobleUtil; import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember; +import com.yizhuan.xchat_android_core.user.bean.FansInfo; import com.yizhuan.xchat_android_core.user.bean.UserInfo; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/NobleOpenNoticeView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/NobleOpenNoticeView.java index 9701f1dab..b7c0b427d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/NobleOpenNoticeView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/NobleOpenNoticeView.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.ui.widget; import android.content.Context; import android.graphics.Color; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; @@ -19,6 +19,7 @@ import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; import com.yizhuan.erban.R; +import com.yizhuan.xchat_android_library.utils.SizeUtils; import com.yizhuan.xchat_android_core.noble.NobleInfo; import com.yizhuan.xchat_android_core.noble.NobleUtil; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/NumView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/NumView.java index 960ed836e..de5496b59 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/NumView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/NumView.java @@ -1,11 +1,12 @@ package com.yizhuan.erban.ui.widget; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.AttributeSet; import android.widget.ImageView; import android.widget.LinearLayout; +import com.netease.nim.uikit.common.util.log.LogUtil; import com.yizhuan.erban.R; import com.yizhuan.xchat_android_library.utils.JavaUtil; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ObservableScrollView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/ObservableScrollView.java index 3e20a615b..36e5f637d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/ObservableScrollView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/ObservableScrollView.java @@ -5,7 +5,7 @@ package com.yizhuan.erban.ui.widget; */ import android.content.Context; -import androidx.core.widget.NestedScrollView; +import android.support.v4.widget.NestedScrollView; import android.util.AttributeSet; import com.netease.nim.uikit.common.util.log.LogUtil; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/OnPageSelectedListener.java b/app/src/main/java/com/yizhuan/erban/ui/widget/OnPageSelectedListener.java index e527e014a..748c72a0f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/OnPageSelectedListener.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/OnPageSelectedListener.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.ui.widget; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.ViewPager; /** * diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/PinEntryEditText.java b/app/src/main/java/com/yizhuan/erban/ui/widget/PinEntryEditText.java index 41e6efd7a..1309dc011 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/PinEntryEditText.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/PinEntryEditText.java @@ -28,10 +28,10 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Typeface; import android.graphics.drawable.Drawable; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.core.view.ViewCompat; -import androidx.appcompat.widget.AppCompatEditText; +import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; +import android.support.v4.view.ViewCompat; +import android.support.v7.widget.AppCompatEditText; import android.text.InputFilter; import android.text.InputType; import android.text.TextUtils; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerRefreshLayout.java b/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerRefreshLayout.java index 5bc6e3fa1..90c4708b6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerRefreshLayout.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerRefreshLayout.java @@ -1,11 +1,11 @@ package com.yizhuan.erban.ui.widget; import android.content.Context; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.StaggeredGridLayoutManager; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.StaggeredGridLayoutManager; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoBugLinearLayoutManager.java b/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoBugLinearLayoutManager.java index 2bfdf89e9..644f5bbab 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoBugLinearLayoutManager.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoBugLinearLayoutManager.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.ui.widget; import android.content.Context; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoViewpagerScroll.java b/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoViewpagerScroll.java index 4a843eea5..cda2c3e01 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoViewpagerScroll.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoViewpagerScroll.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.ui.widget; import android.content.Context; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RedPointView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/RedPointView.java index 4da1bdcb3..b46fd7792 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/RedPointView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/RedPointView.java @@ -5,8 +5,8 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.annotation.Nullable; +import android.support.v7.widget.AppCompatTextView; import android.text.TextPaint; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RoomItemView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/RoomItemView.java index eb670acad..022e13075 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/RoomItemView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/RoomItemView.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.ui.widget; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.Drawable; -import androidx.annotation.Nullable; - +import android.support.annotation.Nullable; +import android.text.StaticLayout; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; @@ -20,10 +20,12 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; +import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.activity.AVRoomActivity; import com.yizhuan.erban.ui.utils.ImageLoadUtils; +import com.yizhuan.erban.ui.widget.marqueeview.Utils; import com.yizhuan.xchat_android_core.home.bean.HomeRoom; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java index e1e963027..c4570ac2d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java @@ -2,12 +2,13 @@ package com.yizhuan.erban.ui.widget; import android.content.Context; import android.os.Bundle; -import com.google.android.material.bottomsheet.BottomSheetBehavior; -import com.google.android.material.bottomsheet.BottomSheetDialog; +import android.support.design.widget.BottomSheetBehavior; +import android.support.design.widget.BottomSheetDialog; import android.view.View; import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.TextView; +import android.widget.Toast; import com.yizhuan.erban.R; import com.yizhuan.erban.ui.widget.marqueeview.Utils; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareRedBagDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareRedBagDialog.java index ee5b04923..a649a2798 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareRedBagDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareRedBagDialog.java @@ -2,9 +2,9 @@ package com.yizhuan.erban.ui.widget; import android.app.Dialog; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.StyleRes; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.annotation.StyleRes; /** * Created by Seven on 2017/9/24. diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/SquareImageView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/SquareImageView.java index d3563300e..1b85e3b3d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/SquareImageView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/SquareImageView.java @@ -6,7 +6,7 @@ import android.util.AttributeSet; /** * Created by chenran on 2017/7/24. */ -public class SquareImageView extends androidx.appcompat.widget.AppCompatImageView { +public class SquareImageView extends android.support.v7.widget.AppCompatImageView { public SquareImageView(Context context, AttributeSet attrs, int defStyle) { diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java b/app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java index 007d85653..5c7cdc92d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.ui.widget; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.text.InputType; import android.util.AttributeSet; import android.widget.EditText; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java index 1cf3f0ae9..2804e2b36 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java @@ -3,10 +3,10 @@ package com.yizhuan.erban.ui.widget; import android.annotation.SuppressLint; import android.content.Context; import android.os.Bundle; -import androidx.appcompat.app.AppCompatDialog; -import androidx.appcompat.widget.AppCompatImageView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.app.AppCompatDialog; +import android.support.v7.widget.AppCompatImageView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.Gravity; import android.view.LayoutInflater; @@ -17,6 +17,7 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import android.widget.Toast; import com.google.android.flexbox.FlexboxLayout; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoView.java index d09ab16d5..931adc6fe 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoView.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.ui.widget; import android.content.Context; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.annotation.Nullable; +import android.support.v7.widget.AppCompatImageView; import android.text.TextUtils; import android.util.AttributeSet; import android.view.Gravity; @@ -13,10 +13,13 @@ import android.widget.TextView; import com.yizhuan.erban.R; import com.yizhuan.erban.ui.utils.ImageLoadUtils; import com.yizhuan.erban.utils.RegexUtil; +import com.yizhuan.xchat_android_core.level.UserLevelVo; import com.yizhuan.xchat_android_core.user.bean.SimpleUserInfo; +import com.yizhuan.xchat_android_core.user.bean.UserInfo; import butterknife.BindView; import butterknife.ButterKnife; +import lombok.Data; /** * 用户信息展示 一个通用的展示，用户昵称，性别，经验等级，魅力等级 diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserMagicIndicator.java b/app/src/main/java/com/yizhuan/erban/ui/widget/UserMagicIndicator.java index 4ebb92d1b..d86a98205 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserMagicIndicator.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/UserMagicIndicator.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.ui.widget; import android.content.Context; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftDialog.java index cbd3f9ca4..4ac41c231 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftDialog.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.ui.widget.dialog; import android.content.Context; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java index 9e2cc86f7..d54fa441e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.ui.widget.dialog; import android.content.Context; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java index 6690087cc..8e3299d09 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.ui.widget.dialog; import android.content.Context; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; import android.graphics.Color; import android.graphics.Point; import android.graphics.drawable.ColorDrawable; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java index 526f12cfa..5e8950e6b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.ui.widget.dialog; import android.content.Context; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; import android.graphics.Color; import android.graphics.Point; import android.graphics.drawable.ColorDrawable; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/BaseDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/BaseDialog.java index 6232ffd3d..b7c1568ed 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/BaseDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/BaseDialog.java @@ -1,7 +1,8 @@ package com.yizhuan.erban.ui.widget.dialog; import android.content.Context; -import androidx.appcompat.app.AppCompatDialog; +import android.support.v7.app.AppCompatDialog; +import android.widget.Toast; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/MonsterDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/MonsterDialog.java index 8950d3ae0..8fa11c5b1 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/MonsterDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/MonsterDialog.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.ui.widget.dialog; import android.content.Context; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleDialog.java index 78e7305f8..da7a54a48 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleDialog.java @@ -1,10 +1,15 @@ package com.yizhuan.erban.ui.widget.dialog; import android.content.Context; +import android.graphics.Color; +import android.graphics.Paint; import android.os.Bundle; -import androidx.appcompat.app.AppCompatDialog; - +import android.support.v7.app.AppCompatDialog; +import android.text.Spannable; +import android.text.SpannableStringBuilder; import android.text.TextUtils; +import android.text.style.ForegroundColorSpan; +import android.util.TypedValue; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java index f6947d9ce..a61df78b0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java @@ -5,13 +5,14 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import androidx.appcompat.app.AppCompatDialog; +import android.support.v7.app.AppCompatDialog; import android.text.TextUtils; import android.view.Gravity; import android.view.Window; import android.view.WindowManager; import com.yizhuan.erban.R; +import com.yizhuan.erban.application.XChatApplication; import com.yizhuan.xchat_android_library.utils.SizeUtils; import com.yizhuan.erban.ui.widget.MarqueeLayout; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java index 02b486df9..7aa93f070 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java @@ -2,10 +2,10 @@ package com.yizhuan.erban.ui.widget.dynamicface; import android.content.Context; import android.os.Bundle; -import com.google.android.material.bottomsheet.BottomSheetBehavior; -import com.google.android.material.bottomsheet.BottomSheetDialog; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; +import android.support.design.widget.BottomSheetBehavior; +import android.support.design.widget.BottomSheetDialog; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,10 +14,12 @@ import android.widget.FrameLayout; import android.widget.GridView; import android.widget.LinearLayout; import android.widget.TextView; +import android.widget.Toast; import com.yizhuan.erban.R; import com.yizhuan.erban.ui.widget.dialog.OpenNobleDialog; import com.yizhuan.erban.ui.widget.marqueeview.Utils; +import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; import com.yizhuan.xchat_android_core.room.event.FaceIsReadyEvent; import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/HiGuide.java b/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/HiGuide.java index 45ea20298..e27e57a74 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/HiGuide.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/HiGuide.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.ui.widget.higuide; import android.app.Activity; import android.content.Context; -import androidx.annotation.IntDef; +import android.support.annotation.IntDef; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/Overlay.java b/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/Overlay.java index 2db4f4b26..5c1b99a18 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/Overlay.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/Overlay.java @@ -2,9 +2,9 @@ package com.yizhuan.erban.ui.widget.higuide; import android.graphics.Color; import android.graphics.RectF; -import androidx.annotation.IntDef; -import androidx.annotation.LayoutRes; -import androidx.annotation.Nullable; +import android.support.annotation.IntDef; +import android.support.annotation.LayoutRes; +import android.support.annotation.Nullable; import android.view.View; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideView.java index b0f9aa73a..f663cf7dc 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideView.java @@ -4,7 +4,7 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Path; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.util.TypedValue; import android.view.Gravity; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java index c8ab8311f..6a95b7eb0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.ui.widget.magicindicator; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ViewPagerHelper.java b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ViewPagerHelper.java index de374f4b9..5bb7a4c14 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ViewPagerHelper.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ViewPagerHelper.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.ui.widget.magicindicator; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.ViewPager; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java index d47c8bd46..5298bebaa 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.ui.widget.magicindicator.ext; import android.content.Context; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import com.yizhuan.erban.R; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/AvRoomNobleWelcomeView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/AvRoomNobleWelcomeView.java index 2a39793c1..25a8008c3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/AvRoomNobleWelcomeView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/AvRoomNobleWelcomeView.java @@ -5,7 +5,7 @@ import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.content.Context; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.text.TextPaint; import android.text.TextUtils; import android.util.AttributeSet; @@ -14,6 +14,7 @@ import android.view.animation.LinearInterpolator; import android.widget.RelativeLayout; import android.widget.TextView; +import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.yizhuan.erban.R; import com.yizhuan.xchat_android_library.utils.ScreenUtils; import com.yizhuan.xchat_android_library.utils.SizeUtils; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/HomeRankingView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/HomeRankingView.java index 7ee687357..3eae76f75 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/HomeRankingView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/HomeRankingView.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.ui.widget.marqueeview; import android.content.Context; -import androidx.annotation.AnimRes; +import android.support.annotation.AnimRes; import android.util.AttributeSet; import android.util.SparseArray; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/MarqueeView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/MarqueeView.java index c808f2a47..859e08f5f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/MarqueeView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/MarqueeView.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.ui.widget.marqueeview; import android.content.Context; import android.content.res.TypedArray; import android.os.Build; -import androidx.annotation.AnimRes; +import android.support.annotation.AnimRes; import android.text.TextUtils; import android.util.AttributeSet; import android.view.Gravity; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java b/app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java index 977e25031..8e50bad1b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java @@ -4,9 +4,9 @@ package com.yizhuan.erban.ui.widget.password; import android.app.Activity; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.FragmentManager; +import android.support.annotation.Nullable; +import android.support.v4.app.DialogFragment; +import android.support.v4.app.FragmentManager; import android.util.DisplayMetrics; import android.view.Display; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/ColorDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/ColorDecoration.java index 2b28021d7..b6670ac49 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/ColorDecoration.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/ColorDecoration.java @@ -2,10 +2,10 @@ package com.yizhuan.erban.ui.widget.recyclerview.decoration; import android.graphics.Canvas; import android.graphics.Rect; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.StaggeredGridLayoutManager; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.StaggeredGridLayoutManager; import android.view.View; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DividerItemDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DividerItemDecoration.java index cc1e9de39..aa0d45d9c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DividerItemDecoration.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DividerItemDecoration.java @@ -5,8 +5,8 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import io.reactivex.annotations.NonNull; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java index aae3d1c92..a6149e8ce 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.ui.widget.recyclerview.decoration; import android.content.Context; import android.graphics.Rect; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.util.TypedValue; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridVItemDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridVItemDecoration.java index dc362677d..6344deaff 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridVItemDecoration.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridVItemDecoration.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.ui.widget.recyclerview.decoration; import android.content.Context; import android.graphics.Rect; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/HorizontalDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/HorizontalDecoration.java index d5662f83c..4bd3e7b5d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/HorizontalDecoration.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/HorizontalDecoration.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.ui.widget.recyclerview.decoration; import android.graphics.Rect; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.View; import lombok.Setter; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/SpacingDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/SpacingDecoration.java index 905b973a1..d430a056a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/SpacingDecoration.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/SpacingDecoration.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.ui.widget.recyclerview.decoration; import android.graphics.Rect; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.StaggeredGridLayoutManager; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.StaggeredGridLayoutManager; import android.view.View; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/VerticalDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/VerticalDecoration.java index 97b0c50c5..083200610 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/VerticalDecoration.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/VerticalDecoration.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.ui.widget.recyclerview.decoration; import android.graphics.Rect; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.View; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java index 05eef6811..2553cbf89 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.ui.widget.recyclerview.layoutmanager; import android.content.Context; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java index 0063aea55..607cb493f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.ui.widget.recyclerview.layoutmanager; import android.content.Context; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java b/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java index 27c1e9698..969d1091a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.ui.withdraw; import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.text.style.ForegroundColorSpan; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java b/app/src/main/java/com/yizhuan/erban/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java index 7c6b0140a..7546d51e8 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.ui.withdraw.bankcard; import android.os.Bundle; -import com.google.android.material.textfield.TextInputEditText; +import android.support.design.widget.TextInputEditText; import android.text.Editable; import android.text.TextUtils; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/utils/AppBarStateChangeListener.java b/app/src/main/java/com/yizhuan/erban/utils/AppBarStateChangeListener.java index 6ebc8de01..fae84a067 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/AppBarStateChangeListener.java +++ b/app/src/main/java/com/yizhuan/erban/utils/AppBarStateChangeListener.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.utils; -import com.google.android.material.appbar.AppBarLayout; +import android.support.design.widget.AppBarLayout; public abstract class AppBarStateChangeListener implements AppBarLayout.OnOffsetChangedListener { diff --git a/app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java b/app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java index ac344efc3..7ad8b87d9 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java +++ b/app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.utils; -import androidx.core.content.FileProvider; +import android.support.v4.content.FileProvider; /** *

使用的第三方库也配置了同样的FileProvider, 可以通过继承FileProvider类来解决合并冲突的问题

diff --git a/app/src/main/java/com/yizhuan/erban/utils/CertificateHelper.java b/app/src/main/java/com/yizhuan/erban/utils/CertificateHelper.java index 616135a47..5d2fa01a5 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/CertificateHelper.java +++ b/app/src/main/java/com/yizhuan/erban/utils/CertificateHelper.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.utils; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; +import android.support.annotation.NonNull; +import android.support.v4.content.ContextCompat; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; diff --git a/app/src/main/java/com/yizhuan/erban/utils/FontTextView.java b/app/src/main/java/com/yizhuan/erban/utils/FontTextView.java index 4c0a202fc..99f331dd5 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/FontTextView.java +++ b/app/src/main/java/com/yizhuan/erban/utils/FontTextView.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.utils; import android.content.Context; import android.content.res.AssetManager; import android.graphics.Typeface; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.v7.widget.AppCompatTextView; import android.util.AttributeSet; public class FontTextView extends AppCompatTextView { diff --git a/app/src/main/java/com/yizhuan/erban/utils/NotificationsUtils.java b/app/src/main/java/com/yizhuan/erban/utils/NotificationsUtils.java index d1167228c..ddb9eac2d 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/NotificationsUtils.java +++ b/app/src/main/java/com/yizhuan/erban/utils/NotificationsUtils.java @@ -8,7 +8,7 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.provider.Settings; -import androidx.core.app.NotificationManagerCompat; +import android.support.v4.app.NotificationManagerCompat; import com.netease.nim.uikit.common.util.log.LogUtil; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; diff --git a/app/src/main/res/layout/act_community_notice.xml b/app/src/main/res/layout/act_community_notice.xml index f578abea2..df6c91328 100644 --- a/app/src/main/res/layout/act_community_notice.xml +++ b/app/src/main/res/layout/act_community_notice.xml @@ -1,5 +1,5 @@ - @@ -18,21 +18,21 @@ app:layout_constraintTop_toBottomOf="@id/title_bar" app:layout_constraintBottom_toBottomOf="parent"> - - - + - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_team_member.xml b/app/src/main/res/layout/activity_add_team_member.xml index e79b92772..a6c57765c 100644 --- a/app/src/main/res/layout/activity_add_team_member.xml +++ b/app/src/main/res/layout/activity_add_team_member.xml @@ -113,7 +113,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/app/src/main/res/layout/activity_add_team_member_search_list.xml b/app/src/main/res/layout/activity_add_team_member_search_list.xml index d9c6f8091..67bbe6ef2 100644 --- a/app/src/main/res/layout/activity_add_team_member_search_list.xml +++ b/app/src/main/res/layout/activity_add_team_member_search_list.xml @@ -101,7 +101,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + diff --git a/app/src/main/res/layout/activity_bill_gift_income_group.xml b/app/src/main/res/layout/activity_bill_gift_income_group.xml index 0f09f8a27..39fb806b0 100644 --- a/app/src/main/res/layout/activity_bill_gift_income_group.xml +++ b/app/src/main/res/layout/activity_bill_gift_income_group.xml @@ -24,7 +24,7 @@ android:layout_height="9dp" android:background="@color/white"/> - - - - + diff --git a/app/src/main/res/layout/activity_bind_withdraw_bank_card.xml b/app/src/main/res/layout/activity_bind_withdraw_bank_card.xml index edd6f0f25..643d4b432 100644 --- a/app/src/main/res/layout/activity_bind_withdraw_bank_card.xml +++ b/app/src/main/res/layout/activity_bind_withdraw_bank_card.xml @@ -1,5 +1,5 @@ - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_binder_phone.xml b/app/src/main/res/layout/activity_binder_phone.xml index ca1ec02c4..5b88f0620 100644 --- a/app/src/main/res/layout/activity_binder_phone.xml +++ b/app/src/main/res/layout/activity_binder_phone.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/activity_charge.xml b/app/src/main/res/layout/activity_charge.xml index a50fb9ec3..95e89887a 100644 --- a/app/src/main/res/layout/activity_charge.xml +++ b/app/src/main/res/layout/activity_charge.xml @@ -102,7 +102,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - + - - + - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_erban_top_message.xml b/app/src/main/res/layout/activity_erban_top_message.xml index 57fbb9561..6c533c4c4 100644 --- a/app/src/main/res/layout/activity_erban_top_message.xml +++ b/app/src/main/res/layout/activity_erban_top_message.xml @@ -17,18 +17,18 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + diff --git a/app/src/main/res/layout/activity_family_currency.xml b/app/src/main/res/layout/activity_family_currency.xml index 98a505cce..82cb58a7a 100644 --- a/app/src/main/res/layout/activity_family_currency.xml +++ b/app/src/main/res/layout/activity_family_currency.xml @@ -15,17 +15,17 @@ - - - + diff --git a/app/src/main/res/layout/activity_family_game_list.xml b/app/src/main/res/layout/activity_family_game_list.xml index 526ae430a..732f01ab0 100644 --- a/app/src/main/res/layout/activity_family_game_list.xml +++ b/app/src/main/res/layout/activity_family_game_list.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - + diff --git a/app/src/main/res/layout/activity_family_list.xml b/app/src/main/res/layout/activity_family_list.xml index 4907c72a6..32a65db4a 100644 --- a/app/src/main/res/layout/activity_family_list.xml +++ b/app/src/main/res/layout/activity_family_list.xml @@ -16,19 +16,19 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - + diff --git a/app/src/main/res/layout/activity_family_list_member.xml b/app/src/main/res/layout/activity_family_list_member.xml index bf99adad5..13731d0aa 100644 --- a/app/src/main/res/layout/activity_family_list_member.xml +++ b/app/src/main/res/layout/activity_family_list_member.xml @@ -93,16 +93,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - + diff --git a/app/src/main/res/layout/activity_family_manage_activty.xml b/app/src/main/res/layout/activity_family_manage_activty.xml index ac68f55ad..d5a1e300c 100644 --- a/app/src/main/res/layout/activity_family_manage_activty.xml +++ b/app/src/main/res/layout/activity_family_manage_activty.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" /> - diff --git a/app/src/main/res/layout/activity_family_member_currency.xml b/app/src/main/res/layout/activity_family_member_currency.xml index 8781b463a..c2794c501 100644 --- a/app/src/main/res/layout/activity_family_member_currency.xml +++ b/app/src/main/res/layout/activity_family_member_currency.xml @@ -14,17 +14,17 @@ android:layout_height="wrap_content" /> - - - + diff --git a/app/src/main/res/layout/activity_family_member_search.xml b/app/src/main/res/layout/activity_family_member_search.xml index 789bf4b19..0fd404dfb 100644 --- a/app/src/main/res/layout/activity_family_member_search.xml +++ b/app/src/main/res/layout/activity_family_member_search.xml @@ -84,12 +84,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - + diff --git a/app/src/main/res/layout/activity_family_plaza.xml b/app/src/main/res/layout/activity_family_plaza.xml index 576022a5e..59535a322 100644 --- a/app/src/main/res/layout/activity_family_plaza.xml +++ b/app/src/main/res/layout/activity_family_plaza.xml @@ -13,12 +13,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_family_search.xml b/app/src/main/res/layout/activity_family_search.xml index 5745d20d1..ed2f64670 100644 --- a/app/src/main/res/layout/activity_family_search.xml +++ b/app/src/main/res/layout/activity_family_search.xml @@ -87,12 +87,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - + diff --git a/app/src/main/res/layout/activity_family_select_friend.xml b/app/src/main/res/layout/activity_family_select_friend.xml index 7a9950688..b4e23ef99 100644 --- a/app/src/main/res/layout/activity_family_select_friend.xml +++ b/app/src/main/res/layout/activity_family_select_friend.xml @@ -18,7 +18,7 @@ android:layout_height="40dp" android:layout_marginHorizontal="@dimen/dp_40"/> - diff --git a/app/src/main/res/layout/activity_fans.xml b/app/src/main/res/layout/activity_fans.xml index e85660e36..c3fa4e11c 100644 --- a/app/src/main/res/layout/activity_fans.xml +++ b/app/src/main/res/layout/activity_fans.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - diff --git a/app/src/main/res/layout/activity_forget_psw.xml b/app/src/main/res/layout/activity_forget_psw.xml index 90dc180df..000be3c10 100644 --- a/app/src/main/res/layout/activity_forget_psw.xml +++ b/app/src/main/res/layout/activity_forget_psw.xml @@ -1,5 +1,5 @@ - - - + diff --git a/app/src/main/res/layout/activity_friend_black_list_manage.xml b/app/src/main/res/layout/activity_friend_black_list_manage.xml index 461c1950c..a3bc77c7b 100644 --- a/app/src/main/res/layout/activity_friend_black_list_manage.xml +++ b/app/src/main/res/layout/activity_friend_black_list_manage.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + - - - - - + + diff --git a/app/src/main/res/layout/activity_ktv_room_list.xml b/app/src/main/res/layout/activity_ktv_room_list.xml index 04ff73878..9e8db631a 100644 --- a/app/src/main/res/layout/activity_ktv_room_list.xml +++ b/app/src/main/res/layout/activity_ktv_room_list.xml @@ -10,7 +10,7 @@ - - - + diff --git a/app/src/main/res/layout/activity_ktv_search_song.xml b/app/src/main/res/layout/activity_ktv_search_song.xml index a7d1a07f7..0898521af 100644 --- a/app/src/main/res/layout/activity_ktv_search_song.xml +++ b/app/src/main/res/layout/activity_ktv_search_song.xml @@ -135,13 +135,13 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + - + diff --git a/app/src/main/res/layout/activity_ktv_select_song.xml b/app/src/main/res/layout/activity_ktv_select_song.xml index 65ab228f3..601960d47 100644 --- a/app/src/main/res/layout/activity_ktv_select_song.xml +++ b/app/src/main/res/layout/activity_ktv_select_song.xml @@ -70,13 +70,13 @@ android:textColor="@color/color_333333" android:textSize="@dimen/sp_16" /> - - - + - + diff --git a/app/src/main/res/layout/activity_ktv_song_list.xml b/app/src/main/res/layout/activity_ktv_song_list.xml index fc1b82642..9d11b99a5 100644 --- a/app/src/main/res/layout/activity_ktv_song_list.xml +++ b/app/src/main/res/layout/activity_ktv_song_list.xml @@ -33,13 +33,13 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_10" /> - - - + - + diff --git a/app/src/main/res/layout/activity_list_attention.xml b/app/src/main/res/layout/activity_list_attention.xml index 102dcfb5e..eaf1af625 100644 --- a/app/src/main/res/layout/activity_list_attention.xml +++ b/app/src/main/res/layout/activity_list_attention.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - @@ -17,18 +17,18 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 46d1ab52b..53556a6f0 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -1,5 +1,5 @@ - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_lucky_money_detail.xml b/app/src/main/res/layout/activity_lucky_money_detail.xml index 3ff79f461..b6ab6355a 100644 --- a/app/src/main/res/layout/activity_lucky_money_detail.xml +++ b/app/src/main/res/layout/activity_lucky_money_detail.xml @@ -109,14 +109,14 @@ android:layout_centerInParent="true" tools:src="@drawable/default_user_head" /> - - - - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 9e56f061c..d7a5e7f05 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/activity_modify_info.xml b/app/src/main/res/layout/activity_modify_info.xml index 410a663a5..9dafd3fd6 100644 --- a/app/src/main/res/layout/activity_modify_info.xml +++ b/app/src/main/res/layout/activity_modify_info.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_modify_pwd.xml b/app/src/main/res/layout/activity_modify_pwd.xml index 8cc571946..a0c48142f 100644 --- a/app/src/main/res/layout/activity_modify_pwd.xml +++ b/app/src/main/res/layout/activity_modify_pwd.xml @@ -47,12 +47,12 @@ app:title_hint="确认密码" app:hint="再次确认新的登录密码"/> - - - + - - - + - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_my_voice.xml b/app/src/main/res/layout/activity_my_voice.xml index 1b3aef1d4..e091d630e 100644 --- a/app/src/main/res/layout/activity_my_voice.xml +++ b/app/src/main/res/layout/activity_my_voice.xml @@ -30,7 +30,7 @@ android:layout_height="0dp" android:layout_weight="1"> - - - - + diff --git a/app/src/main/res/layout/activity_nim_add_black_list.xml b/app/src/main/res/layout/activity_nim_add_black_list.xml index 8be5df149..e9c6e0ab2 100644 --- a/app/src/main/res/layout/activity_nim_add_black_list.xml +++ b/app/src/main/res/layout/activity_nim_add_black_list.xml @@ -7,7 +7,7 @@ android:background="#f8f8f8" android:orientation="vertical"> - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_p2p_message.xml b/app/src/main/res/layout/activity_p2p_message.xml index 82bcffb47..146447f78 100644 --- a/app/src/main/res/layout/activity_p2p_message.xml +++ b/app/src/main/res/layout/activity_p2p_message.xml @@ -13,14 +13,14 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - + + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_radish_record.xml b/app/src/main/res/layout/activity_radish_record.xml index db1a5d7d8..8241f73c2 100644 --- a/app/src/main/res/layout/activity_radish_record.xml +++ b/app/src/main/res/layout/activity_radish_record.xml @@ -63,7 +63,7 @@ - diff --git a/app/src/main/res/layout/activity_record_for_pk.xml b/app/src/main/res/layout/activity_record_for_pk.xml index 8819ea6aa..3cc90fd19 100644 --- a/app/src/main/res/layout/activity_record_for_pk.xml +++ b/app/src/main/res/layout/activity_record_for_pk.xml @@ -13,18 +13,18 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_recyclerview_bind.xml b/app/src/main/res/layout/activity_recyclerview_bind.xml index 804fecd2e..787cbfd53 100644 --- a/app/src/main/res/layout/activity_recyclerview_bind.xml +++ b/app/src/main/res/layout/activity_recyclerview_bind.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_red_packet_withdraw.xml b/app/src/main/res/layout/activity_red_packet_withdraw.xml index ac95fbf9d..1e84607fb 100644 --- a/app/src/main/res/layout/activity_red_packet_withdraw.xml +++ b/app/src/main/res/layout/activity_red_packet_withdraw.xml @@ -156,7 +156,7 @@ - - - + diff --git a/app/src/main/res/layout/activity_room_black_list.xml b/app/src/main/res/layout/activity_room_black_list.xml index 0f9a314f1..c9612485f 100644 --- a/app/src/main/res/layout/activity_room_black_list.xml +++ b/app/src/main/res/layout/activity_room_black_list.xml @@ -28,7 +28,7 @@ android:layout_height="match_parent" > - diff --git a/app/src/main/res/layout/activity_room_invite.xml b/app/src/main/res/layout/activity_room_invite.xml index bcf786807..d4cf2dd43 100644 --- a/app/src/main/res/layout/activity_room_invite.xml +++ b/app/src/main/res/layout/activity_room_invite.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - diff --git a/app/src/main/res/layout/activity_room_rank_list.xml b/app/src/main/res/layout/activity_room_rank_list.xml index 4d51c881c..a8b341864 100644 --- a/app/src/main/res/layout/activity_room_rank_list.xml +++ b/app/src/main/res/layout/activity_room_rank_list.xml @@ -88,13 +88,13 @@ - - + diff --git a/app/src/main/res/layout/activity_room_setting.xml b/app/src/main/res/layout/activity_room_setting.xml index 69f4bc51d..7839689b7 100644 --- a/app/src/main/res/layout/activity_room_setting.xml +++ b/app/src/main/res/layout/activity_room_setting.xml @@ -416,7 +416,7 @@ android:visibility="gone" android:background="@color/line_color" /> - - + - - + diff --git a/app/src/main/res/layout/activity_scrolling.xml b/app/src/main/res/layout/activity_scrolling.xml index 8c307715e..03c627257 100644 --- a/app/src/main/res/layout/activity_scrolling.xml +++ b/app/src/main/res/layout/activity_scrolling.xml @@ -1,5 +1,5 @@ - - - - - - + + - - + diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index c4ed8a309..dc7b60857 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -78,7 +78,7 @@ - - - + - - - + - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_select_friend.xml b/app/src/main/res/layout/activity_select_friend.xml index 63241e666..3ce6ffbbc 100644 --- a/app/src/main/res/layout/activity_select_friend.xml +++ b/app/src/main/res/layout/activity_select_friend.xml @@ -22,7 +22,7 @@ android:layout_height="36dp" android:background="@color/white"/> - diff --git a/app/src/main/res/layout/activity_send_gold.xml b/app/src/main/res/layout/activity_send_gold.xml index ee4e9cbd1..842ff6d3c 100644 --- a/app/src/main/res/layout/activity_send_gold.xml +++ b/app/src/main/res/layout/activity_send_gold.xml @@ -1,5 +1,5 @@ - - - - + - - + @@ -208,4 +208,4 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index 54b8b6010..89659a451 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -174,7 +174,7 @@ android:layout_marginEnd="15dp" android:background="@color/color_F5F5F5" /> - - + - - + diff --git a/app/src/main/res/layout/activity_show_photo.xml b/app/src/main/res/layout/activity_show_photo.xml index fc613fefd..0c994a8db 100644 --- a/app/src/main/res/layout/activity_show_photo.xml +++ b/app/src/main/res/layout/activity_show_photo.xml @@ -7,11 +7,11 @@ android:fitsSystemWindows="true" android:clipToPadding="false" tools:context="com.yizhuan.erban.ui.user.ShowPhotoActivity"> - - + - - - + - + @@ -281,7 +281,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" /> - - + diff --git a/app/src/main/res/layout/activity_task_center.xml b/app/src/main/res/layout/activity_task_center.xml index 6d65d5b94..aa44f7f5f 100644 --- a/app/src/main/res/layout/activity_task_center.xml +++ b/app/src/main/res/layout/activity_task_center.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_team_member_list.xml b/app/src/main/res/layout/activity_team_member_list.xml index 305e6d7c4..4db7591d1 100644 --- a/app/src/main/res/layout/activity_team_member_list.xml +++ b/app/src/main/res/layout/activity_team_member_list.xml @@ -103,18 +103,18 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + diff --git a/app/src/main/res/layout/activity_team_member_search_list.xml b/app/src/main/res/layout/activity_team_member_search_list.xml index b9de4b059..76316a70d 100644 --- a/app/src/main/res/layout/activity_team_member_search_list.xml +++ b/app/src/main/res/layout/activity_team_member_search_list.xml @@ -98,13 +98,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - + diff --git a/app/src/main/res/layout/activity_team_message.xml b/app/src/main/res/layout/activity_team_message.xml index 2f26f3529..a87516f9e 100644 --- a/app/src/main/res/layout/activity_team_message.xml +++ b/app/src/main/res/layout/activity_team_message.xml @@ -7,14 +7,14 @@ android:fitsSystemWindows="true" android:orientation="vertical"> - - - - + + - diff --git a/app/src/main/res/layout/activity_team_weekly_bill_search.xml b/app/src/main/res/layout/activity_team_weekly_bill_search.xml index f363d2ebb..d3adf40b9 100644 --- a/app/src/main/res/layout/activity_team_weekly_bill_search.xml +++ b/app/src/main/res/layout/activity_team_weekly_bill_search.xml @@ -103,7 +103,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/app/src/main/res/layout/activity_update_team_name.xml b/app/src/main/res/layout/activity_update_team_name.xml index af62e4bf6..c5e6c675a 100644 --- a/app/src/main/res/layout/activity_update_team_name.xml +++ b/app/src/main/res/layout/activity_update_team_name.xml @@ -7,7 +7,7 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_user_guide.xml b/app/src/main/res/layout/activity_user_guide.xml index e13df1a9a..f04ce9ef9 100644 --- a/app/src/main/res/layout/activity_user_guide.xml +++ b/app/src/main/res/layout/activity_user_guide.xml @@ -2,12 +2,12 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - + - - - - - - - - - - - + + - + - - - + - + diff --git a/app/src/main/res/layout/activity_user_info_modify.xml b/app/src/main/res/layout/activity_user_info_modify.xml index dc42ccf4a..635e8c3b3 100644 --- a/app/src/main/res/layout/activity_user_info_modify.xml +++ b/app/src/main/res/layout/activity_user_info_modify.xml @@ -173,7 +173,7 @@ android:textColor="@color/text_color_secondary" android:textSize="@dimen/font_medium" /> - diff --git a/app/src/main/res/layout/activity_voice_match.xml b/app/src/main/res/layout/activity_voice_match.xml index f896163de..fa1bfaa70 100644 --- a/app/src/main/res/layout/activity_voice_match.xml +++ b/app/src/main/res/layout/activity_voice_match.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_wallet.xml b/app/src/main/res/layout/activity_wallet.xml index 55cebd63d..5d7160768 100644 --- a/app/src/main/res/layout/activity_wallet.xml +++ b/app/src/main/res/layout/activity_wallet.xml @@ -23,7 +23,7 @@ android:layout_marginTop="@dimen/common_toolbar_height" android:background="@color/white" /> - - - - + - - - - - - - - - - diff --git a/app/src/main/res/layout/common_toolbar_layout.xml b/app/src/main/res/layout/common_toolbar_layout.xml index c2b608d95..275bd8b16 100644 --- a/app/src/main/res/layout/common_toolbar_layout.xml +++ b/app/src/main/res/layout/common_toolbar_layout.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/content_scrolling.xml b/app/src/main/res/layout/content_scrolling.xml index f192f0471..0c0c20567 100644 --- a/app/src/main/res/layout/content_scrolling.xml +++ b/app/src/main/res/layout/content_scrolling.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/default_toolbar_layout.xml b/app/src/main/res/layout/default_toolbar_layout.xml index 3021e011b..d6c587d9b 100644 --- a/app/src/main/res/layout/default_toolbar_layout.xml +++ b/app/src/main/res/layout/default_toolbar_layout.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_bottom_face.xml b/app/src/main/res/layout/dialog_bottom_face.xml index 5c7ff3bce..b0703680f 100644 --- a/app/src/main/res/layout/dialog_bottom_face.xml +++ b/app/src/main/res/layout/dialog_bottom_face.xml @@ -6,7 +6,7 @@ android:background="#dd0c0c0c" android:orientation="vertical"> - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_confirm_payment_select.xml b/app/src/main/res/layout/dialog_confirm_payment_select.xml index bff01c1fc..5e8c9be51 100644 --- a/app/src/main/res/layout/dialog_confirm_payment_select.xml +++ b/app/src/main/res/layout/dialog_confirm_payment_select.xml @@ -4,7 +4,7 @@ android:layout_height="200dp" android:background="@drawable/bg_confirm_payment_select_way"> - - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_ktv_commit_error.xml b/app/src/main/res/layout/dialog_ktv_commit_error.xml index bcd0e68c2..7b03a91b1 100644 --- a/app/src/main/res/layout/dialog_ktv_commit_error.xml +++ b/app/src/main/res/layout/dialog_ktv_commit_error.xml @@ -11,7 +11,7 @@ type="android.view.View.OnClickListener" /> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_ktv_select_song.xml b/app/src/main/res/layout/dialog_ktv_select_song.xml index 09b7fa76b..c4e9496b1 100644 --- a/app/src/main/res/layout/dialog_ktv_select_song.xml +++ b/app/src/main/res/layout/dialog_ktv_select_song.xml @@ -16,7 +16,7 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_live_tag.xml b/app/src/main/res/layout/dialog_live_tag.xml index bbf068797..202c22155 100644 --- a/app/src/main/res/layout/dialog_live_tag.xml +++ b/app/src/main/res/layout/dialog_live_tag.xml @@ -15,7 +15,7 @@ android:gravity="center_horizontal" android:background="@drawable/shape_white_20dp_round"> - - - - - - - - + - - @@ -55,4 +55,4 @@ android:src="@drawable/icon_pm_close" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_pk_mic_queue.xml b/app/src/main/res/layout/dialog_pk_mic_queue.xml index 573356c00..588110e52 100644 --- a/app/src/main/res/layout/dialog_pk_mic_queue.xml +++ b/app/src/main/res/layout/dialog_pk_mic_queue.xml @@ -44,17 +44,17 @@ android:layout_height="0dp" android:layout_weight="1"> - - - + - diff --git a/app/src/main/res/layout/dialog_pk_score_board.xml b/app/src/main/res/layout/dialog_pk_score_board.xml index b6e75cff2..8da442469 100644 --- a/app/src/main/res/layout/dialog_pk_score_board.xml +++ b/app/src/main/res/layout/dialog_pk_score_board.xml @@ -105,7 +105,7 @@ android:background="@color/color_FFFFFF" android:orientation="horizontal"> - - + - - + - diff --git a/app/src/main/res/layout/dialog_room_impose.xml b/app/src/main/res/layout/dialog_room_impose.xml index 9c67aa3e2..827e39ff1 100644 --- a/app/src/main/res/layout/dialog_room_impose.xml +++ b/app/src/main/res/layout/dialog_room_impose.xml @@ -149,7 +149,7 @@ android:layout_width="match_parent" android:layout_height="10dp" /> - - + - diff --git a/app/src/main/res/layout/dialog_user_info.xml b/app/src/main/res/layout/dialog_user_info.xml index 88d715137..fb246f9d1 100644 --- a/app/src/main/res/layout/dialog_user_info.xml +++ b/app/src/main/res/layout/dialog_user_info.xml @@ -110,7 +110,7 @@ android:orientation="horizontal" tools:contentDescription="性别等级"> - - - - - - - - + diff --git a/app/src/main/res/layout/face_gridview.xml b/app/src/main/res/layout/face_gridview.xml index 9c95744b8..c41722869 100644 --- a/app/src/main/res/layout/face_gridview.xml +++ b/app/src/main/res/layout/face_gridview.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/family_attention_item.xml b/app/src/main/res/layout/family_attention_item.xml index 3b27c9618..81f116dce 100644 --- a/app/src/main/res/layout/family_attention_item.xml +++ b/app/src/main/res/layout/family_attention_item.xml @@ -41,7 +41,7 @@ android:textSize="15sp" tools:text="我的" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_chatroom_game_main.xml b/app/src/main/res/layout/fragment_chatroom_game_main.xml index cec73c80b..e7e8b111e 100644 --- a/app/src/main/res/layout/fragment_chatroom_game_main.xml +++ b/app/src/main/res/layout/fragment_chatroom_game_main.xml @@ -87,7 +87,7 @@ android:layout_centerHorizontal="true" android:orientation="horizontal"> - - - - - @@ -128,7 +128,7 @@ android:paddingLeft="@dimen/dp_15" android:paddingRight="@dimen/dp_15"> - @@ -281,7 +281,7 @@ android:textSize="18sp" android:textStyle="bold" /> - @@ -298,7 +298,7 @@ android:paddingLeft="20dp" android:paddingRight="20dp"> - @@ -410,8 +410,8 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_family_attention.xml b/app/src/main/res/layout/fragment_family_attention.xml index e959c7f37..de2b1f271 100644 --- a/app/src/main/res/layout/fragment_family_attention.xml +++ b/app/src/main/res/layout/fragment_family_attention.xml @@ -7,18 +7,18 @@ android:background="@color/color_F5F5F5" android:layout_height="match_parent"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_family_fans_list.xml b/app/src/main/res/layout/fragment_family_fans_list.xml index 3e5b69f6d..59333439b 100644 --- a/app/src/main/res/layout/fragment_family_fans_list.xml +++ b/app/src/main/res/layout/fragment_family_fans_list.xml @@ -9,19 +9,19 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + diff --git a/app/src/main/res/layout/fragment_family_friend_list.xml b/app/src/main/res/layout/fragment_family_friend_list.xml index dc8ed9471..0d8f5d666 100644 --- a/app/src/main/res/layout/fragment_family_friend_list.xml +++ b/app/src/main/res/layout/fragment_family_friend_list.xml @@ -4,18 +4,18 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_fans_list.xml b/app/src/main/res/layout/fragment_fans_list.xml index 4453546d6..286ce10a8 100644 --- a/app/src/main/res/layout/fragment_fans_list.xml +++ b/app/src/main/res/layout/fragment_fans_list.xml @@ -4,17 +4,17 @@ android:layout_height="match_parent" android:background="@color/color_FAFAFA"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_find.xml b/app/src/main/res/layout/fragment_find.xml index 98c3f24e4..c87d7573b 100644 --- a/app/src/main/res/layout/fragment_find.xml +++ b/app/src/main/res/layout/fragment_find.xml @@ -6,12 +6,12 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - + - - + - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_find_tab.xml b/app/src/main/res/layout/fragment_find_tab.xml index a96ea0d69..738d11ade 100644 --- a/app/src/main/res/layout/fragment_find_tab.xml +++ b/app/src/main/res/layout/fragment_find_tab.xml @@ -1,16 +1,16 @@ - - - - + - - + - + diff --git a/app/src/main/res/layout/fragment_game_home.xml b/app/src/main/res/layout/fragment_game_home.xml index 9b44d9a88..582c3af6f 100644 --- a/app/src/main/res/layout/fragment_game_home.xml +++ b/app/src/main/res/layout/fragment_game_home.xml @@ -28,25 +28,25 @@ android:src="@mipmap/bg_home_top" app:layout_constraintTop_toTopOf="parent" /> - - - - @@ -71,7 +71,7 @@ app:layout_constraintStart_toStartOf="parent" /> - - - - + - - + - + - + - - + - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home_other_tab.xml b/app/src/main/res/layout/fragment_home_other_tab.xml index 165de8bbc..87e6df0f9 100644 --- a/app/src/main/res/layout/fragment_home_other_tab.xml +++ b/app/src/main/res/layout/fragment_home_other_tab.xml @@ -5,7 +5,7 @@ android:id="@+id/smart_refresh_layout" tools:context="com.yizhuan.erban.home.fragment.HomeOtherTabFragment"> - - - - + diff --git a/app/src/main/res/layout/fragment_hottest_ktv.xml b/app/src/main/res/layout/fragment_hottest_ktv.xml index 7e927db1d..52f4cdf89 100644 --- a/app/src/main/res/layout/fragment_hottest_ktv.xml +++ b/app/src/main/res/layout/fragment_hottest_ktv.xml @@ -4,12 +4,12 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_ktv.xml b/app/src/main/res/layout/fragment_ktv.xml index 7af331331..9ffaf17c0 100644 --- a/app/src/main/res/layout/fragment_ktv.xml +++ b/app/src/main/res/layout/fragment_ktv.xml @@ -10,7 +10,7 @@ android:layout_height="40dp" android:background="@color/white" /> - - diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index 65f542eb2..5f0da6966 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -78,7 +78,7 @@ /> - - - - - - - - + @@ -461,7 +461,7 @@ - + @@ -721,7 +721,7 @@ - - + diff --git a/app/src/main/res/layout/fragment_msg.xml b/app/src/main/res/layout/fragment_msg.xml index c8bf0aad3..4623b62b9 100644 --- a/app/src/main/res/layout/fragment_msg.xml +++ b/app/src/main/res/layout/fragment_msg.xml @@ -13,7 +13,7 @@ android:paddingRight="5dp" android:background="@color/color_FAFAFA" /> - - - - + - + diff --git a/app/src/main/res/layout/fragment_newest_ktv.xml b/app/src/main/res/layout/fragment_newest_ktv.xml index 539e2c934..54331c0a3 100644 --- a/app/src/main/res/layout/fragment_newest_ktv.xml +++ b/app/src/main/res/layout/fragment_newest_ktv.xml @@ -5,12 +5,12 @@ android:background="@color/color_F5F5F5" android:orientation="vertical"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_radish_record.xml b/app/src/main/res/layout/fragment_radish_record.xml index 2e048b1e6..3163dea67 100644 --- a/app/src/main/res/layout/fragment_radish_record.xml +++ b/app/src/main/res/layout/fragment_radish_record.xml @@ -17,7 +17,7 @@ android:layout_height="@dimen/bill_item_time" android:layout_below="@+id/title_bar" /> - diff --git a/app/src/main/res/layout/fragment_recent_contacts.xml b/app/src/main/res/layout/fragment_recent_contacts.xml index cfbc8bf58..2b4faba2d 100644 --- a/app/src/main/res/layout/fragment_recent_contacts.xml +++ b/app/src/main/res/layout/fragment_recent_contacts.xml @@ -7,7 +7,7 @@ android:clickable="true" android:focusable="true"> - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_recommend_card.xml b/app/src/main/res/layout/fragment_recommend_card.xml index 1a14c6175..054ea32c4 100644 --- a/app/src/main/res/layout/fragment_recommend_card.xml +++ b/app/src/main/res/layout/fragment_recommend_card.xml @@ -1,5 +1,5 @@ - @@ -9,4 +9,4 @@ android:layout_height="match_parent"> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_recommendation.xml b/app/src/main/res/layout/fragment_recommendation.xml index e90399a6a..83ab17d3a 100644 --- a/app/src/main/res/layout/fragment_recommendation.xml +++ b/app/src/main/res/layout/fragment_recommendation.xml @@ -23,7 +23,7 @@ - diff --git a/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml b/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml index 431db4de9..dd31c371e 100644 --- a/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml +++ b/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml @@ -13,13 +13,13 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + - + - - - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_room_category.xml b/app/src/main/res/layout/fragment_room_category.xml index 2f2689738..c40c80e49 100644 --- a/app/src/main/res/layout/fragment_room_category.xml +++ b/app/src/main/res/layout/fragment_room_category.xml @@ -16,7 +16,7 @@ - diff --git a/app/src/main/res/layout/fragment_room_charm_list.xml b/app/src/main/res/layout/fragment_room_charm_list.xml index 30358eb9b..e7eee0605 100644 --- a/app/src/main/res/layout/fragment_room_charm_list.xml +++ b/app/src/main/res/layout/fragment_room_charm_list.xml @@ -21,7 +21,7 @@ - diff --git a/app/src/main/res/layout/fragment_room_charm_ranking_list.xml b/app/src/main/res/layout/fragment_room_charm_ranking_list.xml index 43eac6680..58e433042 100644 --- a/app/src/main/res/layout/fragment_room_charm_ranking_list.xml +++ b/app/src/main/res/layout/fragment_room_charm_ranking_list.xml @@ -9,12 +9,12 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - + diff --git a/app/src/main/res/layout/fragment_room_contribute.xml b/app/src/main/res/layout/fragment_room_contribute.xml index 119ae1ba9..4d2ec5717 100644 --- a/app/src/main/res/layout/fragment_room_contribute.xml +++ b/app/src/main/res/layout/fragment_room_contribute.xml @@ -18,7 +18,7 @@ - diff --git a/app/src/main/res/layout/fragment_room_list.xml b/app/src/main/res/layout/fragment_room_list.xml index 9d723be9f..a9ae3bb0a 100644 --- a/app/src/main/res/layout/fragment_room_list.xml +++ b/app/src/main/res/layout/fragment_room_list.xml @@ -4,17 +4,17 @@ android:layout_height="match_parent" android:background="@color/white"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_room_rank_half_hour.xml b/app/src/main/res/layout/fragment_room_rank_half_hour.xml index 7439f88eb..e819d1c23 100644 --- a/app/src/main/res/layout/fragment_room_rank_half_hour.xml +++ b/app/src/main/res/layout/fragment_room_rank_half_hour.xml @@ -179,7 +179,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + diff --git a/app/src/main/res/layout/fragment_room_rank_list.xml b/app/src/main/res/layout/fragment_room_rank_list.xml index 94816c98c..261166b64 100644 --- a/app/src/main/res/layout/fragment_room_rank_list.xml +++ b/app/src/main/res/layout/fragment_room_rank_list.xml @@ -74,13 +74,13 @@ - - + diff --git a/app/src/main/res/layout/fragment_task_center.xml b/app/src/main/res/layout/fragment_task_center.xml index 55127f910..948593a38 100644 --- a/app/src/main/res/layout/fragment_task_center.xml +++ b/app/src/main/res/layout/fragment_task_center.xml @@ -8,17 +8,17 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_team_list.xml b/app/src/main/res/layout/fragment_team_list.xml index 37a3397e6..ebadee003 100644 --- a/app/src/main/res/layout/fragment_team_list.xml +++ b/app/src/main/res/layout/fragment_team_list.xml @@ -12,19 +12,19 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_user_info.xml b/app/src/main/res/layout/fragment_user_info.xml index 86c248a72..ebb2009e1 100644 --- a/app/src/main/res/layout/fragment_user_info.xml +++ b/app/src/main/res/layout/fragment_user_info.xml @@ -1,5 +1,5 @@ - - diff --git a/app/src/main/res/layout/fragment_voice_status.xml b/app/src/main/res/layout/fragment_voice_status.xml index b61a50e2c..b4369cf46 100644 --- a/app/src/main/res/layout/fragment_voice_status.xml +++ b/app/src/main/res/layout/fragment_voice_status.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_voice_status_loading.xml b/app/src/main/res/layout/fragment_voice_status_loading.xml index dd490427f..cf34b0b82 100644 --- a/app/src/main/res/layout/fragment_voice_status_loading.xml +++ b/app/src/main/res/layout/fragment_voice_status_loading.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_xrexylerview.xml b/app/src/main/res/layout/fragment_xrexylerview.xml index e1aeac915..e7840b709 100644 --- a/app/src/main/res/layout/fragment_xrexylerview.xml +++ b/app/src/main/res/layout/fragment_xrexylerview.xml @@ -9,19 +9,19 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/frg_decoration_send_list.xml b/app/src/main/res/layout/frg_decoration_send_list.xml index a334da030..5e5e3d7ab 100644 --- a/app/src/main/res/layout/frg_decoration_send_list.xml +++ b/app/src/main/res/layout/frg_decoration_send_list.xml @@ -4,17 +4,17 @@ android:layout_height="match_parent" android:background="@color/color_FAFAFA"> - - - + diff --git a/app/src/main/res/layout/frg_gift_group.xml b/app/src/main/res/layout/frg_gift_group.xml index 4a84d8299..ad6dca37c 100644 --- a/app/src/main/res/layout/frg_gift_group.xml +++ b/app/src/main/res/layout/frg_gift_group.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/frg_my_decoration_common.xml b/app/src/main/res/layout/frg_my_decoration_common.xml index b2c0c3ae6..19976efe0 100644 --- a/app/src/main/res/layout/frg_my_decoration_common.xml +++ b/app/src/main/res/layout/frg_my_decoration_common.xml @@ -10,14 +10,14 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/gift_achievement_recyclerview.xml b/app/src/main/res/layout/gift_achievement_recyclerview.xml index 3d3de8373..59adeabbe 100644 --- a/app/src/main/res/layout/gift_achievement_recyclerview.xml +++ b/app/src/main/res/layout/gift_achievement_recyclerview.xml @@ -1,6 +1,6 @@ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/include_sign_in_anmi_layout.xml b/app/src/main/res/layout/include_sign_in_anmi_layout.xml index 8e316be92..fc58d2777 100644 --- a/app/src/main/res/layout/include_sign_in_anmi_layout.xml +++ b/app/src/main/res/layout/include_sign_in_anmi_layout.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_add_team_member.xml b/app/src/main/res/layout/item_add_team_member.xml index ea1f77aac..11b4030cb 100644 --- a/app/src/main/res/layout/item_add_team_member.xml +++ b/app/src/main/res/layout/item_add_team_member.xml @@ -36,14 +36,14 @@ avatarUrl="@{memberInfo.icon}" tools:src="@drawable/default_user_head" /> - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_banner.xml b/app/src/main/res/layout/item_banner.xml index 27353aa89..01e6cc2d0 100644 --- a/app/src/main/res/layout/item_banner.xml +++ b/app/src/main/res/layout/item_banner.xml @@ -38,7 +38,7 @@ android:layout_weight="1" app:hw_ratio="0.39"> - - - @@ -260,5 +260,5 @@ android:textSize="9dp" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_family_member_list.xml b/app/src/main/res/layout/item_family_member_list.xml index 532da9382..37e42cee3 100644 --- a/app/src/main/res/layout/item_family_member_list.xml +++ b/app/src/main/res/layout/item_family_member_list.xml @@ -77,7 +77,7 @@ android:visibility="visible" android:src="@drawable/ic_female" /> - - - diff --git a/app/src/main/res/layout/item_gift_achievement.xml b/app/src/main/res/layout/item_gift_achievement.xml index df8d5c108..bca3918ba 100644 --- a/app/src/main/res/layout/item_gift_achievement.xml +++ b/app/src/main/res/layout/item_gift_achievement.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_hall_left.xml b/app/src/main/res/layout/item_home_hall_left.xml index 9d27a226b..6bda431ce 100644 --- a/app/src/main/res/layout/item_home_hall_left.xml +++ b/app/src/main/res/layout/item_home_hall_left.xml @@ -52,7 +52,7 @@ android:visibility="gone" tools:visibility="visible" /> - - - - - - - diff --git a/app/src/main/res/layout/item_home_two_single_show.xml b/app/src/main/res/layout/item_home_two_single_show.xml index bc248c361..ce94e9f76 100644 --- a/app/src/main/res/layout/item_home_two_single_show.xml +++ b/app/src/main/res/layout/item_home_two_single_show.xml @@ -25,7 +25,7 @@ android:src="@drawable/default_avatar" app:riv_corner_radius="@dimen/dp_16" /> - @@ -66,7 +66,7 @@ android:textSize="13sp" tools:text="100" /> - + - - + - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_send.xml b/app/src/main/res/layout/item_send.xml index 1c62a8ea8..b8646b62f 100644 --- a/app/src/main/res/layout/item_send.xml +++ b/app/src/main/res/layout/item_send.xml @@ -40,7 +40,7 @@ app:layout_flexShrink="1" /> - - - - - - - - - - - - - - - @@ -52,7 +52,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - --> - + - diff --git a/app/src/main/res/layout/layout_common_popup_dialog.xml b/app/src/main/res/layout/layout_common_popup_dialog.xml index d0ea769b5..da39d9ee5 100644 --- a/app/src/main/res/layout/layout_common_popup_dialog.xml +++ b/app/src/main/res/layout/layout_common_popup_dialog.xml @@ -8,7 +8,7 @@ android:baselineAligned="false" android:orientation="vertical"> - - + - - + - diff --git a/app/src/main/res/layout/layout_desc_game.xml b/app/src/main/res/layout/layout_desc_game.xml index 18c6e6558..19b4c2a2f 100644 --- a/app/src/main/res/layout/layout_desc_game.xml +++ b/app/src/main/res/layout/layout_desc_game.xml @@ -17,7 +17,7 @@ android:textSize="15sp" android:visibility="gone" /> - diff --git a/app/src/main/res/layout/layout_desc_tag.xml b/app/src/main/res/layout/layout_desc_tag.xml index 4051c9dda..86b00cb18 100644 --- a/app/src/main/res/layout/layout_desc_tag.xml +++ b/app/src/main/res/layout/layout_desc_tag.xml @@ -41,7 +41,7 @@ android:textSize="12sp" /> - - - - ---> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_item_voice_bottle.xml b/app/src/main/res/layout/layout_item_voice_bottle.xml index f361379b6..fe080832f 100644 --- a/app/src/main/res/layout/layout_item_voice_bottle.xml +++ b/app/src/main/res/layout/layout_item_voice_bottle.xml @@ -19,7 +19,7 @@ android:scaleType="fitCenter" /> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_ktv_choose_song.xml b/app/src/main/res/layout/layout_ktv_choose_song.xml index bd8ed3d14..08009d781 100644 --- a/app/src/main/res/layout/layout_ktv_choose_song.xml +++ b/app/src/main/res/layout/layout_ktv_choose_song.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/layout_ktv_command.xml b/app/src/main/res/layout/layout_ktv_command.xml index 06ff3cf32..b186ced8f 100644 --- a/app/src/main/res/layout/layout_ktv_command.xml +++ b/app/src/main/res/layout/layout_ktv_command.xml @@ -1,5 +1,5 @@ - - - + - - + - - + diff --git a/app/src/main/res/layout/layout_ktv_prepare.xml b/app/src/main/res/layout/layout_ktv_prepare.xml index 0657e4cfc..26e65fa80 100644 --- a/app/src/main/res/layout/layout_ktv_prepare.xml +++ b/app/src/main/res/layout/layout_ktv_prepare.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/layout_micro_view.xml b/app/src/main/res/layout/layout_micro_view.xml index 5d6482499..47cea98de 100644 --- a/app/src/main/res/layout/layout_micro_view.xml +++ b/app/src/main/res/layout/layout_micro_view.xml @@ -27,7 +27,7 @@ android:layout_marginRight="@dimen/dp_12" android:visibility="gone" /> - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_rollpage_view.xml b/app/src/main/res/layout/layout_rollpage_view.xml index ededb294a..7f5668521 100644 --- a/app/src/main/res/layout/layout_rollpage_view.xml +++ b/app/src/main/res/layout/layout_rollpage_view.xml @@ -38,7 +38,7 @@ android:layout_weight="1" app:hw_ratio="0.39"> - - - - diff --git a/app/src/main/res/layout/layout_user_magic_wall.xml b/app/src/main/res/layout/layout_user_magic_wall.xml index cef6bb673..a202474d7 100644 --- a/app/src/main/res/layout/layout_user_magic_wall.xml +++ b/app/src/main/res/layout/layout_user_magic_wall.xml @@ -34,7 +34,7 @@ android:textSize="13sp" tools:text="(0)" /> - - - + - - + - - - + - - + - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_home_hall.xml b/app/src/main/res/layout/list_item_home_hall.xml index 2c18f90ea..67f84e43a 100644 --- a/app/src/main/res/layout/list_item_home_hall.xml +++ b/app/src/main/res/layout/list_item_home_hall.xml @@ -71,7 +71,7 @@ tools:visibility="visible" tools:text="新消息：最多六个字...在公聊大厅@你" /> - - - - - - --> - diff --git a/app/src/main/res/layout/list_item_room_consume.xml b/app/src/main/res/layout/list_item_room_consume.xml index 6f1b84798..e48b687eb 100644 --- a/app/src/main/res/layout/list_item_room_consume.xml +++ b/app/src/main/res/layout/list_item_room_consume.xml @@ -92,7 +92,7 @@ android:layout_width="13dp" android:layout_height="13dp" /> - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/vs_task_center_start_tips.xml b/app/src/main/res/layout/vs_task_center_start_tips.xml index 5eb284991..24eca269f 100644 --- a/app/src/main/res/layout/vs_task_center_start_tips.xml +++ b/app/src/main/res/layout/vs_task_center_start_tips.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/model_customer_server/java/com/yizhuan/xchat_android_core/customer_server/CustomerServerModel.java b/app/src/model_customer_server/java/com/yizhuan/xchat_android_core/customer_server/CustomerServerModel.java index bd8dc8dd0..2ab6e4d55 100644 --- a/app/src/model_customer_server/java/com/yizhuan/xchat_android_core/customer_server/CustomerServerModel.java +++ b/app/src/model_customer_server/java/com/yizhuan/xchat_android_core/customer_server/CustomerServerModel.java @@ -4,12 +4,15 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.drawable.Drawable; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; +import android.util.Log; +import android.view.View; import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.transition.Transition; import com.google.gson.Gson; +import com.netease.nimlib.sdk.NIMSDK; import com.qiyukf.unicorn.api.ConsultSource; import com.qiyukf.unicorn.api.ImageLoaderListener; import com.qiyukf.unicorn.api.UICustomization; @@ -23,6 +26,7 @@ import com.qiyukf.unicorn.api.customization.action.ImageAction; import com.qiyukf.unicorn.api.customization.input.ActionListProvider; import com.qiyukf.unicorn.api.customization.input.ActionPanelOptions; import com.qiyukf.unicorn.api.customization.input.InputPanelOptions; +import com.qiyukf.unicorn.api.msg.MsgTypeEnum; import com.qiyukf.unicorn.api.msg.OnPushMessageListener; import com.qiyukf.unicorn.api.msg.PushMessageExtension; import com.qiyukf.unicorn.api.msg.UnicornMessage; diff --git a/app/src/module_album/java/com/zhihu/matisse/Matisse.java b/app/src/module_album/java/com/zhihu/matisse/Matisse.java index 546738cfb..f5e6f9cc1 100644 --- a/app/src/module_album/java/com/zhihu/matisse/Matisse.java +++ b/app/src/module_album/java/com/zhihu/matisse/Matisse.java @@ -18,10 +18,11 @@ package com.zhihu.matisse; import android.app.Activity; import android.content.Intent; import android.net.Uri; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; import com.zhihu.matisse.internal.entity.CustomItem; +import com.zhihu.matisse.internal.entity.Item; import com.zhihu.matisse.ui.MatisseActivity; import java.lang.ref.WeakReference; diff --git a/app/src/module_album/java/com/zhihu/matisse/MimeType.java b/app/src/module_album/java/com/zhihu/matisse/MimeType.java index 48b7bd237..6c002383f 100644 --- a/app/src/module_album/java/com/zhihu/matisse/MimeType.java +++ b/app/src/module_album/java/com/zhihu/matisse/MimeType.java @@ -18,7 +18,7 @@ package com.zhihu.matisse; import android.content.ContentResolver; import android.net.Uri; -import androidx.collection.ArraySet; +import android.support.v4.util.ArraySet; import android.text.TextUtils; import android.webkit.MimeTypeMap; diff --git a/app/src/module_album/java/com/zhihu/matisse/SelectionCreator.java b/app/src/module_album/java/com/zhihu/matisse/SelectionCreator.java index 9c3d3ee24..cd85a8108 100644 --- a/app/src/module_album/java/com/zhihu/matisse/SelectionCreator.java +++ b/app/src/module_album/java/com/zhihu/matisse/SelectionCreator.java @@ -19,12 +19,12 @@ package com.zhihu.matisse; import android.app.Activity; import android.content.Intent; import android.os.Build; -import androidx.annotation.IntDef; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; -import androidx.annotation.StyleRes; -import androidx.fragment.app.Fragment; +import android.support.annotation.IntDef; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.annotation.RequiresApi; +import android.support.annotation.StyleRes; +import android.support.v4.app.Fragment; import com.zhihu.matisse.engine.ImageEngine; import com.zhihu.matisse.filter.Filter; @@ -238,7 +238,7 @@ public final class SelectionCreator { /** * Capture strategy provided for the location to save photos including internal and external - * storage and also a authority for {@link androidx.core.content.FileProvider}. + * storage and also a authority for {@link android.support.v4.content.FileProvider}. * * @param captureStrategy {@link CaptureStrategy}, needed only when capturing is enabled. * @return {@link SelectionCreator} for fluent API. diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/entity/Album.java b/app/src/module_album/java/com/zhihu/matisse/internal/entity/Album.java index d08aef970..6851fe01c 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/Album.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/entity/Album.java @@ -21,7 +21,7 @@ import android.database.Cursor; import android.os.Parcel; import android.os.Parcelable; import android.provider.MediaStore; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.yizhuan.erban.R; import com.zhihu.matisse.internal.loader.AlbumLoader; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/entity/IncapableCause.java b/app/src/module_album/java/com/zhihu/matisse/internal/entity/IncapableCause.java index ff5ec46fd..5c3920693 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/IncapableCause.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/entity/IncapableCause.java @@ -16,8 +16,8 @@ package com.zhihu.matisse.internal.entity; import android.content.Context; -import androidx.annotation.IntDef; -import androidx.fragment.app.FragmentActivity; +import android.support.annotation.IntDef; +import android.support.v4.app.FragmentActivity; import android.widget.Toast; import com.zhihu.matisse.internal.ui.widget.IncapableDialog; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/entity/Item.java b/app/src/module_album/java/com/zhihu/matisse/internal/entity/Item.java index 62f3ec259..0ef0b9839 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/Item.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/entity/Item.java @@ -22,7 +22,7 @@ import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; import android.provider.MediaStore; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.zhihu.matisse.MimeType; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/entity/SelectionSpec.java b/app/src/module_album/java/com/zhihu/matisse/internal/entity/SelectionSpec.java index f120429c8..7115f3a01 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/SelectionSpec.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/entity/SelectionSpec.java @@ -17,7 +17,7 @@ package com.zhihu.matisse.internal.entity; import android.content.pm.ActivityInfo; -import androidx.annotation.StyleRes; +import android.support.annotation.StyleRes; import com.zhihu.matisse.MimeType; import com.yizhuan.erban.R; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumLoader.java b/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumLoader.java index 482e22a76..f328296a9 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumLoader.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumLoader.java @@ -22,7 +22,7 @@ import android.database.MatrixCursor; import android.database.MergeCursor; import android.net.Uri; import android.provider.MediaStore; -import androidx.loader.content.CursorLoader; +import android.support.v4.content.CursorLoader; import com.zhihu.matisse.internal.entity.Album; import com.zhihu.matisse.internal.entity.SelectionSpec; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java b/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java index 47c22b0d2..ea2b2919e 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java @@ -22,7 +22,7 @@ import android.database.MatrixCursor; import android.database.MergeCursor; import android.net.Uri; import android.provider.MediaStore; -import androidx.loader.content.CursorLoader; +import android.support.v4.content.CursorLoader; import com.zhihu.matisse.internal.entity.Album; import com.zhihu.matisse.internal.entity.Item; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumCollection.java b/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumCollection.java index ceabef63a..bdfa925e1 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumCollection.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumCollection.java @@ -19,9 +19,9 @@ package com.zhihu.matisse.internal.model; import android.content.Context; import android.database.Cursor; import android.os.Bundle; -import androidx.fragment.app.FragmentActivity; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; +import android.support.v4.app.FragmentActivity; +import android.support.v4.app.LoaderManager; +import android.support.v4.content.Loader; import com.zhihu.matisse.internal.loader.AlbumLoader; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java b/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java index fa25939ec..90a938ab7 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java @@ -19,11 +19,11 @@ package com.zhihu.matisse.internal.model; import android.content.Context; import android.database.Cursor; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.FragmentActivity; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.FragmentActivity; +import android.support.v4.app.LoaderManager; +import android.support.v4.content.Loader; import com.zhihu.matisse.internal.entity.Album; import com.zhihu.matisse.internal.loader.AlbumMediaLoader; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java index a3d879680..881ca4a2d 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java @@ -17,7 +17,7 @@ package com.zhihu.matisse.internal.ui; import android.database.Cursor; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.zhihu.matisse.internal.entity.Album; import com.zhihu.matisse.internal.entity.Item; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java index 1775fcba5..253be76a3 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java @@ -19,10 +19,10 @@ import android.app.Activity; import android.content.Intent; import android.graphics.Color; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.viewpager.widget.ViewPager; -import androidx.interpolator.view.animation.FastOutSlowInInterpolator; -import androidx.appcompat.app.AppCompatActivity; +import android.support.annotation.Nullable; +import android.support.v4.view.ViewPager; +import android.support.v4.view.animation.FastOutSlowInInterpolator; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java index 3498935aa..9a685640d 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java @@ -18,10 +18,10 @@ package com.zhihu.matisse.internal.ui; import android.content.Context; import android.database.Cursor; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java index a5ae56ffe..95aed53bc 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java @@ -20,8 +20,8 @@ import android.content.Context; import android.content.Intent; import android.graphics.Point; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java index 8b934c7fd..4bd6e25a7 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java @@ -16,7 +16,7 @@ package com.zhihu.matisse.internal.ui; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.zhihu.matisse.internal.entity.Item; import com.zhihu.matisse.internal.entity.SelectionSpec; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java index 7eb8be7f7..83de6ffba 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java @@ -19,8 +19,8 @@ import android.content.Context; import android.content.res.TypedArray; import android.database.Cursor; import android.graphics.drawable.Drawable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java index b75abc1cb..eef46f055 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java @@ -15,9 +15,9 @@ */ package com.zhihu.matisse.internal.ui.adapter; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; import android.view.ViewGroup; import com.zhihu.matisse.internal.entity.Item; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java index 48203b092..6557dde4d 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java @@ -17,7 +17,7 @@ package com.zhihu.matisse.internal.ui.adapter; import android.database.Cursor; import android.provider.MediaStore; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; public abstract class RecyclerViewCursorAdapter extends RecyclerView.Adapter { diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java index 7b8210268..b00ef7d9e 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java @@ -20,8 +20,8 @@ import android.content.res.TypedArray; import android.database.Cursor; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import androidx.annotation.NonNull; -import androidx.appcompat.widget.ListPopupWindow; +import android.support.annotation.NonNull; +import android.support.v7.widget.ListPopupWindow; import android.view.View; import android.widget.AdapterView; import android.widget.CursorAdapter; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java index f17adf9bb..dd388a882 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java @@ -3,8 +3,8 @@ package com.zhihu.matisse.internal.ui.widget; import android.content.Context; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import androidx.core.content.res.ResourcesCompat; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v4.content.res.ResourcesCompat; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; import com.yizhuan.erban.R; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckView.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckView.java index a6f781124..1ea8df3b9 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckView.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckView.java @@ -27,7 +27,7 @@ import android.graphics.Rect; import android.graphics.Shader; import android.graphics.Typeface; import android.graphics.drawable.Drawable; -import androidx.core.content.res.ResourcesCompat; +import android.support.v4.content.res.ResourcesCompat; import android.text.TextPaint; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java index 11044aab0..85449203f 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java @@ -18,9 +18,9 @@ package com.zhihu.matisse.internal.ui.widget; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.fragment.app.DialogFragment; -import androidx.appcompat.app.AlertDialog; +import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; +import android.support.v7.app.AlertDialog; import android.text.TextUtils; import com.yizhuan.erban.R; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java index 21afb86ad..6269d401d 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java @@ -17,7 +17,7 @@ package com.zhihu.matisse.internal.ui.widget; import android.content.Context; import android.graphics.drawable.Drawable; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.text.format.DateUtils; import android.util.AttributeSet; import android.view.LayoutInflater; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java index dca609c8e..eebcd429b 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java @@ -16,7 +16,7 @@ package com.zhihu.matisse.internal.ui.widget; import android.graphics.Rect; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.View; public class MediaGridInset extends RecyclerView.ItemDecoration { diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java index b3e66c31c..56fd37042 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java @@ -16,7 +16,7 @@ package com.zhihu.matisse.internal.ui.widget; import android.content.Context; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java index b1a522028..285515702 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java @@ -19,7 +19,7 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Path; import android.graphics.RectF; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; public class RoundedRectangleImageView extends AppCompatImageView { diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java b/app/src/module_album/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java index 0ab84afce..4a2b33426 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java @@ -24,9 +24,9 @@ import android.net.Uri; import android.os.Build; import android.os.Environment; import android.provider.MediaStore; -import androidx.fragment.app.Fragment; -import androidx.core.content.FileProvider; -import androidx.core.os.EnvironmentCompat; +import android.support.v4.app.Fragment; +import android.support.v4.content.FileProvider; +import android.support.v4.os.EnvironmentCompat; import com.zhihu.matisse.internal.entity.CaptureStrategy; diff --git a/app/src/module_album/java/com/zhihu/matisse/listener/OnSelectedListener.java b/app/src/module_album/java/com/zhihu/matisse/listener/OnSelectedListener.java index b7d6d2204..33e374e62 100644 --- a/app/src/module_album/java/com/zhihu/matisse/listener/OnSelectedListener.java +++ b/app/src/module_album/java/com/zhihu/matisse/listener/OnSelectedListener.java @@ -17,7 +17,7 @@ package com.zhihu.matisse.listener; import android.net.Uri; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import java.util.List; diff --git a/app/src/module_album/java/com/zhihu/matisse/ui/MatisseActivity.java b/app/src/module_album/java/com/zhihu/matisse/ui/MatisseActivity.java index 839bb813c..6c9767ab6 100644 --- a/app/src/module_album/java/com/zhihu/matisse/ui/MatisseActivity.java +++ b/app/src/module_album/java/com/zhihu/matisse/ui/MatisseActivity.java @@ -28,14 +28,14 @@ import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.app.ActivityCompat; -import androidx.fragment.app.Fragment; -import androidx.core.content.ContextCompat; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.ActivityCompat; +import android.support.v4.app.Fragment; +import android.support.v4.content.ContextCompat; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; diff --git a/app/src/module_album/java/com/zhihu/matisse/widget/ConfirmPickView.java b/app/src/module_album/java/com/zhihu/matisse/widget/ConfirmPickView.java index 775160ca3..13899044e 100644 --- a/app/src/module_album/java/com/zhihu/matisse/widget/ConfirmPickView.java +++ b/app/src/module_album/java/com/zhihu/matisse/widget/ConfirmPickView.java @@ -2,7 +2,7 @@ package com.zhihu.matisse.widget; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.AttributeSet; import android.widget.LinearLayout; import android.widget.TextView; diff --git a/app/src/module_album/res/layout/activity_matisse.xml b/app/src/module_album/res/layout/activity_matisse.xml index 0672e8b0b..e646761e1 100644 --- a/app/src/module_album/res/layout/activity_matisse.xml +++ b/app/src/module_album/res/layout/activity_matisse.xml @@ -21,7 +21,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + - - + - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_bank_card/res/layout/activity_bank_card_bind.xml b/app/src/module_bank_card/res/layout/activity_bank_card_bind.xml index b87965da8..0f8baf3ee 100644 --- a/app/src/module_bank_card/res/layout/activity_bank_card_bind.xml +++ b/app/src/module_bank_card/res/layout/activity_bank_card_bind.xml @@ -1,5 +1,5 @@ - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_bank_card/res/layout/activity_bank_card_list.xml b/app/src/module_bank_card/res/layout/activity_bank_card_list.xml index 3a211eadc..a0ccc4bcc 100644 --- a/app/src/module_bank_card/res/layout/activity_bank_card_list.xml +++ b/app/src/module_bank_card/res/layout/activity_bank_card_list.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_bank_card/res/layout/item_bank_card.xml b/app/src/module_bank_card/res/layout/item_bank_card.xml index 886e1513c..ab66caa42 100644 --- a/app/src/module_bank_card/res/layout/item_bank_card.xml +++ b/app/src/module_bank_card/res/layout/item_bank_card.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentAdapter.java index 15af048df..3fcb4bd3f 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.community.dynamic.adapter; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java index 132516acf..073dac9d4 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java @@ -4,8 +4,8 @@ package com.yizhuan.erban.community.dynamic.adapter; import android.app.Activity; import android.content.Context; import android.graphics.drawable.AnimationDrawable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.util.SparseBooleanArray; import android.util.SparseIntArray; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java index 471000db6..4d9f54cf1 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java @@ -7,11 +7,11 @@ import android.graphics.Color; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import androidx.constraintlayout.widget.ConstraintLayout; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.constraint.ConstraintLayout; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java index fbb256389..451f58e21 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.community.dynamic.view; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -12,6 +12,7 @@ import android.view.ViewGroup; import com.trello.rxlifecycle2.android.FragmentEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.UIHelper; +import com.yizhuan.erban.base.BaseFragment; import com.yizhuan.erban.base.BaseMvpFragment; import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.community.dynamic.adapter.WorldDynamicAdapter; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPagerAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPagerAdapter.java index d21c8e9dd..2200d9e55 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPagerAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPagerAdapter.java @@ -15,9 +15,9 @@ */ package com.yizhuan.erban.community.photo; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentStatePagerAdapter; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentStatePagerAdapter; import android.view.ViewGroup; import com.zhihu.matisse.internal.entity.CustomItem; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPhotoItemFragment.java b/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPhotoItemFragment.java index 2b4b12774..bc4beb287 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPhotoItemFragment.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPhotoItemFragment.java @@ -18,12 +18,14 @@ package com.yizhuan.erban.community.photo; import android.app.Activity; import android.content.Context; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; +import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.RequestOptions; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/DynamicImageAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/photo/DynamicImageAdapter.java index 5104f75db..56d16e40b 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/photo/DynamicImageAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/photo/DynamicImageAdapter.java @@ -1,8 +1,9 @@ package com.yizhuan.erban.community.photo; import android.content.Context; - -import androidx.annotation.Nullable; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.support.annotation.Nullable; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/PhotoAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/photo/PhotoAdapter.java index aa6d99a62..cb12c8279 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/photo/PhotoAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/photo/PhotoAdapter.java @@ -5,8 +5,8 @@ import android.content.Intent; import android.graphics.Bitmap; import android.net.Uri; import android.os.Environment; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.view.View; import com.bumptech.glide.request.target.SimpleTarget; @@ -14,10 +14,12 @@ import com.bumptech.glide.request.transition.Transition; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; +import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.community.widget.ZoomImageView; +import com.yizhuan.erban.ui.utils.ImageLoadUtils; import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; import com.yizhuan.erban.ui.widget.ButtonItem; import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/PreviewPhotoActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/photo/PreviewPhotoActivity.java index cfcf5d6ae..27849fedd 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/photo/PreviewPhotoActivity.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/photo/PreviewPhotoActivity.java @@ -4,10 +4,10 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.PagerSnapHelper; -import androidx.recyclerview.widget.RecyclerView; +import android.os.Parcelable; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.PagerSnapHelper; +import android.support.v7.widget.RecyclerView; import com.netease.nim.uikit.common.util.log.LogUtil; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/ImageAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/publish/ImageAdapter.java index b8a4711b5..03c77c92c 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/ImageAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/publish/ImageAdapter.java @@ -1,17 +1,23 @@ package com.yizhuan.erban.community.publish; import android.content.Context; - -import androidx.annotation.Nullable; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.support.annotation.Nullable; import android.view.ViewGroup; import android.widget.ImageView; +import com.bumptech.glide.Glide; +import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; +import com.bumptech.glide.request.RequestOptions; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; +import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; +import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; import com.yizhuan.xchat_android_core.community.bean.PublishItem; import com.yizhuan.xchat_android_library.utils.config.BasicConfig; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java index 3b8643e88..dbd837653 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.community.publish.view; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java index f979cc620..cb63b1770 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.community.publish.view; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java index c75479752..00fcbc3de 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.community.square; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java index 932ee6d19..ba656637d 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.community.square; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -12,8 +12,12 @@ import android.widget.TextView; import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; import com.yizhuan.erban.base.BaseFragment; +import com.yizhuan.erban.common.widget.DragLayout; +import com.yizhuan.erban.community.publish.view.PublishActivity; import com.yizhuan.erban.home.adapter.TopMagicIndicatorAdapter; import com.yizhuan.erban.home.fragment.FindTabFragment; +import com.yizhuan.erban.home.view.IFindTabFragmentView; +import com.yizhuan.erban.ui.indicator_impl.IndicatorHelper; import com.yizhuan.erban.ui.widget.OnPageSelectedListener; import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator; import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java index 3eef74af3..005f98ae0 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.community.user_dynamic; import android.app.Activity; import android.content.Context; import android.graphics.drawable.AnimationDrawable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.util.SparseBooleanArray; import android.util.SparseIntArray; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java index 739ca8c17..235c63405 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java @@ -1,9 +1,10 @@ package com.yizhuan.erban.community.user_dynamic; +import android.app.Activity; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java b/app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java index 673f1d278..c806e099a 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java @@ -23,12 +23,13 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.os.Build; -import androidx.annotation.DrawableRes; -import androidx.annotation.IdRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - +import android.support.annotation.DrawableRes; +import android.support.annotation.IdRes; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.util.AttributeSet; import android.util.SparseBooleanArray; import android.util.SparseIntArray; @@ -43,6 +44,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import com.netease.nim.uikit.business.session.emoji.MoonUtil; import com.yizhuan.erban.R; import com.yizhuan.xchat_android_core.statistic.StatisticManager; import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java b/app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java index 3c70a53c4..aef8280e9 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java @@ -2,10 +2,10 @@ package com.yizhuan.erban.community.widget; import android.app.Activity; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/TouchHideKeyboardView.java b/app/src/module_community/java/com/yizhuan/erban/community/widget/TouchHideKeyboardView.java index a4b3c90a5..eedd1d584 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/widget/TouchHideKeyboardView.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/widget/TouchHideKeyboardView.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.community.widget; import android.app.Activity; import android.content.Context; -import androidx.constraintlayout.widget.ConstraintLayout; +import android.support.constraint.ConstraintLayout; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/app/src/module_community/res/layout/activity_big_photo.xml b/app/src/module_community/res/layout/activity_big_photo.xml index 80cf500b9..c0acb88c1 100644 --- a/app/src/module_community/res/layout/activity_big_photo.xml +++ b/app/src/module_community/res/layout/activity_big_photo.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/activity_dynamic_detail.xml b/app/src/module_community/res/layout/activity_dynamic_detail.xml index bc9fc8d9c..deeb3fdd6 100644 --- a/app/src/module_community/res/layout/activity_dynamic_detail.xml +++ b/app/src/module_community/res/layout/activity_dynamic_detail.xml @@ -1,5 +1,5 @@ - - - + - - - + - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/activity_preview_photo.xml b/app/src/module_community/res/layout/activity_preview_photo.xml index e77eca25f..db375cf30 100644 --- a/app/src/module_community/res/layout/activity_preview_photo.xml +++ b/app/src/module_community/res/layout/activity_preview_photo.xml @@ -1,5 +1,5 @@ - - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/dialog_dy_publish_success.xml b/app/src/module_community/res/layout/dialog_dy_publish_success.xml index 25131919f..c0f765293 100644 --- a/app/src/module_community/res/layout/dialog_dy_publish_success.xml +++ b/app/src/module_community/res/layout/dialog_dy_publish_success.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/fragment_square.xml b/app/src/module_community/res/layout/fragment_square.xml index 64874d210..e1d375b6a 100644 --- a/app/src/module_community/res/layout/fragment_square.xml +++ b/app/src/module_community/res/layout/fragment_square.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/fragment_square_dynamic.xml b/app/src/module_community/res/layout/fragment_square_dynamic.xml index 9c4425da9..59b3a70f4 100644 --- a/app/src/module_community/res/layout/fragment_square_dynamic.xml +++ b/app/src/module_community/res/layout/fragment_square_dynamic.xml @@ -1,5 +1,5 @@ - @@ -7,18 +7,18 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/fragment_world_dynamic.xml b/app/src/module_community/res/layout/fragment_world_dynamic.xml index 5f5b03922..8d69629bd 100644 --- a/app/src/module_community/res/layout/fragment_world_dynamic.xml +++ b/app/src/module_community/res/layout/fragment_world_dynamic.xml @@ -1,5 +1,5 @@ - @@ -7,16 +7,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/frg_user_dynamic.xml b/app/src/module_community/res/layout/frg_user_dynamic.xml index 62c4e38ee..b0a1970e6 100644 --- a/app/src/module_community/res/layout/frg_user_dynamic.xml +++ b/app/src/module_community/res/layout/frg_user_dynamic.xml @@ -1,15 +1,15 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/frg_worlds_choose.xml b/app/src/module_community/res/layout/frg_worlds_choose.xml index 86c2d22d2..901b503fc 100644 --- a/app/src/module_community/res/layout/frg_worlds_choose.xml +++ b/app/src/module_community/res/layout/frg_worlds_choose.xml @@ -4,18 +4,18 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> - - - + - + \ No newline at end of file diff --git a/app/src/module_community/res/layout/head_dynamic_detail.xml b/app/src/module_community/res/layout/head_dynamic_detail.xml index e5b7ba67e..43a45009c 100644 --- a/app/src/module_community/res/layout/head_dynamic_detail.xml +++ b/app/src/module_community/res/layout/head_dynamic_detail.xml @@ -1,12 +1,12 @@ - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/item_community_notice_list.xml b/app/src/module_community/res/layout/item_community_notice_list.xml index 05d5b180d..5b927689e 100644 --- a/app/src/module_community/res/layout/item_community_notice_list.xml +++ b/app/src/module_community/res/layout/item_community_notice_list.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/item_dy_comment.xml b/app/src/module_community/res/layout/item_dy_comment.xml index 9e194fc1e..cca45752f 100644 --- a/app/src/module_community/res/layout/item_dy_comment.xml +++ b/app/src/module_community/res/layout/item_dy_comment.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/item_dy_reply.xml b/app/src/module_community/res/layout/item_dy_reply.xml index c583de1d9..031338443 100644 --- a/app/src/module_community/res/layout/item_dy_reply.xml +++ b/app/src/module_community/res/layout/item_dy_reply.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/item_dynamic_image.xml b/app/src/module_community/res/layout/item_dynamic_image.xml index 24214abc4..6667a034a 100644 --- a/app/src/module_community/res/layout/item_dynamic_image.xml +++ b/app/src/module_community/res/layout/item_dynamic_image.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/item_dynamic_sys.xml b/app/src/module_community/res/layout/item_dynamic_sys.xml index eab8fb80c..42af9c222 100644 --- a/app/src/module_community/res/layout/item_dynamic_sys.xml +++ b/app/src/module_community/res/layout/item_dynamic_sys.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/item_grid_image_widget.xml b/app/src/module_community/res/layout/item_grid_image_widget.xml index 6ce0b6358..c198f48a4 100644 --- a/app/src/module_community/res/layout/item_grid_image_widget.xml +++ b/app/src/module_community/res/layout/item_grid_image_widget.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/item_publish_image.xml b/app/src/module_community/res/layout/item_publish_image.xml index 5c8e26967..ba47746a1 100644 --- a/app/src/module_community/res/layout/item_publish_image.xml +++ b/app/src/module_community/res/layout/item_publish_image.xml @@ -1,5 +1,5 @@ - @@ -29,4 +29,4 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/item_square_dynamic.xml b/app/src/module_community/res/layout/item_square_dynamic.xml index 0411483cf..11fcd87b1 100644 --- a/app/src/module_community/res/layout/item_square_dynamic.xml +++ b/app/src/module_community/res/layout/item_square_dynamic.xml @@ -1,5 +1,5 @@ - - - + - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/item_user_dynamic_image.xml b/app/src/module_community/res/layout/item_user_dynamic_image.xml index ad4a0efab..d72b00e78 100644 --- a/app/src/module_community/res/layout/item_user_dynamic_image.xml +++ b/app/src/module_community/res/layout/item_user_dynamic_image.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/module_community/res/layout/item_user_dynamic_list.xml b/app/src/module_community/res/layout/item_user_dynamic_list.xml index 31a7825c4..bdd03a1ab 100644 --- a/app/src/module_community/res/layout/item_user_dynamic_list.xml +++ b/app/src/module_community/res/layout/item_user_dynamic_list.xml @@ -8,7 +8,7 @@ xmlns:tools="http://schemas.android.com/tools"> - - + - - - + diff --git a/app/src/module_community/res/layout/item_world_dynamic.xml b/app/src/module_community/res/layout/item_world_dynamic.xml index dbb7a0d8b..1348a98a5 100644 --- a/app/src/module_community/res/layout/item_world_dynamic.xml +++ b/app/src/module_community/res/layout/item_world_dynamic.xml @@ -1,12 +1,12 @@ - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/item_worlds_choose.xml b/app/src/module_community/res/layout/item_worlds_choose.xml index 216755152..29e2981b5 100644 --- a/app/src/module_community/res/layout/item_worlds_choose.xml +++ b/app/src/module_community/res/layout/item_worlds_choose.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/layout_dy_nick_detail.xml b/app/src/module_community/res/layout/layout_dy_nick_detail.xml index 6d8fdd19b..a7a667d88 100644 --- a/app/src/module_community/res/layout/layout_dy_nick_detail.xml +++ b/app/src/module_community/res/layout/layout_dy_nick_detail.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/view_holder_world_dynamic_share.xml b/app/src/module_community/res/layout/view_holder_world_dynamic_share.xml index 62f9f9f81..4959ef23b 100644 --- a/app/src/module_community/res/layout/view_holder_world_dynamic_share.xml +++ b/app/src/module_community/res/layout/view_holder_world_dynamic_share.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_community/res/layout/widget_grid_image.xml b/app/src/module_community/res/layout/widget_grid_image.xml index eb49035d7..290cc6138 100644 --- a/app/src/module_community/res/layout/widget_grid_image.xml +++ b/app/src/module_community/res/layout/widget_grid_image.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/HallDataManager.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/HallDataManager.java index 4c0e6bb1a..0fdbf065b 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/HallDataManager.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/HallDataManager.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.module_hall; -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 android.text.TextUtils; import com.netease.nim.uikit.api.NimUIKit; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminAddActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminAddActivity.java index a42bd1afc..bca233497 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminAddActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminAddActivity.java @@ -3,10 +3,10 @@ package com.yizhuan.erban.module_hall.hall.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.core.content.ContextCompat; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.content.ContextCompat; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.SpannableString; import android.text.Spanned; import android.text.style.ForegroundColorSpan; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminListActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminListActivity.java index 0ce2ec810..10e5654d9 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminListActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminListActivity.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.module_hall.hall.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AuthSettingActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AuthSettingActivity.java index d6e7d712b..726d7476a 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AuthSettingActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AuthSettingActivity.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.module_hall.hall.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.text.SpannableString; import android.text.TextUtils; import android.view.View; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/GroupMemberListActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/GroupMemberListActivity.java index 4b1c1c64b..b1bfa48a7 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/GroupMemberListActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/GroupMemberListActivity.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.module_hall.hall.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.SpannableString; import android.view.View; import android.widget.TextView; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallNameSettingActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallNameSettingActivity.java index 0e59a79c0..7e3af0440 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallNameSettingActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallNameSettingActivity.java @@ -3,10 +3,11 @@ package com.yizhuan.erban.module_hall.hall.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.core.content.ContextCompat; - +import android.support.v4.content.ContextCompat; +import android.text.InputFilter; import android.text.TextUtils; import android.view.View; +import android.widget.EditText; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseMvpActivity; @@ -15,6 +16,7 @@ import com.yizhuan.erban.common.widget.LimitEditText; import com.yizhuan.erban.module_hall.HallDataManager; import com.yizhuan.erban.module_hall.hall.presenter.HallNamePresenter; import com.yizhuan.erban.module_hall.hall.view.IHallNameView; +import com.yizhuan.erban.utils.LimitInputFliter; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import butterknife.BindView; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java index a59a1ac6c..01eb2093f 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.module_hall.hall.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentStatePagerAdapter; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentStatePagerAdapter; +import android.support.v4.view.ViewPager; import android.view.View; import android.widget.TextView; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/MemberSearchActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/MemberSearchActivity.java index 1553272fb..20ad725f2 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/MemberSearchActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/MemberSearchActivity.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.module_hall.hall.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.widget.EditText; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java index b52ce8b9c..7457ad234 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java @@ -4,10 +4,10 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.View; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/MemberViewHolder.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/MemberViewHolder.java index 8f69d5c28..b701e7830 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/MemberViewHolder.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/MemberViewHolder.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.module_hall.hall.adapter; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.view.View; import android.widget.ImageView; import android.widget.RelativeLayout; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/OptionAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/OptionAdapter.java index 7bcf33e1f..994b79c16 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/OptionAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/OptionAdapter.java @@ -1,13 +1,14 @@ package com.yizhuan.erban.module_hall.hall.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.widget.ImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; +import com.yizhuan.erban.ui.utils.ImageLoadUtils; import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/GroupMemberPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/GroupMemberPresenter.java index 1aff71deb..33191b863 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/GroupMemberPresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/GroupMemberPresenter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.module_hall.hall.presenter; import android.content.Context; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.text.SpannableString; import android.text.Spanned; import android.text.style.ForegroundColorSpan; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/HallMenuDialog.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/HallMenuDialog.java index 6cce19b1a..9645e3e3a 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/HallMenuDialog.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/HallMenuDialog.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.module_hall.hall.view.dialog; import android.app.Dialog; import android.content.Context; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerDialog.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerDialog.java index c4408de98..096b0044c 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerDialog.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerDialog.java @@ -4,9 +4,9 @@ import android.app.Activity; import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.DialogFragment; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java index aab14572a..430613c25 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.module_hall.hall.view.indicator; import android.content.Context; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java index 6908b7a73..7ac56474e 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.module_hall.im.msgholder; import android.graphics.Color; -import androidx.constraintlayout.widget.ConstraintLayout; +import android.support.constraint.ConstraintLayout; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextPaint; @@ -20,6 +20,7 @@ import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.orhanobut.logger.Logger; import com.yizhuan.erban.R; +import com.yizhuan.erban.avroom.widget.MessageView; import com.yizhuan.erban.module_hall.im.NimHelper; import com.yizhuan.erban.ui.im.RouterHandler; import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; @@ -31,6 +32,8 @@ import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; import com.yizhuan.xchat_android_core.module_hall.hall.bean.ApplyResult; import com.yizhuan.xchat_android_core.module_hall.im.bean.HallMsgComponent; import com.yizhuan.xchat_android_core.module_hall.im.bean.HallMsgLayout; +import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgComponent; +import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgLayout; import com.yizhuan.xchat_android_core.utils.net.BeanObserver; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java index c3d58c95d..92cd20877 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java @@ -1,9 +1,9 @@ package com.yizhuan.erban.module_hall.income; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java index 510fbba15..d7183eda7 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.module_hall.income; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.widget.ImageView; import android.widget.TextView; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeAdapter.java index aacd773a6..dd08e69d8 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.module_hall.income.adapter; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java index 23b22174f..9f2ccc5e0 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.module_hall.income.adapter; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; +import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import android.text.SpannableString; import android.text.style.ForegroundColorSpan; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/SecretCodeDialog.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/SecretCodeDialog.java index f131bcdc0..7e966f041 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/SecretCodeDialog.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/SecretCodeDialog.java @@ -2,20 +2,36 @@ package com.yizhuan.erban.module_hall.secretcode; import android.content.Context; import android.graphics.Color; +import android.os.Bundle; +import android.support.design.widget.BottomSheetBehavior; +import android.support.design.widget.BottomSheetDialog; +import android.text.ClipboardManager; import android.view.View; +import android.view.WindowManager; +import android.widget.FrameLayout; import android.widget.TextView; import com.coorchice.library.SuperTextView; import com.yizhuan.erban.R; import com.yizhuan.erban.UIHelper; import com.yizhuan.erban.base.BaseBsDialog; +import com.yizhuan.erban.module_hall.HallDataManager; +import com.yizhuan.erban.ui.widget.marqueeview.Utils; import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.SecretCodeInfo; +import com.yizhuan.xchat_android_core.share.ShareModel; 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.TextUtils; import butterknife.BindView; +import butterknife.ButterKnife; import butterknife.OnClick; +import cn.sharesdk.framework.Platform; +import cn.sharesdk.framework.ShareSDK; +import cn.sharesdk.tencent.qq.QQ; +import cn.sharesdk.wechat.friends.Wechat; /** * @author xiaoyu diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/ShareSecretCodeDialog.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/ShareSecretCodeDialog.java index a521c4493..3eedc0d76 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/ShareSecretCodeDialog.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/ShareSecretCodeDialog.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.module_hall.secretcode; import android.content.Context; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.view.View; import android.widget.TextView; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/HTeamDataManager.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/HTeamDataManager.java index 2b4a67d9f..dd3a7e9a5 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/HTeamDataManager.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/HTeamDataManager.java @@ -1,10 +1,11 @@ package com.yizhuan.erban.module_hall.team; -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.module_hall.hall.bean.HTeamInfo; +import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; /** * 厅群信息的管理，只针对单个群信息 diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/CreateHallTeamActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/CreateHallTeamActivity.java index 1bfefd737..483b8c396 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/CreateHallTeamActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/CreateHallTeamActivity.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.module_hall.team.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -30,6 +30,7 @@ import com.yizhuan.xchat_android_core.module_hall.team.bean.HTeamChatLimit; import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; +import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.widget.decoration.RowColumnDifItemDecoration; import java.util.ArrayList; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HTeamMemberListActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HTeamMemberListActivity.java index 7b1d94131..61bacc5e4 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HTeamMemberListActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HTeamMemberListActivity.java @@ -4,8 +4,8 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.style.ForegroundColorSpan; import android.view.View; import android.widget.TextView; @@ -30,6 +30,7 @@ import com.yizhuan.erban.team.bean.NimTeamMember; import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamMember; import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; +import com.yizhuan.xchat_android_core.module_hall.team.event.HteamInfoUpdateInfoEvent; import com.yizhuan.xchat_android_core.module_hall.team.event.HteamMemberNumChangeEvent; import com.yizhuan.xchat_android_core.utils.net.BeanObserver; @@ -43,6 +44,7 @@ import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; import io.reactivex.Single; +import io.reactivex.functions.Consumer; /** * 厅群成员列表 diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/SelectTeamMemberActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/SelectTeamMemberActivity.java index 957c55bb4..9a1bccac3 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/SelectTeamMemberActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/SelectTeamMemberActivity.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.module_hall.team.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.util.ArrayMap; import android.view.View; import android.widget.ImageView; @@ -17,6 +17,7 @@ import com.yizhuan.erban.base.list.BaseViewHolder; import com.yizhuan.erban.base.list.CommonAdapter; import com.yizhuan.erban.base.list.IRecyclerListener; import com.yizhuan.erban.base.list.LineColorDecoration; +import com.yizhuan.erban.base.list.OnItemChildClickListener; import com.yizhuan.erban.base.list.RefreshRecyclerView; import com.yizhuan.erban.module_hall.HallConstant; import com.yizhuan.erban.module_hall.HallDataManager; @@ -34,6 +35,10 @@ import java.util.Map; import butterknife.BindView; import butterknife.ButterKnife; import io.reactivex.Single; +import io.reactivex.SingleSource; +import io.reactivex.functions.Action; +import io.reactivex.functions.Consumer; +import io.reactivex.functions.Function; /** * 选择群成员 diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamInfoShowActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamInfoShowActivity.java index 8b2f0e3c3..9886e8cae 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamInfoShowActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamInfoShowActivity.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.module_hall.team.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; @@ -34,6 +34,7 @@ import com.yizhuan.xchat_android_core.module_hall.team.bean.HTeamType; import com.yizhuan.xchat_android_core.module_hall.team.event.HteamInfoUpdateInfoEvent; import com.yizhuan.xchat_android_core.utils.net.BeanObserver; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; +import com.yizhuan.xchat_android_library.widget.IOSSwitchView; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_labour_union/res/layout/activity_add_member.xml b/app/src/module_labour_union/res/layout/activity_add_member.xml index b6f2709f9..4f82ab6a7 100644 --- a/app/src/module_labour_union/res/layout/activity_add_member.xml +++ b/app/src/module_labour_union/res/layout/activity_add_member.xml @@ -64,12 +64,12 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - + diff --git a/app/src/module_labour_union/res/layout/activity_admin_list.xml b/app/src/module_labour_union/res/layout/activity_admin_list.xml index 7c43acea9..921a81f30 100644 --- a/app/src/module_labour_union/res/layout/activity_admin_list.xml +++ b/app/src/module_labour_union/res/layout/activity_admin_list.xml @@ -17,17 +17,17 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + diff --git a/app/src/module_labour_union/res/layout/activity_create_hall_team.xml b/app/src/module_labour_union/res/layout/activity_create_hall_team.xml index 5f445047b..f42ed9abd 100644 --- a/app/src/module_labour_union/res/layout/activity_create_hall_team.xml +++ b/app/src/module_labour_union/res/layout/activity_create_hall_team.xml @@ -1,5 +1,5 @@ - - - + diff --git a/app/src/module_labour_union/res/layout/activity_group_member.xml b/app/src/module_labour_union/res/layout/activity_group_member.xml index c488f9f71..4f7106080 100644 --- a/app/src/module_labour_union/res/layout/activity_group_member.xml +++ b/app/src/module_labour_union/res/layout/activity_group_member.xml @@ -30,17 +30,17 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + diff --git a/app/src/module_labour_union/res/layout/activity_hall_name.xml b/app/src/module_labour_union/res/layout/activity_hall_name.xml index 149797df1..18229a412 100644 --- a/app/src/module_labour_union/res/layout/activity_hall_name.xml +++ b/app/src/module_labour_union/res/layout/activity_hall_name.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/activity_hall_team_message.xml b/app/src/module_labour_union/res/layout/activity_hall_team_message.xml index b192420da..b842e270e 100644 --- a/app/src/module_labour_union/res/layout/activity_hall_team_message.xml +++ b/app/src/module_labour_union/res/layout/activity_hall_team_message.xml @@ -24,7 +24,7 @@ android:layout_width="48dp" android:layout_height="48dp" /> - - - - + + - - + \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/activity_module_hall.xml b/app/src/module_labour_union/res/layout/activity_module_hall.xml index f541f07a3..e4a62bb2c 100644 --- a/app/src/module_labour_union/res/layout/activity_module_hall.xml +++ b/app/src/module_labour_union/res/layout/activity_module_hall.xml @@ -1,5 +1,5 @@ - - - - - + - + - + diff --git a/app/src/module_labour_union/res/layout/activity_team_edit.xml b/app/src/module_labour_union/res/layout/activity_team_edit.xml index 915b56c03..488800095 100644 --- a/app/src/module_labour_union/res/layout/activity_team_edit.xml +++ b/app/src/module_labour_union/res/layout/activity_team_edit.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/fragment_week_income.xml b/app/src/module_labour_union/res/layout/fragment_week_income.xml index 77d9ef65f..ae843ab71 100644 --- a/app/src/module_labour_union/res/layout/fragment_week_income.xml +++ b/app/src/module_labour_union/res/layout/fragment_week_income.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/item_group_list.xml b/app/src/module_labour_union/res/layout/item_group_list.xml index 153413872..f6685ef9e 100644 --- a/app/src/module_labour_union/res/layout/item_group_list.xml +++ b/app/src/module_labour_union/res/layout/item_group_list.xml @@ -1,5 +1,5 @@ - @@ -50,4 +50,4 @@ android:layout_height="1px" android:background="@color/color_F8F8F8" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/item_hteam_member_common.xml b/app/src/module_labour_union/res/layout/item_hteam_member_common.xml index 659bb0e2b..a772d67bf 100644 --- a/app/src/module_labour_union/res/layout/item_hteam_member_common.xml +++ b/app/src/module_labour_union/res/layout/item_hteam_member_common.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/item_member.xml b/app/src/module_labour_union/res/layout/item_member.xml index 5a3ac1e08..4c41e5fff 100644 --- a/app/src/module_labour_union/res/layout/item_member.xml +++ b/app/src/module_labour_union/res/layout/item_member.xml @@ -55,7 +55,7 @@ android:layout_marginStart="3dp" android:src="@drawable/ic_female" /> - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/list_item_common_group_member.xml b/app/src/module_labour_union/res/layout/list_item_common_group_member.xml index 3dccadb8f..f172ab438 100644 --- a/app/src/module_labour_union/res/layout/list_item_common_group_member.xml +++ b/app/src/module_labour_union/res/layout/list_item_common_group_member.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_lottery_dialog/java/com/yizhuan/erban/ui/widget/lottery_dialog/LotteryDialog.java b/app/src/module_lottery_dialog/java/com/yizhuan/erban/ui/widget/lottery_dialog/LotteryDialog.java index ce1c748a0..63c9c2e4d 100644 --- a/app/src/module_lottery_dialog/java/com/yizhuan/erban/ui/widget/lottery_dialog/LotteryDialog.java +++ b/app/src/module_lottery_dialog/java/com/yizhuan/erban/ui/widget/lottery_dialog/LotteryDialog.java @@ -4,7 +4,7 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import androidx.appcompat.app.AppCompatDialog; +import android.support.v7.app.AppCompatDialog; import android.view.View; import android.view.Window; import android.widget.ImageView; diff --git a/app/src/module_lottery_dialog/res/layout/lottery_dialog.xml b/app/src/module_lottery_dialog/res/layout/lottery_dialog.xml index 62c104dba..e04f0b648 100644 --- a/app/src/module_lottery_dialog/res/layout/lottery_dialog.xml +++ b/app/src/module_lottery_dialog/res/layout/lottery_dialog.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/activity/MentoringRelationshipActivity.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/activity/MentoringRelationshipActivity.java index ab95d7a92..ae2c4ec40 100644 --- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/activity/MentoringRelationshipActivity.java +++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/activity/MentoringRelationshipActivity.java @@ -3,9 +3,9 @@ package com.yizhuan.tutu.mentoring_relationship.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.OrientationHelper; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.OrientationHelper; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.widget.TextView; diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java index 9eac13119..8b78e0622 100644 --- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java +++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java @@ -3,10 +3,10 @@ package com.yizhuan.tutu.mentoring_relationship.dialog; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.FragmentManager; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.DialogFragment; +import android.support.v4.app.FragmentManager; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java index 3e4c8a04e..beab56f9d 100644 --- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java +++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java @@ -5,11 +5,11 @@ import android.app.Dialog; import android.content.Intent; import android.os.Build; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.constraintlayout.widget.ConstraintLayout; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.FragmentManager; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.constraint.ConstraintLayout; +import android.support.v4.app.DialogFragment; +import android.support.v4.app.FragmentManager; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java index 64bc4d188..8a4c37eaa 100644 --- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java +++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java @@ -3,10 +3,10 @@ package com.yizhuan.tutu.mentoring_relationship.dialog; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.FragmentManager; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.DialogFragment; +import android.support.v4.app.FragmentManager; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionFourViewHolder.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionFourViewHolder.java index f110cceee..d78edac8e 100644 --- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionFourViewHolder.java +++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionFourViewHolder.java @@ -1,6 +1,6 @@ package com.yizhuan.tutu.mentoring_relationship.viewholder; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.View; import android.widget.TextView; diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionTwoViewHolder.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionTwoViewHolder.java index 9eb482fb3..72fdfdf63 100644 --- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionTwoViewHolder.java +++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionTwoViewHolder.java @@ -1,7 +1,7 @@ package com.yizhuan.tutu.mentoring_relationship.viewholder; import android.annotation.SuppressLint; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/MasterMissionThreeViewHolder.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/MasterMissionThreeViewHolder.java index 7401b0d2f..cef4bf364 100644 --- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/MasterMissionThreeViewHolder.java +++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/MasterMissionThreeViewHolder.java @@ -1,11 +1,12 @@ package com.yizhuan.tutu.mentoring_relationship.viewholder; import android.annotation.SuppressLint; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; import android.widget.TextView; +import android.widget.Toast; import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; diff --git a/app/src/module_mentoring_relationship/res/layout/activity_mentoring_relatinship.xml b/app/src/module_mentoring_relationship/res/layout/activity_mentoring_relatinship.xml index 821196c86..cfa31de87 100644 --- a/app/src/module_mentoring_relationship/res/layout/activity_mentoring_relatinship.xml +++ b/app/src/module_mentoring_relationship/res/layout/activity_mentoring_relatinship.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + - - + - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mentoring_relationship/res/layout/dialog_grab_apprentices_notify.xml b/app/src/module_mentoring_relationship/res/layout/dialog_grab_apprentices_notify.xml index 0f683c028..5b4ca8103 100644 --- a/app/src/module_mentoring_relationship/res/layout/dialog_grab_apprentices_notify.xml +++ b/app/src/module_mentoring_relationship/res/layout/dialog_grab_apprentices_notify.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mentoring_relationship/res/layout/item_grab_apprentice.xml b/app/src/module_mentoring_relationship/res/layout/item_grab_apprentice.xml index d017cf2dc..674c471e9 100644 --- a/app/src/module_mentoring_relationship/res/layout/item_grab_apprentice.xml +++ b/app/src/module_mentoring_relationship/res/layout/item_grab_apprentice.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mentoring_relationship/res/layout/item_mission_content.xml b/app/src/module_mentoring_relationship/res/layout/item_mission_content.xml index 08e1cfa8c..2b1b64230 100644 --- a/app/src/module_mentoring_relationship/res/layout/item_mission_content.xml +++ b/app/src/module_mentoring_relationship/res/layout/item_mission_content.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mentoring_relationship/res/layout/item_my_master_and_apprentices.xml b/app/src/module_mentoring_relationship/res/layout/item_my_master_and_apprentices.xml index 5f3360767..3cabe4929 100644 --- a/app/src/module_mentoring_relationship/res/layout/item_my_master_and_apprentices.xml +++ b/app/src/module_mentoring_relationship/res/layout/item_my_master_and_apprentices.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mentoring_relationship/res/layout/room_mentoring_count_down_timer_view_stub_layout.xml b/app/src/module_mentoring_relationship/res/layout/room_mentoring_count_down_timer_view_stub_layout.xml index cd46e7b46..019fa1e06 100644 --- a/app/src/module_mentoring_relationship/res/layout/room_mentoring_count_down_timer_view_stub_layout.xml +++ b/app/src/module_mentoring_relationship/res/layout/room_mentoring_count_down_timer_view_stub_layout.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_four.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_four.xml index 0f7775f77..1a923b69f 100644 --- a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_four.xml +++ b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_four.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_one.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_one.xml index 258f29e08..a722c2c25 100644 --- a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_one.xml +++ b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_one.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_three.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_three.xml index 7cd0d8726..10daf0872 100644 --- a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_three.xml +++ b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_three.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_two.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_two.xml index 61f016521..113de0f5a 100644 --- a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_two.xml +++ b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_two.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_four.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_four.xml index 273f0a4c1..b3669407d 100644 --- a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_four.xml +++ b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_four.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_one.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_one.xml index b5e4adcc6..565dce8d7 100644 --- a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_one.xml +++ b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_one.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_three.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_three.xml index c95062279..aacda69a3 100644 --- a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_three.xml +++ b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_three.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_two.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_two.xml index c6911d49a..1da750dcd 100644 --- a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_two.xml +++ b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_two.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_mentoring_sharing_room.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_mentoring_sharing_room.xml index d26b5a56d..470061886 100644 --- a/app/src/module_mentoring_relationship/res/layout/view_holder_mentoring_sharing_room.xml +++ b/app/src/module_mentoring_relationship/res/layout/view_holder_mentoring_sharing_room.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java index a169297f9..25ff7cfb3 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java @@ -4,12 +4,12 @@ import android.app.Activity; import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.appcompat.app.AppCompatDialogFragment; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.app.AppCompatDialogFragment; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java index a3caddfe5..be16814dc 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.miniworld.activity; import android.content.Context; import android.content.Intent; import android.graphics.Color; -import androidx.fragment.app.Fragment; -import androidx.core.content.ContextCompat; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.app.Fragment; +import android.support.v4.content.ContextCompat; +import android.support.v4.view.ViewPager; import android.os.Bundle; import android.view.View; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java index 0dab1b365..6b70c4d2e 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java @@ -4,7 +4,7 @@ import android.Manifest; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import androidx.constraintlayout.widget.ConstraintLayout; +import android.support.constraint.ConstraintLayout; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java index be5f76383..656ab7530 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java @@ -4,15 +4,16 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.graphics.Typeface; +import android.graphics.drawable.Drawable; import android.os.Bundle; -import androidx.annotation.NonNull; -import com.google.android.material.appbar.AppBarLayout; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentPagerAdapter; -import androidx.core.content.ContextCompat; -import androidx.viewpager.widget.ViewPager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.design.widget.AppBarLayout; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentPagerAdapter; +import android.support.v4.content.ContextCompat; +import android.support.v4.view.ViewPager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.SpannableString; import android.text.SpannableStringBuilder; import android.text.Spanned; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java index dbaf27705..bb85452e5 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java @@ -7,9 +7,9 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java index e7879cb19..62d174a07 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java @@ -3,9 +3,9 @@ package com.yizhuan.erban.miniworld.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java index 14edd7981..426fb9f8b 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java @@ -5,9 +5,9 @@ import android.content.Intent; import android.graphics.Color; import android.graphics.Rect; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -17,6 +17,7 @@ import android.view.inputmethod.EditorInfo; import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; +import android.widget.Toast; import com.chad.library.adapter.base.BaseQuickAdapter; import com.yizhuan.erban.R; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java index 18eb31ca5..eabf693e8 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.miniworld.adapter; import android.content.Context; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.widget.ImageView; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java index 5cd9ab17d..3cc9a69e9 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.miniworld.adapter; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java index 8a6575461..1145a90e2 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.miniworld.adapter; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.widget.ImageView; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java index e4b43f2cc..c979a2f5b 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.miniworld.adapter; -import androidx.recyclerview.widget.GridLayoutManager; +import android.support.v7.widget.GridLayoutManager; import android.text.TextUtils; import android.widget.ImageView; import android.widget.TextView; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java index bbab2b656..747250de8 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java @@ -4,8 +4,8 @@ package com.yizhuan.erban.miniworld.adapter; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.Drawable; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; +import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java index 506c8c326..3283a150a 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java @@ -4,10 +4,10 @@ package com.yizhuan.erban.miniworld.fragment; import android.app.Activity; import android.graphics.Rect; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldNoticeFrg.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldNoticeFrg.java index 2adaa2cc5..0dea11d30 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldNoticeFrg.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldNoticeFrg.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.miniworld.fragment; import android.graphics.drawable.Drawable; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.view.View; import android.widget.ScrollView; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java index 1a0b92561..77d33e6eb 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.miniworld.view; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.yizhuan.erban.miniworld.viewmodel.MiniWorldDetailInfoVM; import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java index 3e227eed4..3efebeaf1 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.miniworld.widget; import android.content.Context; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java index 9fcb1dfd3..ecbc33462 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java @@ -3,12 +3,12 @@ package com.yizhuan.erban.miniworld.widget; import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.android.material.bottomsheet.BottomSheetDialogFragment; -import androidx.fragment.app.DialogFragment; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.design.widget.BottomSheetDialogFragment; +import android.support.v4.app.DialogFragment; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/module_mini_world/res/layout/activity_mini_world.xml b/app/src/module_mini_world/res/layout/activity_mini_world.xml index 9c16e0372..e434983c4 100644 --- a/app/src/module_mini_world/res/layout/activity_mini_world.xml +++ b/app/src/module_mini_world/res/layout/activity_mini_world.xml @@ -24,7 +24,7 @@ android:layout_height="48dp" android:background="@color/white" /> - - @@ -183,7 +183,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/etv_world_edit_notice" /> - - + - + diff --git a/app/src/module_mini_world/res/layout/activity_mini_world_guest_page.xml b/app/src/module_mini_world/res/layout/activity_mini_world_guest_page.xml index ea94364a8..de50e6d75 100644 --- a/app/src/module_mini_world/res/layout/activity_mini_world_guest_page.xml +++ b/app/src/module_mini_world/res/layout/activity_mini_world_guest_page.xml @@ -1,5 +1,5 @@ - - - - - - - + - + - + - - - + - + - + diff --git a/app/src/module_mini_world/res/layout/activity_mini_world_main.xml b/app/src/module_mini_world/res/layout/activity_mini_world_main.xml index 259f9c7b4..6ee996715 100644 --- a/app/src/module_mini_world/res/layout/activity_mini_world_main.xml +++ b/app/src/module_mini_world/res/layout/activity_mini_world_main.xml @@ -68,7 +68,7 @@ - @@ -77,13 +77,13 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - + - + diff --git a/app/src/module_mini_world/res/layout/activity_mini_world_member_list.xml b/app/src/module_mini_world/res/layout/activity_mini_world_member_list.xml index b8f7cf3c8..5657786f6 100644 --- a/app/src/module_mini_world/res/layout/activity_mini_world_member_list.xml +++ b/app/src/module_mini_world/res/layout/activity_mini_world_member_list.xml @@ -71,17 +71,17 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + diff --git a/app/src/module_mini_world/res/layout/activity_mini_world_search.xml b/app/src/module_mini_world/res/layout/activity_mini_world_search.xml index f56327dd7..21be9ee4d 100644 --- a/app/src/module_mini_world/res/layout/activity_mini_world_search.xml +++ b/app/src/module_mini_world/res/layout/activity_mini_world_search.xml @@ -84,17 +84,17 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - - + + diff --git a/app/src/module_mini_world/res/layout/dialog_audio_party.xml b/app/src/module_mini_world/res/layout/dialog_audio_party.xml index d84ce4ae3..aedc45467 100644 --- a/app/src/module_mini_world/res/layout/dialog_audio_party.xml +++ b/app/src/module_mini_world/res/layout/dialog_audio_party.xml @@ -31,19 +31,19 @@ android:layout_height="1px" android:background="@color/color_f0f0f0"/> - - - + - - - + - - + - - - + diff --git a/app/src/module_mini_world/res/layout/frg_mini_world_notice.xml b/app/src/module_mini_world/res/layout/frg_mini_world_notice.xml index bc96e3f71..0dfedaae6 100644 --- a/app/src/module_mini_world/res/layout/frg_mini_world_notice.xml +++ b/app/src/module_mini_world/res/layout/frg_mini_world_notice.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - + - + diff --git a/app/src/module_mini_world/res/layout/item_guest_audio_party.xml b/app/src/module_mini_world/res/layout/item_guest_audio_party.xml index a6ffd0cb6..bce391873 100644 --- a/app/src/module_mini_world/res/layout/item_guest_audio_party.xml +++ b/app/src/module_mini_world/res/layout/item_guest_audio_party.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mini_world/res/layout/item_mini_world_list.xml b/app/src/module_mini_world/res/layout/item_mini_world_list.xml index 826a81062..7e59df375 100644 --- a/app/src/module_mini_world/res/layout/item_mini_world_list.xml +++ b/app/src/module_mini_world/res/layout/item_mini_world_list.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mini_world/res/layout/item_mini_world_main_find.xml b/app/src/module_mini_world/res/layout/item_mini_world_main_find.xml index 8a026bbce..468f02c58 100644 --- a/app/src/module_mini_world/res/layout/item_mini_world_main_find.xml +++ b/app/src/module_mini_world/res/layout/item_mini_world_main_find.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mini_world/res/layout/item_mini_world_main_item.xml b/app/src/module_mini_world/res/layout/item_mini_world_main_item.xml index 61efe6fa5..1dd90a6c0 100644 --- a/app/src/module_mini_world/res/layout/item_mini_world_main_item.xml +++ b/app/src/module_mini_world/res/layout/item_mini_world_main_item.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/module_mini_world/res/layout/item_mini_world_main_placeholder.xml b/app/src/module_mini_world/res/layout/item_mini_world_main_placeholder.xml index 8d2e7f0c8..0ff1336d7 100644 --- a/app/src/module_mini_world/res/layout/item_mini_world_main_placeholder.xml +++ b/app/src/module_mini_world/res/layout/item_mini_world_main_placeholder.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mini_world/res/layout/item_mini_world_member_list.xml b/app/src/module_mini_world/res/layout/item_mini_world_member_list.xml index a436dbc2e..03f5108f7 100644 --- a/app/src/module_mini_world/res/layout/item_mini_world_member_list.xml +++ b/app/src/module_mini_world/res/layout/item_mini_world_member_list.xml @@ -89,7 +89,7 @@ android:gravity="center_vertical|start" android:orientation="horizontal"> - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mini_world/res/layout/menu_mini_world_guest_page.xml b/app/src/module_mini_world/res/layout/menu_mini_world_guest_page.xml index 61a4490a4..d8fb3247f 100644 --- a/app/src/module_mini_world/res/layout/menu_mini_world_guest_page.xml +++ b/app/src/module_mini_world/res/layout/menu_mini_world_guest_page.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml b/app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml index 9c2329919..7a3f1cf5e 100644 --- a/app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml +++ b/app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml @@ -27,7 +27,7 @@ android:layout_centerInParent="true" tools:src="@drawable/default_user_head" /> - - - - - - + - diff --git a/app/src/module_music/res/layout/fragment_music_list.xml b/app/src/module_music/res/layout/fragment_music_list.xml index ca46e276f..8cb834d63 100644 --- a/app/src/module_music/res/layout/fragment_music_list.xml +++ b/app/src/module_music/res/layout/fragment_music_list.xml @@ -114,7 +114,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - diff --git a/app/src/module_music/res/layout/fragment_share_music_list.xml b/app/src/module_music/res/layout/fragment_share_music_list.xml index ed9f06908..5907dc109 100644 --- a/app/src/module_music/res/layout/fragment_share_music_list.xml +++ b/app/src/module_music/res/layout/fragment_share_music_list.xml @@ -79,7 +79,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - { diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java index 803636c69..68637d481 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.public_chat_hall.adapter; import android.app.Activity; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.text.TextUtils; import android.view.View; import android.widget.CheckBox; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallMsgAdapter.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallMsgAdapter.java index a2510a7ea..405e10d3f 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallMsgAdapter.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallMsgAdapter.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.public_chat_hall.adapter; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.netease.nim.uikit.business.session.module.Container; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallAttentionFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallAttentionFragment.java index 1588a4e74..40bb31aed 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallAttentionFragment.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallAttentionFragment.java @@ -1,11 +1,11 @@ package com.yizhuan.erban.public_chat_hall.fragment; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.util.Log; import android.widget.CheckBox; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFansListFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFansListFragment.java index 2c5154049..827dd6508 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFansListFragment.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFansListFragment.java @@ -2,11 +2,11 @@ package com.yizhuan.erban.public_chat_hall.fragment; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.util.Log; import android.widget.CheckBox; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFriendListFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFriendListFragment.java index c3c715987..929c005bd 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFriendListFragment.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFriendListFragment.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.public_chat_hall.fragment; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseFragment; @@ -23,7 +23,10 @@ import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; +import java.util.Set; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java index 1b28b1074..4a8ea7bd1 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java @@ -1,16 +1,18 @@ package com.yizhuan.erban.public_chat_hall.fragment; import android.annotation.SuppressLint; +import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; +import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Toast; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.api.model.chatroom.ChatRoomSessionCustomization; @@ -19,6 +21,7 @@ import com.netease.nim.uikit.business.ait.event.AitContactAddEvent; import com.netease.nim.uikit.business.ait.event.AitContactDeleteEvent; import com.netease.nim.uikit.business.chatroom.helper.ChatRoomHelper; import com.netease.nim.uikit.business.session.actions.BaseAction; +import com.netease.nim.uikit.business.session.event.MessageEvent; import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper; import com.netease.nim.uikit.business.session.module.Container; import com.netease.nim.uikit.business.session.module.ModuleProxy; @@ -28,6 +31,7 @@ import com.netease.nim.uikit.impl.NimUIKitImpl; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.NIMSDK; import com.netease.nimlib.sdk.RequestCallbackWrapper; +import com.netease.nimlib.sdk.ResponseCode; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.MessageBuilder; @@ -51,6 +55,7 @@ import com.yizhuan.erban.public_chat_hall.utils.RemainCountManager; import com.yizhuan.erban.public_chat_hall.widget.PublicChatHallGiftAnimationDialog; import com.yizhuan.erban.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper; import com.yizhuan.erban.ui.login.BinderPhoneActivity; +import com.yizhuan.erban.ui.pay.ChargeActivity; import com.yizhuan.erban.ui.widget.GiftDialog; import com.yizhuan.erban.ui.widget.UserInfoDialog; import com.yizhuan.erban.ui.widget.dialog.OpenNobleDialog; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java index 1fd92cd2f..05171a7d8 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java @@ -1,11 +1,11 @@ package com.yizhuan.erban.public_chat_hall.fragment; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyMessageFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyMessageFragment.java index 31b3f2927..01d8483c3 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyMessageFragment.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyMessageFragment.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.public_chat_hall.fragment; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; import com.flyco.tablayout.listener.OnTabSelectListener; import com.yizhuan.erban.R; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallMessageListPanel.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallMessageListPanel.java index 2b86fad49..9382040d7 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallMessageListPanel.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallMessageListPanel.java @@ -6,8 +6,8 @@ import android.content.Intent; import android.net.Uri; import android.os.CountDownTimer; import android.os.Handler; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; @@ -16,6 +16,7 @@ import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.business.preference.UserPreferences; import com.netease.nim.uikit.business.robot.parser.elements.group.LinkElement; import com.netease.nim.uikit.business.session.audio.MessageAudioControl; +import com.netease.nim.uikit.business.session.event.MessageEvent; import com.netease.nim.uikit.business.session.module.Container; import com.netease.nim.uikit.business.session.viewholder.robot.RobotLinkView; import com.netease.nim.uikit.common.ui.dialog.EasyAlertDialog; @@ -54,6 +55,8 @@ import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDat import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import org.greenrobot.eventbus.EventBus; + import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseFetchLoadAdapter.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseFetchLoadAdapter.java index 5e892d9de..0e84f7d07 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseFetchLoadAdapter.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseFetchLoadAdapter.java @@ -2,11 +2,11 @@ package com.yizhuan.erban.public_chat_hall.msg; import android.animation.Animator; import android.content.Context; -import androidx.annotation.IntDef; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.StaggeredGridLayoutManager; +import android.support.annotation.IntDef; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.StaggeredGridLayoutManager; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseMultiItemFetchLoadAdapter.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseMultiItemFetchLoadAdapter.java index 494d212ce..d7ff89b23 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseMultiItemFetchLoadAdapter.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseMultiItemFetchLoadAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.public_chat_hall.msg; -import androidx.annotation.LayoutRes; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.LayoutRes; +import android.support.v7.widget.RecyclerView; import android.util.SparseArray; import android.view.ViewGroup; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseViewHolder.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseViewHolder.java index db7acc1b8..5299f44c1 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseViewHolder.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseViewHolder.java @@ -6,9 +6,9 @@ import android.graphics.Paint; import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Build; -import androidx.annotation.DrawableRes; -import androidx.annotation.StringRes; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.DrawableRes; +import android.support.annotation.StringRes; +import android.support.v7.widget.RecyclerView; import android.text.util.Linkify; import android.util.SparseArray; import android.view.View; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/IncomingMsgPrompt.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/IncomingMsgPrompt.java index 4e93f8581..a16cf4d97 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/IncomingMsgPrompt.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/IncomingMsgPrompt.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.public_chat_hall.msg; import android.content.Context; import android.os.Handler; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.text.style.ImageSpan; import android.view.View; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/LoadMoreView.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/LoadMoreView.java index cc6a4b56b..8f03035af 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/LoadMoreView.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/LoadMoreView.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.public_chat_hall.msg; -import androidx.annotation.IdRes; -import androidx.annotation.LayoutRes; +import android.support.annotation.IdRes; +import android.support.annotation.LayoutRes; public abstract class LoadMoreView { diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/RecyclerViewHolder.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/RecyclerViewHolder.java index 1bd896ea2..06195d563 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/RecyclerViewHolder.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/RecyclerViewHolder.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.public_chat_hall.msg; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; /** * Created by huangjun on 2016/12/11. diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/SimpleClickListener.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/SimpleClickListener.java index 539a3557b..627e082e3 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/SimpleClickListener.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/SimpleClickListener.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.public_chat_hall.msg; import android.os.Build; -import androidx.core.view.GestureDetectorCompat; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.view.GestureDetectorCompat; +import android.support.v7.widget.RecyclerView; import android.view.GestureDetector; import android.view.HapticFeedbackConstants; import android.view.MotionEvent; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java index e1a7e26fe..6b47c4b36 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.public_chat_hall.msg.viewholder; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.method.LinkMovementMethod; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGame.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGame.java index 8f006bc1e..742a46d36 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGame.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGame.java @@ -1,15 +1,23 @@ package com.yizhuan.erban.public_chat_hall.msg.viewholder; import android.annotation.SuppressLint; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; import android.view.Gravity; import android.view.View; import android.widget.LinearLayout; +import com.alibaba.fastjson.JSONObject; +import com.google.gson.Gson; +import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; +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; +import com.netease.nimlib.sdk.msg.MessageBuilder; import com.netease.nimlib.sdk.msg.MsgService; +import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; +import com.netease.nimlib.sdk.msg.model.CustomNotification; +import com.netease.nimlib.sdk.msg.model.IMMessage; import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.game.PlayGameActivity; import com.yizhuan.erban.common.widget.dialog.DialogManager; @@ -20,11 +28,13 @@ 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.GameRespondAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.ImGameAttachment; +import com.yizhuan.xchat_android_core.im.custom.bean.ImTipAttachment; import com.yizhuan.xchat_android_core.im.game.ImGameInfo; import com.yizhuan.xchat_android_core.im.game.ImGameMode; import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel; import com.yizhuan.xchat_android_core.room.game.CancelGameEvent; +import com.yizhuan.xchat_android_core.room.game.GameModel; import com.yizhuan.xchat_android_core.room.game.GameUrlInfo; import com.yizhuan.xchat_android_core.statistic.StatisticManager; import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; @@ -35,6 +45,8 @@ import com.yizhuan.xchat_android_library.rxbus.RxBus; import com.yizhuan.xchat_android_library.utils.JavaUtil; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import io.reactivex.functions.Consumer; + public class ChatRoomMsgViewHolderGame extends ChatRoomMsgViewHolderBase { private ItemImGameBinding mBinding; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java index d167f86c7..7185fcf1e 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.public_chat_hall.msg.viewholder; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.widget.ImageView; import android.widget.TextView; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderText.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderText.java index 4d958b165..dc40b544e 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderText.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderText.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.public_chat_hall.msg.viewholder; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.text.method.LinkMovementMethod; import android.text.style.ImageSpan; import android.widget.TextView; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java index 51e42b038..8b4782512 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java @@ -1,7 +1,8 @@ package com.yizhuan.erban.public_chat_hall.msg.viewholder; -import androidx.databinding.DataBindingUtil; +import android.databinding.DataBindingUtil; +import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.yizhuan.erban.R; import com.yizhuan.erban.databinding.ItemImTipsBinding; import com.yizhuan.erban.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java index 9de40a321..8a83aa741 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.public_chat_hall.msg.viewholder; -import androidx.core.content.ContextCompat; +import android.support.v4.content.ContextCompat; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; diff --git a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml index 4d3dfefc7..4b78d8c18 100644 --- a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml +++ b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml @@ -16,7 +16,7 @@ android:fitsSystemWindows="true" android:orientation="vertical"> - - + - diff --git a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_ait_friends.xml b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_ait_friends.xml index 15a2f6941..ede4cba42 100644 --- a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_ait_friends.xml +++ b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_ait_friends.xml @@ -58,7 +58,7 @@ app:tl_textUnselectColor="@color/text_tertiary" app:tl_textsize="@dimen/dp_16" /> - - - + - diff --git a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_search_friends.xml b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_search_friends.xml index 64ee8096c..1a21f4cf1 100644 --- a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_search_friends.xml +++ b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_search_friends.xml @@ -90,12 +90,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - + \ No newline at end of file diff --git a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_attention.xml b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_attention.xml index 11e56af31..c9bc70565 100644 --- a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_attention.xml +++ b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_attention.xml @@ -3,18 +3,18 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + \ No newline at end of file diff --git a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message.xml b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message.xml index bc754760a..06636a522 100644 --- a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message.xml +++ b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message.xml @@ -28,7 +28,7 @@ android:layout_height="match_parent" android:layout_above="@id/messageActivityBottomLayout"> - - - - + diff --git a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_my_mesage.xml b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_my_mesage.xml index bbc7e967a..95fba8358 100644 --- a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_my_mesage.xml +++ b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_my_mesage.xml @@ -36,7 +36,7 @@ app:tl_textsize="@dimen/dp_14" /> - diff --git a/app/src/module_public_chat_hall/res/layout/item_im_game.xml b/app/src/module_public_chat_hall/res/layout/item_im_game.xml index 91a354615..5f8ccd0e6 100644 --- a/app/src/module_public_chat_hall/res/layout/item_im_game.xml +++ b/app/src/module_public_chat_hall/res/layout/item_im_game.xml @@ -9,7 +9,7 @@ type="com.yizhuan.xchat_android_core.room.game.GameInfo" /> - - + \ No newline at end of file diff --git a/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_attention_list.xml b/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_attention_list.xml index ec4d81241..17be04dcc 100644 --- a/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_attention_list.xml +++ b/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_attention_list.xml @@ -61,7 +61,7 @@ android:textSize="15sp" tools:text="我的" /> - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomMsgActivity.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomMsgActivity.java index 5977623a1..e052a3da6 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomMsgActivity.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomMsgActivity.java @@ -4,8 +4,8 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; import android.text.TextUtils; import com.flyco.tablayout.SlidingTabLayout; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgRecentContactAdapter.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgRecentContactAdapter.java index e8e9717d8..d2e538782 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgRecentContactAdapter.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgRecentContactAdapter.java @@ -1,6 +1,6 @@ package com.yizhuan.tutu.room_chat.adapter; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import com.netease.nim.uikit.business.recent.RecentContactsCallback; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemQuickAdapter; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgAttentionFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgAttentionFragment.java index b78e56705..51c30f98e 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgAttentionFragment.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgAttentionFragment.java @@ -1,10 +1,10 @@ package com.yizhuan.tutu.room_chat.fragment; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.yizhuan.erban.R; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java index 2e2a5cbf7..1dd9c0a8a 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java @@ -3,10 +3,10 @@ package com.yizhuan.tutu.room_chat.fragment; import android.annotation.SuppressLint; import android.content.Context; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.yizhuan.erban.R; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFriendListFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFriendListFragment.java index 1b02ea9c2..527ed2283 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFriendListFragment.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFriendListFragment.java @@ -1,10 +1,10 @@ package com.yizhuan.tutu.room_chat.fragment; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.orhanobut.logger.Logger; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentContactsFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentContactsFragment.java index 3d80c6277..55dcfd679 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentContactsFragment.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentContactsFragment.java @@ -1,14 +1,15 @@ package com.yizhuan.tutu.room_chat.fragment; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.Nullable; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import android.widget.Toast; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.api.model.contact.ContactChangedObserver; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java index d65dee3d8..e296d5691 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java @@ -1,9 +1,9 @@ package com.yizhuan.tutu.room_chat.fragment; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; +import android.support.annotation.Nullable; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; import android.text.TextUtils; import com.google.gson.Gson; diff --git a/app/src/module_room_chat/res/layout/activity_room_message.xml b/app/src/module_room_chat/res/layout/activity_room_message.xml index 982c0e923..8692ebdc9 100644 --- a/app/src/module_room_chat/res/layout/activity_room_message.xml +++ b/app/src/module_room_chat/res/layout/activity_room_message.xml @@ -33,7 +33,7 @@ android:layout_height="1px" android:background="@color/color_f5f5f5" /> - diff --git a/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml b/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml index 999b00bea..a388e35ce 100644 --- a/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml +++ b/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml @@ -13,7 +13,7 @@ android:layout_marginStart="@dimen/dp_15" android:layout_marginEnd="@dimen/dp_10" /> - - - - - - + diff --git a/app/src/module_super_admin/res/layout/activity_room_s_admin_manager.xml b/app/src/module_super_admin/res/layout/activity_room_s_admin_manager.xml index 73d270beb..978f412f6 100644 --- a/app/src/module_super_admin/res/layout/activity_room_s_admin_manager.xml +++ b/app/src/module_super_admin/res/layout/activity_room_s_admin_manager.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeActivity.java index 5c62c6ba6..3a08dae00 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeActivity.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeActivity.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.treasure_box.activity; import android.content.Context; import android.content.Intent; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeRecordActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeRecordActivity.java index 1fd1ccd6f..e0bbb7883 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeRecordActivity.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeRecordActivity.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.treasure_box.activity; import android.content.Context; import android.content.Intent; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeActivity.java index 20cca8c48..7e005d917 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeActivity.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeActivity.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.treasure_box.activity; import android.content.Context; import android.content.Intent; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; import android.view.View; import android.view.ViewGroup; @@ -11,6 +11,7 @@ import com.yizhuan.erban.BR; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseBindingActivity; import com.yizhuan.erban.bindadapter.BaseAdapter; +import com.yizhuan.erban.databinding.ActivityBoxPrizeBinding; import com.yizhuan.erban.databinding.ActivityHonourBoxPrizeBinding; import com.yizhuan.erban.treasure_box.widget.PrizeVm; import com.yizhuan.treasure_box.bean.PrizeInfo; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeRecordActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeRecordActivity.java index 59be501a6..a82d305da 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeRecordActivity.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeRecordActivity.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.treasure_box.activity; import android.content.Context; import android.content.Intent; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; import android.view.View; import android.view.ViewGroup; @@ -11,6 +11,7 @@ import com.flyco.tablayout.listener.OnTabSelectListener; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseBindingActivity; import com.yizhuan.erban.common.ViewPagerAdapter; +import com.yizhuan.erban.databinding.ActivityBoxPrizeRecordBinding; import com.yizhuan.erban.databinding.ActivityHonourBoxPrizeRecordBinding; import com.yizhuan.erban.treasure_box.fragment.PrizeRecordFragment; import com.yizhuan.erban.treasure_box.fragment.PrizeRecordSecondFragment; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java index bb5c46ca7..e66c1f3ec 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java @@ -2,9 +2,9 @@ package com.yizhuan.erban.treasure_box.fragment; import android.app.Dialog; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.DialogFragment; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.Gravity; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordFragment.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordFragment.java index 7741abf64..355291c13 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordFragment.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordFragment.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.treasure_box.fragment; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; import android.view.View; import android.widget.TextView; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordSecondFragment.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordSecondFragment.java index 6b66c7968..ac9fb1fea 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordSecondFragment.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordSecondFragment.java @@ -1,8 +1,8 @@ package com.yizhuan.erban.treasure_box.fragment; import android.os.Bundle; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import androidx.recyclerview.widget.LinearLayoutManager; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.LinearLayoutManager; import android.view.View; import android.widget.TextView; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenBoxService.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenBoxService.java index ab12918a5..506216c1c 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenBoxService.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenBoxService.java @@ -4,7 +4,7 @@ import android.app.Service; import android.content.Context; import android.content.Intent; import android.os.IBinder; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.yizhuan.treasure_box.model.BoxModel; import com.yizhuan.xchat_android_core.exception.FailReasonException; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenHonourBoxService.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenHonourBoxService.java index 69bf9c95b..0da2a0e0c 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenHonourBoxService.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenHonourBoxService.java @@ -4,13 +4,14 @@ import android.app.Service; import android.content.Context; import android.content.Intent; import android.os.IBinder; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import com.yizhuan.treasure_box.event.AutoOpenHonourBoxEvent; import com.yizhuan.treasure_box.model.BoxModel; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.exception.FailReasonException; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; +import com.yizhuan.treasure_box.event.AutoOpenBoxEvent; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; import com.yizhuan.xchat_android_library.utils.config.BasicConfig; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/PrizeCover.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/PrizeCover.java index 5741f8dd6..dc7fff099 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/PrizeCover.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/PrizeCover.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.treasure_box.widget; import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BaseBindingDialog.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BaseBindingDialog.java index deea546ed..ce792ad27 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BaseBindingDialog.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BaseBindingDialog.java @@ -1,12 +1,12 @@ package com.yizhuan.erban.treasure_box.widget.dialog; import android.content.Context; -import androidx.databinding.DataBindingUtil; -import androidx.databinding.ViewDataBinding; +import android.databinding.DataBindingUtil; +import android.databinding.ViewDataBinding; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import androidx.appcompat.app.AppCompatDialog; +import android.support.v7.app.AppCompatDialog; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -14,6 +14,7 @@ import android.view.Window; import android.view.WindowManager; import com.netease.nim.uikit.common.util.sys.ScreenUtil; +import com.yizhuan.erban.R; import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; /** diff --git a/app/src/module_treasure_box/res/layout/activity_box_help.xml b/app/src/module_treasure_box/res/layout/activity_box_help.xml index 121ab423d..e46f48e2a 100644 --- a/app/src/module_treasure_box/res/layout/activity_box_help.xml +++ b/app/src/module_treasure_box/res/layout/activity_box_help.xml @@ -10,7 +10,7 @@ type="android.view.View.OnClickListener" /> - - + \ No newline at end of file diff --git a/app/src/module_treasure_box/res/layout/activity_box_prize.xml b/app/src/module_treasure_box/res/layout/activity_box_prize.xml index 272ac5fb6..b559caba2 100644 --- a/app/src/module_treasure_box/res/layout/activity_box_prize.xml +++ b/app/src/module_treasure_box/res/layout/activity_box_prize.xml @@ -14,7 +14,7 @@ type="com.yizhuan.erban.base.BaseListViewModel" /> - - - - + - + \ No newline at end of file diff --git a/app/src/module_treasure_box/res/layout/activity_box_prize_record.xml b/app/src/module_treasure_box/res/layout/activity_box_prize_record.xml index e790ed765..993e0d6ce 100644 --- a/app/src/module_treasure_box/res/layout/activity_box_prize_record.xml +++ b/app/src/module_treasure_box/res/layout/activity_box_prize_record.xml @@ -10,7 +10,7 @@ type="android.view.View.OnClickListener" /> - - - + \ No newline at end of file diff --git a/app/src/module_treasure_box/res/layout/activity_honour_box_help.xml b/app/src/module_treasure_box/res/layout/activity_honour_box_help.xml index d852cff04..623fdb4ca 100644 --- a/app/src/module_treasure_box/res/layout/activity_honour_box_help.xml +++ b/app/src/module_treasure_box/res/layout/activity_honour_box_help.xml @@ -10,7 +10,7 @@ type="android.view.View.OnClickListener" /> - - + \ No newline at end of file diff --git a/app/src/module_treasure_box/res/layout/activity_honour_box_prize.xml b/app/src/module_treasure_box/res/layout/activity_honour_box_prize.xml index 4b3580b82..50d2d9654 100644 --- a/app/src/module_treasure_box/res/layout/activity_honour_box_prize.xml +++ b/app/src/module_treasure_box/res/layout/activity_honour_box_prize.xml @@ -14,7 +14,7 @@ type="com.yizhuan.erban.base.BaseListViewModel" /> - - - - + - + \ No newline at end of file diff --git a/app/src/module_treasure_box/res/layout/activity_honour_box_prize_record.xml b/app/src/module_treasure_box/res/layout/activity_honour_box_prize_record.xml index 706cfbd17..d147fccdb 100644 --- a/app/src/module_treasure_box/res/layout/activity_honour_box_prize_record.xml +++ b/app/src/module_treasure_box/res/layout/activity_honour_box_prize_record.xml @@ -10,7 +10,7 @@ type="android.view.View.OnClickListener" /> - - - + \ No newline at end of file diff --git a/app/src/module_treasure_box/res/layout/activity_treasure_box.xml b/app/src/module_treasure_box/res/layout/activity_treasure_box.xml index eeaaa4cf9..a3405e7a9 100644 --- a/app/src/module_treasure_box/res/layout/activity_treasure_box.xml +++ b/app/src/module_treasure_box/res/layout/activity_treasure_box.xml @@ -10,7 +10,7 @@ type="android.view.View.OnClickListener" /> - - - + diff --git a/app/src/module_treasure_box/res/layout/activity_treasure_box_honour.xml b/app/src/module_treasure_box/res/layout/activity_treasure_box_honour.xml index efb074a36..604d48f2d 100644 --- a/app/src/module_treasure_box/res/layout/activity_treasure_box_honour.xml +++ b/app/src/module_treasure_box/res/layout/activity_treasure_box_honour.xml @@ -10,7 +10,7 @@ type="android.view.View.OnClickListener" /> - - - + diff --git a/app/src/module_treasure_box/res/layout/dialog_buy_key.xml b/app/src/module_treasure_box/res/layout/dialog_buy_key.xml index 1f9372a3d..a8f5a1066 100644 --- a/app/src/module_treasure_box/res/layout/dialog_buy_key.xml +++ b/app/src/module_treasure_box/res/layout/dialog_buy_key.xml @@ -10,14 +10,14 @@ type="android.view.View.OnClickListener" /> - - - - + + \ No newline at end of file diff --git a/app/src/module_treasure_box/res/layout/dialog_buy_key_honour.xml b/app/src/module_treasure_box/res/layout/dialog_buy_key_honour.xml index 877c7b926..d66229f15 100644 --- a/app/src/module_treasure_box/res/layout/dialog_buy_key_honour.xml +++ b/app/src/module_treasure_box/res/layout/dialog_buy_key_honour.xml @@ -10,14 +10,14 @@ type="android.view.View.OnClickListener" /> - - - - + + \ No newline at end of file diff --git a/app/src/module_treasure_box/res/layout/list_item_honour_price.xml b/app/src/module_treasure_box/res/layout/list_item_honour_price.xml index 333db6f93..36281d15c 100644 --- a/app/src/module_treasure_box/res/layout/list_item_honour_price.xml +++ b/app/src/module_treasure_box/res/layout/list_item_honour_price.xml @@ -12,7 +12,7 @@ - - + \ No newline at end of file diff --git a/app/src/module_treasure_box/res/layout/list_item_price.xml b/app/src/module_treasure_box/res/layout/list_item_price.xml index 9133ab717..3a6561b33 100644 --- a/app/src/module_treasure_box/res/layout/list_item_price.xml +++ b/app/src/module_treasure_box/res/layout/list_item_price.xml @@ -12,7 +12,7 @@ - - + \ No newline at end of file diff --git a/app/src/module_treasure_box/res/layout/list_item_price_record.xml b/app/src/module_treasure_box/res/layout/list_item_price_record.xml index c0f9bd8c8..5203f540d 100644 --- a/app/src/module_treasure_box/res/layout/list_item_price_record.xml +++ b/app/src/module_treasure_box/res/layout/list_item_price_record.xml @@ -14,7 +14,7 @@ - - + \ No newline at end of file diff --git a/app/src/module_treasure_box/res/layout/list_item_price_record_second.xml b/app/src/module_treasure_box/res/layout/list_item_price_record_second.xml index d2a6bc72f..3c4a8dded 100644 --- a/app/src/module_treasure_box/res/layout/list_item_price_record_second.xml +++ b/app/src/module_treasure_box/res/layout/list_item_price_record_second.xml @@ -14,7 +14,7 @@ - - + \ No newline at end of file diff --git a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java index 74b857916..bcddb9147 100644 --- a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java +++ b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java @@ -3,11 +3,11 @@ package com.tongdaxing.erban.upgrade; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.FragmentManager; -import androidx.core.content.ContextCompat; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.DialogFragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.content.ContextCompat; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.ForegroundColorSpan; diff --git a/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml b/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml index f478f5b8c..62552fbbf 100644 --- a/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml +++ b/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 406e6d549..5ce790c7b 100644 --- a/build.gradle +++ b/build.gradle @@ -13,11 +13,11 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0' + classpath 'com.android.tools.build:gradle:3.1.4' //realm 数据库插件 classpath "io.realm:realm-gradle-plugin:5.3.0" // android 资源混淆插件 - classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.16' + classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.15' } } diff --git a/core/build.gradle b/core/build.gradle index f03a0a0b4..6c7d47464 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -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') diff --git a/core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java b/core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java index 0084f1221..7e75fc350 100644 --- a/core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java +++ b/core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java @@ -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; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java index 8563aeeec..0ee875c46 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java @@ -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; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java index f2c9f8bfc..a334c7ee6 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java @@ -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); diff --git a/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java b/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java index 9214ec485..adbd787fb 100644 --- a/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java +++ b/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java @@ -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; diff --git a/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java b/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java index 551145a13..916f2a68b 100644 --- a/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java +++ b/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java b/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java index 5e50e8427..62ceb933c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java b/core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java index 42ab60ee9..f24f8e37e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java @@ -1,6 +1,6 @@ package com.yizhuan.xchat_android_core.exception; -import androidx.annotation.StringDef; +import android.support.annotation.StringDef; /** *

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java index 4f8387e22..aaac2c556 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java @@ -1,6 +1,6 @@ package com.yizhuan.xchat_android_core.family.bean; -import androidx.annotation.DrawableRes; +import android.support.annotation.DrawableRes; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java index 4323b9ef9..9e1da65cf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java index 8fa6f01f4..ad9c7c796 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldAttachment.java b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldAttachment.java index 5209c3653..124574de8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldAttachment.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldAttachment.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldNoticeAttachment.java b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldNoticeAttachment.java index 4f00777f5..293b1c1fc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldNoticeAttachment.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldNoticeAttachment.java @@ -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 { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java index 286b48c95..3be5f3c3a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java index 025c7fc16..e1f879585 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java b/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java index 415b212b4..46c43b1cd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java b/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java index 4c6721f8d..19599eb1d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java b/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java index 687e039ec..48ee142b2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java index 181a01a62..67228073c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java @@ -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; + /** *

在线用户列表，包装 {@link ChatRoomMember}

* diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java index 81149a9a7..4b317b259 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/KtvEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/KtvEvent.java index 4d596c86a..62a439862 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/KtvEvent.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/KtvEvent.java @@ -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 { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java index 840310702..b72ff8c36 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java index ec388f777..858c4d9a4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java @@ -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 { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java index dbfe21e75..7ac72301a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomQueueInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomQueueInfo.java index 5521b7fac..0b62a0bfd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomQueueInfo.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomQueueInfo.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/AliyunLogToken.java b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/AliyunLogToken.java index 5ff1c9270..a5d28d697 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/AliyunLogToken.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/AliyunLogToken.java @@ -1,6 +1,6 @@ package com.yizhuan.xchat_android_core.statistic; -import androidx.annotation.Keep; +import android.support.annotation.Keep; /** *

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/LogFile.java b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/LogFile.java index edb26bb64..271c493ae 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/LogFile.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/LogFile.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java index 34f57183e..c9bb55b39 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java index 9daffb934..7283b5834 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java index 10724c639..5803cd48e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java index dc25f4b93..2349edb7d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java @@ -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; + /** * 个人主页/客态页用户信息监听 */ diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java index ee09fc659..65a5ed6e3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java @@ -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; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java b/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java index 66a030399..82f0f7b67 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java @@ -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; /** diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/DynamicSysAttachment.java b/core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/DynamicSysAttachment.java index 72537283f..9468ccc91 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/DynamicSysAttachment.java +++ b/core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/DynamicSysAttachment.java @@ -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; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/DownloadModel.java b/core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/DownloadModel.java index 1b5749b8d..33e377f2e 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/DownloadModel.java +++ b/core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/DownloadModel.java @@ -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 diff --git a/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java b/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java index 6c5fe80f4..f9aecb1d3 100644 --- a/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java +++ b/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java @@ -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; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldModel.java b/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldModel.java index 0868e01a4..479fb390c 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldModel.java +++ b/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldModel.java @@ -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; diff --git a/core/src/model_multi_domain/java/com/yizhuan/xchat_android_core/domain/model/DomainModel.java b/core/src/model_multi_domain/java/com/yizhuan/xchat_android_core/domain/model/DomainModel.java index 826a5f6aa..02fb1ca08 100644 --- a/core/src/model_multi_domain/java/com/yizhuan/xchat_android_core/domain/model/DomainModel.java +++ b/core/src/model_multi_domain/java/com/yizhuan/xchat_android_core/domain/model/DomainModel.java @@ -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; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java index 6ff647790..d6502e248 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java +++ b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java @@ -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; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java index 62e6a76c9..690c1b07c 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java +++ b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java @@ -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; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java index 46220ad96..4b202eb99 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java +++ b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java @@ -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; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java index 405303cb9..3c9426717 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java +++ b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java @@ -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; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java index 18fcb9291..6a90ade7d 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java +++ b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java @@ -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; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentActivity.java b/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentActivity.java index f40ebb502..02974b7b2 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentActivity.java +++ b/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentActivity.java @@ -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; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/PublicChatHallModel.java b/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/PublicChatHallModel.java index 143a54afe..fee309787 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/PublicChatHallModel.java +++ b/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/PublicChatHallModel.java @@ -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; diff --git a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/UpgradeModel.java b/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/UpgradeModel.java index 86295df33..59bbec801 100644 --- a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/UpgradeModel.java +++ b/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/UpgradeModel.java @@ -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; diff --git a/gradle.properties b/gradle.properties index f4a13773b..8d9cd71df 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,5 +29,3 @@ ndk_abi_filters=arm # jenkins参数，debug下打渠道包用到， # 可选值 v1：仅支持v1签名，v1v2：支持v1v2签名 sign_mode=v1 -android.useAndroidX=true -android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69ed8a555..fb3015f87 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/library/build.gradle b/library/build.gradle index 537498d2e..9b1d2658e 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -7,7 +7,7 @@ android { targetSdkVersion 29 versionCode 1 versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } @@ -35,7 +35,7 @@ android { dependencies { def supportLibraryVersion = "27.1.1" - def glideVersion = "4.11.0" + def glideVersion = "4.4.0" def retrofitVersion = "2.3.0" def okhttp3 = "3.12.0" def okio = "1.16.0" @@ -44,7 +44,7 @@ dependencies { def rxjava = "2.1.7" def rxjava_android = "2.0.1" def rxlifecycle = "2.1.0" - def loggerVersion = "2.2.0" + def loggerVersion = "2.1.1" def qiniu = "7.3.15" def SmartRefreshLayoutVersion = "1.0.3" def eventbusVersion = "3.0.0" @@ -52,14 +52,14 @@ 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' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - api 'androidx.appcompat:appcompat:1.1.0' - api 'androidx.recyclerview:recyclerview:1.1.0' - api 'com.google.android.material:material:1.1.0' + api "com.android.support:appcompat-v7:${supportLibraryVersion}" + api "com.android.support:recyclerview-v7:${supportLibraryVersion}" + api "com.android.support:design:${supportLibraryVersion}" api "com.squareup.retrofit2:retrofit:${retrofitVersion}" api "com.squareup.okhttp3:okhttp:${okhttp3}" diff --git a/library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java b/library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java index c872788b5..93eac22bf 100644 --- a/library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java +++ b/library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.yizhuan.xchat_android_library; 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; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java b/library/src/main/java/com/yizhuan/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java index 3df7ed175..594a6ce04 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java @@ -1,7 +1,7 @@ package com.yizhuan.xchat_android_library.adapters; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.v7.widget.RecyclerView; import java.util.ArrayList; import java.util.Collection; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpActivity.java b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpActivity.java index dc15ee725..71fd558e3 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpActivity.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpActivity.java @@ -1,7 +1,7 @@ package com.yizhuan.xchat_android_library.base; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.Log; import com.yizhuan.xchat_android_library.base.factory.BaseMvpProxy; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpFragment.java b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpFragment.java index cd2160958..2e27abf75 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpFragment.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpFragment.java @@ -1,7 +1,7 @@ package com.yizhuan.xchat_android_library.base; import android.os.Bundle; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.Log; import com.yizhuan.xchat_android_library.base.factory.BaseMvpProxy; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpPresenter.java b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpPresenter.java index 3a8d94bc1..502f66816 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpPresenter.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpPresenter.java @@ -1,8 +1,8 @@ package com.yizhuan.xchat_android_library.base; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.util.Log; import com.trello.rxlifecycle2.LifecycleProvider; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/ItemViewHolder.java b/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/ItemViewHolder.java index 267c74d91..ff0ada03c 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/ItemViewHolder.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/ItemViewHolder.java @@ -1,8 +1,8 @@ package com.yizhuan.xchat_android_library.bindinglist; -import androidx.databinding.DataBindingUtil; -import androidx.databinding.ViewDataBinding; -import androidx.recyclerview.widget.RecyclerView; +import android.databinding.DataBindingUtil; +import android.databinding.ViewDataBinding; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/MultiTypeAdapter.java b/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/MultiTypeAdapter.java index c2a76b5b4..5885295e6 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/MultiTypeAdapter.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/MultiTypeAdapter.java @@ -1,11 +1,11 @@ package com.yizhuan.xchat_android_library.bindinglist; -import androidx.databinding.ObservableArrayList; -import androidx.databinding.ObservableList; +import android.databinding.ObservableArrayList; +import android.databinding.ObservableList; import android.os.Looper; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - +import android.support.annotation.NonNull; +import android.support.v7.widget.RecyclerView; +import android.view.View; import android.view.ViewGroup; import java.lang.ref.WeakReference; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/list/NoScrollingLinearLayoutManager.java b/library/src/main/java/com/yizhuan/xchat_android_library/list/NoScrollingLinearLayoutManager.java index b5e59911a..1e1e79fad 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/list/NoScrollingLinearLayoutManager.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/list/NoScrollingLinearLayoutManager.java @@ -1,7 +1,7 @@ package com.yizhuan.xchat_android_library.list; import android.content.Context; -import androidx.recyclerview.widget.LinearLayoutManager; +import android.support.v7.widget.LinearLayoutManager; import android.util.AttributeSet; public class NoScrollingLinearLayoutManager extends LinearLayoutManager { diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/manager/TracingManager.java b/library/src/main/java/com/yizhuan/xchat_android_library/manager/TracingManager.java index f343de6c5..1f59d940f 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/manager/TracingManager.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/manager/TracingManager.java @@ -2,7 +2,7 @@ package com.yizhuan.xchat_android_library.manager; import android.app.Application; import android.os.Debug; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; /** *

diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java b/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java index 432ed774f..280ae2186 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java @@ -3,7 +3,7 @@ package com.yizhuan.xchat_android_library.service; import android.app.job.JobParameters; import android.app.job.JobService; import android.os.Build; -import androidx.annotation.RequiresApi; +import android.support.annotation.RequiresApi; import com.orhanobut.logger.Logger; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackLayout.java b/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackLayout.java index f0a0abe3e..f45d62d7b 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackLayout.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackLayout.java @@ -6,7 +6,7 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import androidx.core.view.ViewCompat; +import android.support.v4.view.ViewCompat; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/ViewDragHelper.java b/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/ViewDragHelper.java index bd0bb1237..94b6d1d10 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/ViewDragHelper.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/ViewDragHelper.java @@ -17,10 +17,10 @@ package com.yizhuan.xchat_android_library.swipeactivity; import android.content.Context; -import androidx.core.view.MotionEventCompat; -import androidx.core.view.VelocityTrackerCompat; -import androidx.core.view.ViewCompat; -import androidx.core.widget.ScrollerCompat; +import android.support.v4.view.MotionEventCompat; +import android.support.v4.view.VelocityTrackerCompat; +import android.support.v4.view.ViewCompat; +import android.support.v4.widget.ScrollerCompat; import android.view.MotionEvent; import android.view.VelocityTracker; import android.view.View; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakThreadFactory.java b/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakThreadFactory.java index 6a42a27f9..f21870a2b 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakThreadFactory.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakThreadFactory.java @@ -1,6 +1,6 @@ package com.yizhuan.xchat_android_library.threadmgr; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import java.util.concurrent.ThreadFactory; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ScreenUtils.java b/library/src/main/java/com/yizhuan/xchat_android_library/utils/ScreenUtils.java index b56e0f46f..ade8a67de 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ScreenUtils.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/utils/ScreenUtils.java @@ -10,7 +10,7 @@ import android.graphics.Bitmap; import android.graphics.Point; import android.os.Build; import android.provider.Settings; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import android.util.DisplayMetrics; import android.view.Surface; import android.view.View; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/DrawableCenterTextView.java b/library/src/main/java/com/yizhuan/xchat_android_library/widget/DrawableCenterTextView.java index adcf4458e..0e667abe8 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/DrawableCenterTextView.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/widget/DrawableCenterTextView.java @@ -2,7 +2,7 @@ package com.yizhuan.xchat_android_library.widget; import android.content.Context; import android.graphics.Canvas; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.AttributeSet; import com.yizhuan.xchat_android_library.utils.CenterDrawableHelper; @@ -14,7 +14,7 @@ import com.yizhuan.xchat_android_library.utils.CenterDrawableHelper; * @author jiahui * @date 2018/1/11 */ -public class DrawableCenterTextView extends androidx.appcompat.widget.AppCompatTextView { +public class DrawableCenterTextView extends android.support.v7.widget.AppCompatTextView { public DrawableCenterTextView(Context context) { diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/ShapeConstrainLayout.java b/library/src/main/java/com/yizhuan/xchat_android_library/widget/ShapeConstrainLayout.java index 57bb7bfcd..624ebb5b3 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/ShapeConstrainLayout.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/widget/ShapeConstrainLayout.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.drawable.GradientDrawable; -import androidx.constraintlayout.widget.ConstraintLayout; +import android.support.constraint.ConstraintLayout; import android.util.AttributeSet; import com.yizhuan.xchat_android_library.R; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java b/library/src/main/java/com/yizhuan/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java index 82c8202b6..8971d634e 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java @@ -2,7 +2,7 @@ package com.yizhuan.xchat_android_library.widget.decoration; import android.content.Context; import android.graphics.Rect; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.util.TypedValue; import android.view.View; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java b/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java index bb46796a0..797f6d988 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java @@ -3,13 +3,13 @@ package com.yizhuan.xchat_android_library.widget.xlist; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import androidx.core.view.ViewCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.OrientationHelper; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.StaggeredGridLayoutManager; - +import android.support.v4.view.ViewCompat; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.OrientationHelper; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.StaggeredGridLayoutManager; +import android.util.Log; import android.view.View; /** diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarRecyclerView.java b/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarRecyclerView.java index c277b9b7e..f4845bf43 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarRecyclerView.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarRecyclerView.java @@ -3,13 +3,16 @@ package com.yizhuan.xchat_android_library.widget.xlist; import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.OrientationHelper; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.StaggeredGridLayoutManager; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.OrientationHelper; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.StaggeredGridLayoutManager; import android.util.AttributeSet; +import android.view.MotionEvent; import android.view.View; +import android.view.ViewGroup; +import android.view.ViewParent; import com.yizhuan.xchat_android_library.R; diff --git a/nim_uikit/build.gradle b/nim_uikit/build.gradle index f56860c13..0399d800f 100644 --- a/nim_uikit/build.gradle +++ b/nim_uikit/build.gradle @@ -39,19 +39,19 @@ android { } def overscroll_android = "1.0.4" -def base_recyclerview_helper = "2.9.49-androidx" +def base_recyclerview_helper = "2.9.34" def ShortcutBadger = "1.1.17" def ConstraintLayoutVersion = "1.1.3" def GlideTransformationsVersion = "3.0.1" -def NimNetVersion = "7.4.0" -def glideVersion = "4.11.0" +def NimNetVersion = "6.7.0" +def glideVersion = "4.4.0" dependencies { api fileTree(include: '*.jar', dir: 'libs') api "me.everything:overscroll-decor-android:${overscroll_android}" api "com.github.CymChad:BaseRecyclerViewAdapterHelper:${base_recyclerview_helper}" api "me.leolin:ShortcutBadger:${ShortcutBadger}@aar" - api 'androidx.constraintlayout:constraintlayout:1.1.3' + api "com.android.support.constraint:constraint-layout:${ConstraintLayoutVersion}" api "jp.wasabeef:glide-transformations:${GlideTransformationsVersion}" // 基础功能 (必需) diff --git a/nim_uikit/res/layout/nim_advanced_team_announce.xml b/nim_uikit/res/layout/nim_advanced_team_announce.xml index ccb511fdb..9de72867f 100644 --- a/nim_uikit/res/layout/nim_advanced_team_announce.xml +++ b/nim_uikit/res/layout/nim_advanced_team_announce.xml @@ -6,14 +6,14 @@ android:orientation="vertical"> - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + app:titleTextAppearance="@style/Toolbar.TitleText"> + - - - - + + - - - - - + + - diff --git a/nim_uikit/res/layout/nim_mass_message_activity.xml b/nim_uikit/res/layout/nim_mass_message_activity.xml index 04abb2333..ceae3f705 100644 --- a/nim_uikit/res/layout/nim_mass_message_activity.xml +++ b/nim_uikit/res/layout/nim_mass_message_activity.xml @@ -5,22 +5,22 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - + + - - - + \ No newline at end of file diff --git a/nim_uikit/res/layout/nim_message_activity_actions_layout.xml b/nim_uikit/res/layout/nim_message_activity_actions_layout.xml index ac5527f52..caae7d875 100644 --- a/nim_uikit/res/layout/nim_message_activity_actions_layout.xml +++ b/nim_uikit/res/layout/nim_message_activity_actions_layout.xml @@ -7,7 +7,7 @@ android:orientation="vertical" android:visibility="gone" > - - - - - - + + diff --git a/nim_uikit/res/layout/nim_picker_album_activity.xml b/nim_uikit/res/layout/nim_picker_album_activity.xml index ae37db09d..8fdc45baf 100644 --- a/nim_uikit/res/layout/nim_picker_album_activity.xml +++ b/nim_uikit/res/layout/nim_picker_album_activity.xml @@ -5,22 +5,22 @@ android:layout_height="match_parent" android:background="@color/white"> - - - - + + - @@ -60,14 +60,14 @@ android:textSize="14sp" /> - - - - + + \ No newline at end of file diff --git a/nim_uikit/res/layout/nim_preview_image_from_camera_activity.xml b/nim_uikit/res/layout/nim_preview_image_from_camera_activity.xml index 923d9b034..1ba8c2be2 100644 --- a/nim_uikit/res/layout/nim_preview_image_from_camera_activity.xml +++ b/nim_uikit/res/layout/nim_preview_image_from_camera_activity.xml @@ -6,14 +6,14 @@ android:background="@color/black" android:orientation="vertical"> - - - - + + - - - - + app:titleTextAppearance="@style/Toolbar.TitleText"> + - - - - + + - - - - + + - - + \ No newline at end of file diff --git a/nim_uikit/res/layout/nim_team_message_activity.xml b/nim_uikit/res/layout/nim_team_message_activity.xml index 930473cef..8e9864f54 100644 --- a/nim_uikit/res/layout/nim_team_message_activity.xml +++ b/nim_uikit/res/layout/nim_team_message_activity.xml @@ -5,20 +5,20 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - + - - - - + + - - - - + + - diff --git a/nim_uikit/res/layout/nim_watch_picture_activity.xml b/nim_uikit/res/layout/nim_watch_picture_activity.xml index 6361d0a47..5711270f4 100644 --- a/nim_uikit/res/layout/nim_watch_picture_activity.xml +++ b/nim_uikit/res/layout/nim_watch_picture_activity.xml @@ -10,14 +10,14 @@ - - - + - + - diff --git a/nim_uikit/res/layout/nim_watch_video_activity.xml b/nim_uikit/res/layout/nim_watch_video_activity.xml index 25aec5271..021342ecd 100644 --- a/nim_uikit/res/layout/nim_watch_video_activity.xml +++ b/nim_uikit/res/layout/nim_watch_video_activity.xml @@ -6,14 +6,14 @@ android:background="@color/black" android:orientation="vertical"> - - - - + + + app:actionViewClass="android.support.v7.widget.SearchView"/> \ No newline at end of file diff --git a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactDecoration.java b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactDecoration.java index da7531456..e51982aed 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactDecoration.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactDecoration.java @@ -1,7 +1,7 @@ package com.netease.nim.uikit.business.ait.selector; import android.content.Context; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import com.netease.nim.uikit.common.ui.recyclerview.decoration.DividerItemDecoration; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactSelectorActivity.java b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactSelectorActivity.java index ff37a5c61..de3116c23 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactSelectorActivity.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactSelectorActivity.java @@ -4,8 +4,8 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.netease.nim.uikit.R; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/adapter/AitContactAdapter.java b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/adapter/AitContactAdapter.java index 556b00d0e..5d5f4d580 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/adapter/AitContactAdapter.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/adapter/AitContactAdapter.java @@ -1,6 +1,6 @@ package com.netease.nim.uikit.business.ait.selector.adapter; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import com.netease.nim.uikit.R; import com.netease.nim.uikit.business.ait.selector.holder.RobotViewHolder; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/chatroom/adapter/ChatRoomMsgAdapter.java b/nim_uikit/src/com/netease/nim/uikit/business/chatroom/adapter/ChatRoomMsgAdapter.java index 0e4284535..edb6c0585 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/chatroom/adapter/ChatRoomMsgAdapter.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/chatroom/adapter/ChatRoomMsgAdapter.java @@ -1,6 +1,6 @@ package com.netease.nim.uikit.business.chatroom.adapter; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.netease.nim.uikit.R; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/chatroom/module/ChatRoomMsgListPanel.java b/nim_uikit/src/com/netease/nim/uikit/business/chatroom/module/ChatRoomMsgListPanel.java index b0185be52..4a8abac83 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/chatroom/module/ChatRoomMsgListPanel.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/chatroom/module/ChatRoomMsgListPanel.java @@ -4,8 +4,8 @@ import android.content.ActivityNotFoundException; import android.content.Intent; import android.net.Uri; import android.os.Handler; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; @@ -16,6 +16,7 @@ import com.netease.nim.uikit.business.chatroom.viewholder.ChatRoomMsgViewHolderB import com.netease.nim.uikit.business.preference.UserPreferences; import com.netease.nim.uikit.business.robot.parser.elements.group.LinkElement; import com.netease.nim.uikit.business.session.audio.MessageAudioControl; +import com.netease.nim.uikit.business.session.event.MessageEvent; import com.netease.nim.uikit.business.session.module.Container; import com.netease.nim.uikit.business.session.viewholder.robot.RobotLinkView; import com.netease.nim.uikit.common.ui.dialog.EasyAlertDialog; @@ -44,6 +45,8 @@ import com.netease.nimlib.sdk.robot.model.RobotAttachment; import com.netease.nimlib.sdk.robot.model.RobotMsgType; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import org.greenrobot.eventbus.EventBus; + import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/contact/selector/activity/ContactSelectActivity.java b/nim_uikit/src/com/netease/nim/uikit/business/contact/selector/activity/ContactSelectActivity.java index 194ee4264..aabe8cbd7 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/contact/selector/activity/ContactSelectActivity.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/contact/selector/activity/ContactSelectActivity.java @@ -5,8 +5,8 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import androidx.core.view.MenuItemCompat; -import androidx.appcompat.widget.SearchView; +import android.support.v4.view.MenuItemCompat; +import android.support.v7.widget.SearchView; import android.text.TextUtils; import android.util.TypedValue; import android.view.MenuItem; @@ -21,6 +21,7 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.RelativeLayout; import android.widget.TextView; +import android.widget.Toast; import com.netease.nim.uikit.R; import com.netease.nim.uikit.api.wrapper.NimToolBarOptions; @@ -54,7 +55,7 @@ import java.util.List; *

* Created by huangjun on 2015/3/3. */ -public class ContactSelectActivity extends UI implements View.OnClickListener, androidx.appcompat.widget.SearchView.OnQueryTextListener { +public class ContactSelectActivity extends UI implements View.OnClickListener, android.support.v7.widget.SearchView.OnQueryTextListener { public static final String EXTRA_DATA = "EXTRA_DATA"; // 请求数据：Option public static final String RESULT_DATA = "RESULT_DATA"; // 返回结果 diff --git a/nim_uikit/src/com/netease/nim/uikit/business/recent/RecentContactsFragment.java b/nim_uikit/src/com/netease/nim/uikit/business/recent/RecentContactsFragment.java index 9f6fb26bb..8b5acc9b0 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/recent/RecentContactsFragment.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/recent/RecentContactsFragment.java @@ -1,13 +1,14 @@ package com.netease.nim.uikit.business.recent; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import android.widget.Toast; import com.netease.nim.uikit.R; import com.netease.nim.uikit.api.NimUIKit; @@ -27,6 +28,7 @@ import com.netease.nim.uikit.common.ui.recyclerview.listener.SimpleClickListener import com.netease.nim.uikit.impl.NimUIKitImpl; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.Observer; +import com.netease.nimlib.sdk.RequestCallback; import com.netease.nimlib.sdk.RequestCallbackWrapper; import com.netease.nimlib.sdk.ResponseCode; import com.netease.nimlib.sdk.msg.MsgService; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/recent/adapter/RecentContactAdapter.java b/nim_uikit/src/com/netease/nim/uikit/business/recent/adapter/RecentContactAdapter.java index 61a7f45da..619cf8906 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/recent/adapter/RecentContactAdapter.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/recent/adapter/RecentContactAdapter.java @@ -1,6 +1,6 @@ package com.netease.nim.uikit.business.recent.adapter; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import com.netease.nim.uikit.R; import com.netease.nim.uikit.business.recent.RecentContactsCallback; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/BaseMessageActivity.java b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/BaseMessageActivity.java index 0754b709c..ba1fa92e4 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/BaseMessageActivity.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/BaseMessageActivity.java @@ -2,7 +2,7 @@ package com.netease.nim.uikit.business.session.activity; import android.content.Intent; import android.os.Bundle; -import androidx.appcompat.widget.Toolbar; +import android.support.v7.widget.Toolbar; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchMessagePictureActivity.java b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchMessagePictureActivity.java index 78ee98444..8fdea3612 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchMessagePictureActivity.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchMessagePictureActivity.java @@ -8,9 +8,9 @@ import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.provider.MediaStore; -import androidx.viewpager.widget.PagerAdapter; -import androidx.core.view.ViewCompat; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewCompat; +import android.support.v4.view.ViewPager; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -18,6 +18,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import android.widget.Toast; import com.bumptech.glide.Glide; import com.netease.nim.uikit.R; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchPicAndVideoMenuActivity.java b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchPicAndVideoMenuActivity.java index 1c28d1e26..e35bd9e79 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchPicAndVideoMenuActivity.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchPicAndVideoMenuActivity.java @@ -3,8 +3,8 @@ package com.netease.nim.uikit.business.session.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import com.netease.nim.uikit.R; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchVideoActivity.java b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchVideoActivity.java index ef3f378ab..f2ae14500 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchVideoActivity.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchVideoActivity.java @@ -10,7 +10,7 @@ import android.media.MediaPlayer.OnPreparedListener; import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import androidx.appcompat.app.ActionBar; +import android.support.v7.app.ActionBar; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.SurfaceHolder; @@ -22,6 +22,7 @@ import android.view.ViewGroup.LayoutParams; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; +import android.widget.Toast; import com.netease.nim.uikit.R; import com.netease.nim.uikit.api.wrapper.NimToolBarOptions; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/adapter/MediaAdapter.java b/nim_uikit/src/com/netease/nim/uikit/business/session/adapter/MediaAdapter.java index 4d35433aa..72f12d598 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/adapter/MediaAdapter.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/adapter/MediaAdapter.java @@ -1,7 +1,7 @@ package com.netease.nim.uikit.business.session.adapter; import android.content.Context; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmojiManager.java b/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmojiManager.java index 160a90325..9807f3127 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmojiManager.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmojiManager.java @@ -8,7 +8,7 @@ import android.graphics.BitmapFactory.Options; import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import androidx.collection.LruCache; +import android.support.v4.util.LruCache; import android.util.DisplayMetrics; import android.util.Xml; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonPickerView.java b/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonPickerView.java index d7c9d857a..3c9100c3f 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonPickerView.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonPickerView.java @@ -5,7 +5,7 @@ import android.content.Context; import android.graphics.Bitmap; import android.os.Build; import android.os.Handler; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonView.java b/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonView.java index 3d514a01b..9ddf44471 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonView.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonView.java @@ -1,9 +1,9 @@ package com.netease.nim.uikit.business.session.emoji; import android.content.Context; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; -import androidx.viewpager.widget.ViewPager.OnPageChangeListener; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; +import android.support.v4.view.ViewPager.OnPageChangeListener; import android.text.TextUtils; import android.view.Gravity; import android.view.View; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/helper/MsgBkImageView.java b/nim_uikit/src/com/netease/nim/uikit/business/session/helper/MsgBkImageView.java index 1095aca8e..24ba21416 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/helper/MsgBkImageView.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/helper/MsgBkImageView.java @@ -3,7 +3,7 @@ package com.netease.nim.uikit.business.session.helper; import android.content.Context; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import androidx.appcompat.widget.AppCompatImageView; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; public class MsgBkImageView extends AppCompatImageView { diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPagerAdapter.java b/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPagerAdapter.java index e4ce766a1..c0207fbfc 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPagerAdapter.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPagerAdapter.java @@ -2,8 +2,8 @@ package com.netease.nim.uikit.business.session.module.input; import android.content.Context; import android.content.res.Resources; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPanel.java b/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPanel.java index 44fcd5504..8b33f357a 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPanel.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPanel.java @@ -1,6 +1,6 @@ package com.netease.nim.uikit.business.session.module.input; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.ViewPager; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/IncomingMsgPrompt.java b/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/IncomingMsgPrompt.java index 1befc9f91..5d052ee47 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/IncomingMsgPrompt.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/IncomingMsgPrompt.java @@ -2,7 +2,7 @@ package com.netease.nim.uikit.business.session.module.list; import android.content.Context; import android.os.Handler; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.text.style.ImageSpan; import android.view.View; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MessageListPanelEx.java b/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MessageListPanelEx.java index 75c952950..eae8d3c48 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MessageListPanelEx.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MessageListPanelEx.java @@ -6,8 +6,8 @@ import android.content.Intent; import android.graphics.Bitmap; import android.net.Uri; import android.os.Handler; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.util.Pair; import android.view.View; @@ -21,6 +21,7 @@ import com.netease.nim.uikit.business.preference.UserPreferences; import com.netease.nim.uikit.business.robot.parser.elements.group.LinkElement; import com.netease.nim.uikit.business.session.activity.VoiceTrans; import com.netease.nim.uikit.business.session.audio.MessageAudioControl; +import com.netease.nim.uikit.business.session.event.MessageEvent; import com.netease.nim.uikit.business.session.helper.MessageHelper; import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper; import com.netease.nim.uikit.business.session.module.Container; @@ -61,6 +62,8 @@ import com.netease.nimlib.sdk.team.constant.TeamMemberType; import com.netease.nimlib.sdk.team.model.TeamMember; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import org.greenrobot.eventbus.EventBus; + import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MsgAdapter.java b/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MsgAdapter.java index 2fc57be48..6ffd3e937 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MsgAdapter.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MsgAdapter.java @@ -1,6 +1,6 @@ package com.netease.nim.uikit.business.session.module.list; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.netease.nim.uikit.R; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/DateViewHolder.java b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/DateViewHolder.java index 66a6cdf99..535f94f9d 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/DateViewHolder.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/DateViewHolder.java @@ -1,6 +1,6 @@ package com.netease.nim.uikit.business.session.viewholder.media; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/MediaViewHolder.java b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/MediaViewHolder.java index b64159bd2..82b0146ae 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/MediaViewHolder.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/MediaViewHolder.java @@ -1,6 +1,6 @@ package com.netease.nim.uikit.business.session.viewholder.media; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotContentLinearLayout.java b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotContentLinearLayout.java index 397a8c997..3613d77e8 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotContentLinearLayout.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotContentLinearLayout.java @@ -1,7 +1,7 @@ package com.netease.nim.uikit.business.session.viewholder.robot; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotViewBase.java b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotViewBase.java index 654d27a9c..3463b5e7d 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotViewBase.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotViewBase.java @@ -1,7 +1,7 @@ package com.netease.nim.uikit.business.session.viewholder.robot; import android.content.Context; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.LayoutInflater; import android.widget.FrameLayout; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/widget/NimEmojiTextView.java b/nim_uikit/src/com/netease/nim/uikit/business/session/widget/NimEmojiTextView.java index 7edef4126..d25896531 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/widget/NimEmojiTextView.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/widget/NimEmojiTextView.java @@ -1,7 +1,7 @@ package com.netease.nim.uikit.business.session.widget; import android.content.Context; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.v7.widget.AppCompatTextView; import android.text.Editable; import android.text.TextWatcher; import android.util.AttributeSet; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/team/adapter/TeamMemberListAdapter.java b/nim_uikit/src/com/netease/nim/uikit/business/team/adapter/TeamMemberListAdapter.java index 62e953ee3..788d2c205 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/team/adapter/TeamMemberListAdapter.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/team/adapter/TeamMemberListAdapter.java @@ -1,7 +1,7 @@ package com.netease.nim.uikit.business.team.adapter; import android.content.Context; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/nim_uikit/src/com/netease/nim/uikit/business/team/viewholder/TeamMemberListHolder.java b/nim_uikit/src/com/netease/nim/uikit/business/team/viewholder/TeamMemberListHolder.java index 73f123ac0..e9a6de6e7 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/team/viewholder/TeamMemberListHolder.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/team/viewholder/TeamMemberListHolder.java @@ -1,6 +1,6 @@ package com.netease.nim.uikit.business.team.viewholder; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/activity/ListActivityBase.java b/nim_uikit/src/com/netease/nim/uikit/common/activity/ListActivityBase.java index 4a67f3c38..e7e1c56d4 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/activity/ListActivityBase.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/activity/ListActivityBase.java @@ -1,8 +1,8 @@ package com.netease.nim.uikit.common.activity; import android.os.Bundle; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; import com.netease.nim.uikit.R; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/activity/UI.java b/nim_uikit/src/com/netease/nim/uikit/common/activity/UI.java index e7524557c..030b645d7 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/activity/UI.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/activity/UI.java @@ -3,16 +3,22 @@ package com.netease.nim.uikit.common.activity; import android.annotation.TargetApi; import android.content.Context; import android.os.Build; +import android.os.Bundle; import android.os.Handler; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; -import androidx.appcompat.widget.Toolbar; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; +import android.support.v7.widget.Toolbar; import android.text.TextUtils; import android.view.KeyEvent; +import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; +import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; +import android.widget.FrameLayout; +import com.netease.nim.uikit.R; +import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.common.fragment.TFragment; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.common.util.sys.ReflectionUtil; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/adapter/TViewHolder.java b/nim_uikit/src/com/netease/nim/uikit/common/adapter/TViewHolder.java index 26ad200be..048be3a80 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/adapter/TViewHolder.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/adapter/TViewHolder.java @@ -1,7 +1,7 @@ package com.netease.nim.uikit.common.adapter; import android.content.Context; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/fragment/TFragment.java b/nim_uikit/src/com/netease/nim/uikit/common/fragment/TFragment.java index 0bae10719..6b00c3913 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/fragment/TFragment.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/fragment/TFragment.java @@ -4,7 +4,7 @@ import android.app.Activity; import android.content.Context; import android.os.Bundle; import android.os.Handler; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.view.View; import android.view.inputmethod.InputMethodManager; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PickerAlbumPreviewActivity.java b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PickerAlbumPreviewActivity.java index 4099c5079..55e2c8b03 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PickerAlbumPreviewActivity.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PickerAlbumPreviewActivity.java @@ -5,14 +5,15 @@ import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; import android.os.Handler; - -import androidx.viewpager.widget.ViewPager; -import androidx.viewpager.widget.ViewPager.OnPageChangeListener; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; +import android.support.v4.view.ViewPager.OnPageChangeListener; import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.TextView; +import android.widget.Toast; import com.netease.nim.uikit.R; import com.netease.nim.uikit.api.wrapper.NimToolBarOptions; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PreviewImageFromLocalActivity.java b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PreviewImageFromLocalActivity.java index 8f6c46f47..459f2391c 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PreviewImageFromLocalActivity.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PreviewImageFromLocalActivity.java @@ -7,14 +7,15 @@ import android.graphics.Bitmap; import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; -import androidx.viewpager.widget.ViewPager; -import androidx.viewpager.widget.ViewPager.OnPageChangeListener; +import android.support.v4.view.ViewPager; +import android.support.v4.view.ViewPager.OnPageChangeListener; import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.TextView; +import android.widget.Toast; import com.netease.nim.uikit.R; import com.netease.nim.uikit.business.session.constant.Extras; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/ImagePagerAdapterInImageSwitch.java b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/ImagePagerAdapterInImageSwitch.java index 8945035b8..4e5b821a9 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/ImagePagerAdapterInImageSwitch.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/ImagePagerAdapterInImageSwitch.java @@ -2,7 +2,7 @@ package com.netease.nim.uikit.common.media.picker.adapter; import android.content.Context; import android.os.Build; -import androidx.viewpager.widget.PagerAdapter; +import android.support.v4.view.PagerAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/PickerPreviewPagerAdapter.java b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/PickerPreviewPagerAdapter.java index d0d8c2c2c..3737e253e 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/PickerPreviewPagerAdapter.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/PickerPreviewPagerAdapter.java @@ -2,7 +2,7 @@ package com.netease.nim.uikit.common.media.picker.adapter; import android.content.Context; import android.os.Build; -import androidx.viewpager.widget.PagerAdapter; +import android.support.v4.view.PagerAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/loader/RotateTransformation.java b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/loader/RotateTransformation.java index 23eb00a47..106b29721 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/loader/RotateTransformation.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/loader/RotateTransformation.java @@ -17,7 +17,7 @@ class RotateTransformation extends BitmapTransformation { private String path; RotateTransformation(Context context, String path) { - super(); + super(context); this.path = path; } diff --git a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/model/GenericFileProvider.java b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/model/GenericFileProvider.java index 2df8f3546..8b36e4959 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/model/GenericFileProvider.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/model/GenericFileProvider.java @@ -1,6 +1,6 @@ package com.netease.nim.uikit.common.media.picker.model; -import androidx.core.content.FileProvider; +import android.support.v4.content.FileProvider; /** * Created by winnie on 2017/7/26. diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleMessageTouchListener.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleMessageTouchListener.java index bbd787793..b46c98e12 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleMessageTouchListener.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleMessageTouchListener.java @@ -5,9 +5,9 @@ import android.graphics.Bitmap; import android.graphics.PixelFormat; import android.graphics.PointF; import android.graphics.drawable.AnimationDrawable; -import androidx.core.view.NestedScrollingParent; -import androidx.core.widget.NestedScrollView; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.view.NestedScrollingParent; +import android.support.v4.widget.NestedScrollView; +import android.support.v7.widget.RecyclerView; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java index bd7a8f451..1df4d883d 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java @@ -4,11 +4,12 @@ import android.content.Context; import android.graphics.Color; import android.graphics.Rect; import android.graphics.drawable.GradientDrawable; -import androidx.core.content.ContextCompat; -import androidx.core.widget.TextViewCompat; -import androidx.appcompat.widget.AppCompatTextView; +import android.support.v4.content.ContextCompat; +import android.support.v4.widget.TextViewCompat; +import android.support.v7.widget.AppCompatTextView; import android.text.TextUtils; import android.util.AttributeSet; +import android.util.TypedValue; import android.view.Gravity; import android.view.ViewGroup; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/MessageBubbleView.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/MessageBubbleView.java index d8b95f958..d8b61223e 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/MessageBubbleView.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/MessageBubbleView.java @@ -11,7 +11,7 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.Path; import android.graphics.PointF; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.util.AttributeSet; import android.util.TypedValue; import android.view.View; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/drop/DropFake.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/drop/DropFake.java index 60fcd1609..4667f6c0e 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/drop/DropFake.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/drop/DropFake.java @@ -2,7 +2,7 @@ package com.netease.nim.uikit.common.ui.drop; import android.content.Context; import android.graphics.Canvas; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/imageview/BaseZoomableImageView.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/imageview/BaseZoomableImageView.java index f359fd2fc..7d72ffe2b 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/imageview/BaseZoomableImageView.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/imageview/BaseZoomableImageView.java @@ -33,7 +33,7 @@ import android.graphics.Paint; import android.graphics.Rect; import android.os.Build; import android.os.SystemClock; -import androidx.viewpager.widget.ViewPager; +import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.util.Log; import android.view.View; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/ptr2/SuperSwipeRefreshLayout.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/ptr2/SuperSwipeRefreshLayout.java index b32e018dd..b5a171de4 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/ptr2/SuperSwipeRefreshLayout.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/ptr2/SuperSwipeRefreshLayout.java @@ -13,12 +13,12 @@ import android.graphics.Paint; import android.graphics.RectF; import android.os.Build; import android.os.Handler; -import androidx.core.view.MotionEventCompat; -import androidx.core.view.ViewCompat; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.LayoutManager; -import androidx.recyclerview.widget.StaggeredGridLayoutManager; +import android.support.v4.view.MotionEventCompat; +import android.support.v4.view.ViewCompat; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.RecyclerView.LayoutManager; +import android.support.v7.widget.StaggeredGridLayoutManager; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.Log; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseFetchLoadAdapter.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseFetchLoadAdapter.java index 4bdad3a84..8d6f3b5bc 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseFetchLoadAdapter.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseFetchLoadAdapter.java @@ -2,12 +2,12 @@ package com.netease.nim.uikit.common.ui.recyclerview.adapter; import android.animation.Animator; import android.content.Context; -import androidx.annotation.IntDef; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.LayoutParams; -import androidx.recyclerview.widget.StaggeredGridLayoutManager; +import android.support.annotation.IntDef; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.RecyclerView.LayoutParams; +import android.support.v7.widget.StaggeredGridLayoutManager; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseItemDraggableAdapter.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseItemDraggableAdapter.java index da0c75645..f543a4043 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseItemDraggableAdapter.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseItemDraggableAdapter.java @@ -1,10 +1,10 @@ package com.netease.nim.uikit.common.ui.recyclerview.adapter; import android.graphics.Canvas; -import androidx.annotation.NonNull; -import androidx.core.view.MotionEventCompat; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; +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 android.view.MotionEvent; import android.view.View; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemFetchLoadAdapter.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemFetchLoadAdapter.java index d961996ab..b58f4e33e 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemFetchLoadAdapter.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemFetchLoadAdapter.java @@ -1,7 +1,7 @@ package com.netease.nim.uikit.common.ui.recyclerview.adapter; -import androidx.annotation.LayoutRes; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.LayoutRes; +import android.support.v7.widget.RecyclerView; import android.util.SparseArray; import android.view.ViewGroup; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemQuickAdapter.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemQuickAdapter.java index 949dce159..3d97ebd20 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemQuickAdapter.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemQuickAdapter.java @@ -1,7 +1,7 @@ package com.netease.nim.uikit.common.ui.recyclerview.adapter; -import androidx.annotation.LayoutRes; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.LayoutRes; +import android.support.v7.widget.RecyclerView; import android.util.SparseArray; import android.view.ViewGroup; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseQuickAdapter.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseQuickAdapter.java index 42fe6e09e..aece9f822 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseQuickAdapter.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseQuickAdapter.java @@ -17,13 +17,13 @@ package com.netease.nim.uikit.common.ui.recyclerview.adapter; import android.animation.Animator; import android.content.Context; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.LayoutParams; -import androidx.recyclerview.widget.StaggeredGridLayoutManager; +import android.support.annotation.IntDef; +import android.support.annotation.IntRange; +import android.support.annotation.NonNull; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.RecyclerView.LayoutParams; +import android.support.v7.widget.StaggeredGridLayoutManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseSectionQuickAdapter.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseSectionQuickAdapter.java index 9724461ca..12c3024ba 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseSectionQuickAdapter.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseSectionQuickAdapter.java @@ -1,6 +1,6 @@ package com.netease.nim.uikit.common.ui.recyclerview.adapter; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; import android.view.ViewGroup; import com.netease.nim.uikit.common.ui.recyclerview.entity.SectionEntity; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/callback/ItemDragAndSwipeCallback.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/callback/ItemDragAndSwipeCallback.java index 8bbb1af6d..e6c3236ed 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/callback/ItemDragAndSwipeCallback.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/callback/ItemDragAndSwipeCallback.java @@ -1,8 +1,8 @@ package com.netease.nim.uikit.common.ui.recyclerview.callback; import android.graphics.Canvas; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.helper.ItemTouchHelper; import android.view.View; import com.netease.nim.uikit.R; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/DividerItemDecoration.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/DividerItemDecoration.java index de0370800..20fb0f314 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/DividerItemDecoration.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/DividerItemDecoration.java @@ -5,8 +5,8 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.view.View; /** @@ -64,7 +64,7 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration { continue; } final View child = parent.getChildAt(i); - RecyclerView v = new RecyclerView(parent.getContext()); + android.support.v7.widget.RecyclerView v = new android.support.v7.widget.RecyclerView(parent.getContext()); final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child .getLayoutParams(); final int top = child.getBottom() + params.bottomMargin; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/SpacingDecoration.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/SpacingDecoration.java index c00a6d4a9..1ab6a8f33 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/SpacingDecoration.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/SpacingDecoration.java @@ -1,10 +1,10 @@ package com.netease.nim.uikit.common.ui.recyclerview.decoration; import android.graphics.Rect; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.StaggeredGridLayoutManager; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.StaggeredGridLayoutManager; import android.view.View; /** diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/BaseViewHolder.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/BaseViewHolder.java index ba3728b06..07fa8bd1e 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/BaseViewHolder.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/BaseViewHolder.java @@ -21,9 +21,9 @@ import android.graphics.Paint; import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Build; -import androidx.annotation.DrawableRes; -import androidx.annotation.StringRes; -import androidx.recyclerview.widget.RecyclerView; +import android.support.annotation.DrawableRes; +import android.support.annotation.StringRes; +import android.support.v7.widget.RecyclerView; import android.text.util.Linkify; import android.util.SparseArray; import android.view.View; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/RecyclerViewHolder.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/RecyclerViewHolder.java index 8a3179aef..74c7722b3 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/RecyclerViewHolder.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/RecyclerViewHolder.java @@ -1,6 +1,6 @@ package com.netease.nim.uikit.common.ui.recyclerview.holder; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; /** * Created by huangjun on 2016/12/11. diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemDragListener.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemDragListener.java index a5c6c5df3..239f1a86c 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemDragListener.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemDragListener.java @@ -1,6 +1,6 @@ package com.netease.nim.uikit.common.ui.recyclerview.listener; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; public interface OnItemDragListener { void onItemDragStart(RecyclerView.ViewHolder viewHolder, int pos); diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemSwipeListener.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemSwipeListener.java index 31d5d2351..d857a3ec0 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemSwipeListener.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemSwipeListener.java @@ -1,7 +1,7 @@ package com.netease.nim.uikit.common.ui.recyclerview.listener; import android.graphics.Canvas; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v7.widget.RecyclerView; public interface OnItemSwipeListener { diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/SimpleClickListener.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/SimpleClickListener.java index eb2a97657..4fae7c6e0 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/SimpleClickListener.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/SimpleClickListener.java @@ -1,8 +1,8 @@ package com.netease.nim.uikit.common.ui.recyclerview.listener; import android.os.Build; -import androidx.core.view.GestureDetectorCompat; -import androidx.recyclerview.widget.RecyclerView; +import android.support.v4.view.GestureDetectorCompat; +import android.support.v7.widget.RecyclerView; import android.view.GestureDetector; import android.view.HapticFeedbackConstants; import android.view.MotionEvent; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/loadmore/LoadMoreView.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/loadmore/LoadMoreView.java index 6ea2a9e34..7a0819a31 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/loadmore/LoadMoreView.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/loadmore/LoadMoreView.java @@ -1,7 +1,7 @@ package com.netease.nim.uikit.common.ui.recyclerview.loadmore; -import androidx.annotation.IdRes; -import androidx.annotation.LayoutRes; +import android.support.annotation.IdRes; +import android.support.annotation.LayoutRes; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseQuickAdapter; import com.netease.nim.uikit.common.ui.recyclerview.holder.BaseViewHolder; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/util/RecyclerViewUtil.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/util/RecyclerViewUtil.java index 9ef6a00a2..8cfa53804 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/util/RecyclerViewUtil.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/util/RecyclerViewUtil.java @@ -1,7 +1,7 @@ package com.netease.nim.uikit.common.ui.recyclerview.util; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.SimpleItemAnimator; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.SimpleItemAnimator; /** * Created by hzxuwen on 2017/1/13. diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/span/RadiusBackgroundSpan.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/span/RadiusBackgroundSpan.java index f9a4be38a..a6cac2f26 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/span/RadiusBackgroundSpan.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/span/RadiusBackgroundSpan.java @@ -2,9 +2,10 @@ package com.netease.nim.uikit.common.ui.span; import android.graphics.Canvas; import android.graphics.Paint; +import android.graphics.Rect; import android.graphics.RectF; -import androidx.annotation.NonNull; - +import android.support.annotation.NonNull; +import android.text.TextPaint; import android.text.style.ReplacementSpan; public class RadiusBackgroundSpan extends ReplacementSpan { diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/widget/ClearableEditTextWithIcon.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/widget/ClearableEditTextWithIcon.java index 5973b4a2c..c8d501b09 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/widget/ClearableEditTextWithIcon.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/widget/ClearableEditTextWithIcon.java @@ -2,7 +2,7 @@ package com.netease.nim.uikit.common.ui.widget; import android.content.Context; import android.graphics.drawable.Drawable; -import androidx.appcompat.widget.AppCompatEditText; +import android.support.v7.widget.AppCompatEditText; import android.text.Editable; import android.text.TextWatcher; import android.util.AttributeSet; diff --git a/nim_uikit/src/com/netease/nim/uikit/support/glide/NIMGlideModule.java b/nim_uikit/src/com/netease/nim/uikit/support/glide/NIMGlideModule.java index 31e3bac40..4df96be19 100644 --- a/nim_uikit/src/com/netease/nim/uikit/support/glide/NIMGlideModule.java +++ b/nim_uikit/src/com/netease/nim/uikit/support/glide/NIMGlideModule.java @@ -1,7 +1,7 @@ package com.netease.nim.uikit.support.glide; import android.content.Context; -import androidx.annotation.NonNull; +import android.support.annotation.NonNull; import com.bumptech.glide.Glide; import com.bumptech.glide.GlideBuilder; @@ -11,10 +11,12 @@ import com.bumptech.glide.load.engine.cache.ExternalPreferredCacheDiskCacheFacto import com.bumptech.glide.manager.ConnectivityMonitor; import com.bumptech.glide.manager.ConnectivityMonitorFactory; import com.bumptech.glide.module.AppGlideModule; +import com.bumptech.glide.util.Synthetic; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.common.util.sys.NetworkUtil; import java.io.File; +import java.util.HashMap; /** * Created by huangjun diff --git a/nim_uikit/src/com/netease/nim/uikit/support/permission/BaseMPermission.java b/nim_uikit/src/com/netease/nim/uikit/support/permission/BaseMPermission.java index 93fb45433..80f95b2b7 100644 --- a/nim_uikit/src/com/netease/nim/uikit/support/permission/BaseMPermission.java +++ b/nim_uikit/src/com/netease/nim/uikit/support/permission/BaseMPermission.java @@ -4,7 +4,7 @@ import android.annotation.TargetApi; import android.app.Activity; import android.content.pm.PackageManager; import android.os.Build; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.util.Log; import java.util.ArrayList; diff --git a/nim_uikit/src/com/netease/nim/uikit/support/permission/MPermission.java b/nim_uikit/src/com/netease/nim/uikit/support/permission/MPermission.java index c821fbf3e..e89d6262f 100644 --- a/nim_uikit/src/com/netease/nim/uikit/support/permission/MPermission.java +++ b/nim_uikit/src/com/netease/nim/uikit/support/permission/MPermission.java @@ -4,8 +4,8 @@ import android.annotation.TargetApi; import android.app.Activity; import android.content.pm.PackageManager; import android.os.Build; -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; +import android.support.annotation.NonNull; +import android.support.v4.app.Fragment; import com.netease.nim.uikit.support.permission.annotation.OnMPermissionDenied; import com.netease.nim.uikit.support.permission.annotation.OnMPermissionGranted;