diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index b2b8218e4..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "xplan-flutter"] - path = xplan-flutter - url = git@codeup.aliyun.com:5ffee48e1e45db3c1cc26eeb/xplan/xplan-flutter.git diff --git a/app/agconnect-services.json b/app/agconnect-services.json index 0f1fc44ca..80b1bb133 100644 --- a/app/agconnect-services.json +++ b/app/agconnect-services.json @@ -23,7 +23,7 @@ "project_id":"736430079245711652", "app_id":"104321113", "api_key":"CwEAAAAAZgS4/Nw1+/PybMG5CZXzJmlHHHnj0Tp2FOXQG3RtKUdpAsiQiXttqCXlHWA8GdUzGjtnq6oQh2Ogfe8JOs8ihePgJLg=", - "package_name":"com.mango.yinyou" + "package_name":"com.mango.moshen" }, "oauth_client":{ "client_id":"104321113", @@ -31,7 +31,7 @@ }, "app_info":{ "app_id":"104321113", - "package_name":"com.mango.yinyou" + "package_name":"com.mango.moshen" }, "service":{ "analytics":{ @@ -53,12 +53,12 @@ "configuration_version":"3.0", "appInfos":[ { - "package_name":"com.mango.yinyou", + "package_name":"com.mango.moshen", "client":{ "app_id":"104321113" }, "app_info":{ - "package_name":"com.mango.yinyou", + "package_name":"com.mango.moshen", "app_id":"104321113" }, "oauth_client":{ diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 0076c356b..782dc1027 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -115,19 +115,19 @@ -keep class com.netease.** {*;} # Presenter 相关 --keep class com.yizhuan.erban.base.** { *; } --keep public class * extends com.yizhuan.erban.base.BaseMvpPresenter --keep public class * extends com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter +-keep class com.mango.moshen.base.** { *; } +-keep public class * extends com.mango.moshen.base.BaseMvpPresenter +-keep public class * extends com.mango.xchat_android_library.base.factory.AbstractMvpPresenter # 云信自定义 ViewHolder 配置 --dontwarn com.yizhuan.erban.ui.im.recent.holder.** --keep class com.yizhuan.erban.ui.im.recent.holder.** {*;} --keep class com.yizhuan.erban.ui.im.chat.** {*;} --keep class com.yizhuan.erban.luckymoney.viewholder.** {*;} --keep class com.yizhuan.erban.share.viewholder.** {*;} --keep class com.yizhuan.erban.public_chat_hall.msg.viewholder.** {*;} --keep class com.yizhuan.erban.module_hall.im.msgholder.** {*;} --keep class com.yizhuan.tutu.mentoring_relationship.viewholder.** {*;} +-dontwarn com.mango.moshen.ui.im.recent.holder.** +-keep class com.mango.moshen.ui.im.recent.holder.** {*;} +-keep class com.mango.moshen.ui.im.chat.** {*;} +-keep class com.mango.moshen.luckymoney.viewholder.** {*;} +-keep class com.mango.moshen.share.viewholder.** {*;} +-keep class com.mango.moshen.public_chat_hall.msg.viewholder.** {*;} +-keep class com.mango.moshen.module_hall.im.msgholder.** {*;} +-keep class com.mango.moshen.mentoring_relationship.viewholder.** {*;} -keep public class * extends com.netease.nim.uikit.common.ui.recyclerview.holder.RecyclerViewHolder {*;} -keep public class * extends com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase {*;} @@ -207,8 +207,8 @@ (...); } --dontwarn com.yizhuan.erban.bindadapter.** --keep class com.yizhuan.erban.bindadapter.** {*;} +-dontwarn com.mango.moshen.bindadapter.** +-keep class com.mango.moshen.bindadapter.** {*;} # Ping++ 混淆过滤 -dontwarn com.pingplusplus.** @@ -239,8 +239,8 @@ # TODO 网络加载 一些业务bean gson 时候混淆问题 -keep class org.json.** {*;} --dontwarn com.yizhuan.xchat_android_core.** --keep class com.yizhuan.xchat_android_core.** {*;} +-dontwarn com.moshen.core.** +-keep class com.mango.core.** {*;} #百度统计 @@ -314,8 +314,8 @@ -keep class com.autonavi.aps.amapapi.model.**{*;} #暂时keep这个View排查华为oom问题 --keep class com.yizhuan.erban.avroom.widget.MicroView{*;} --keep class com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView{*;} +-keep class com.mango.moshen.avroom.widget.MicroView{*;} +-keep class com.mango.moshen.ui.widget.rollviewpager.RollPagerView{*;} #linkedMe -keep class com.microquation.linkedme.android.** { *; } @@ -373,7 +373,7 @@ -dontwarn com.meizu.cloud.** -keep class com.meizu.cloud.** {*;} --keep class com.yizhuan.erban.ui.widget.AppBarLayoutBehavior {*;} +-keep class com.mango.moshen.ui.widget.AppBarLayoutBehavior {*;} #ViewBinding使用的反射生成的对应Binding -keepclassmembers class * implements androidx.viewbinding.ViewBinding { @@ -448,10 +448,10 @@ -keep class com.zego.**{*;} --keep class com.mango.plugin.**{*;} +-keep class com.yinyou.plugin.**{*;} -keep class android.support.v8.renderscript.** { *; } -keep class androidx.renderscript.** { *; } --keep class com.mango.plugin.**{*;} +-keep class com.yinyou.plugin.**{*;} diff --git a/core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/mango/moshen/ExampleInstrumentedTest.java similarity index 83% rename from core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/mango/moshen/ExampleInstrumentedTest.java index 0084f1221..9b867e1e7 100644 --- a/core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/mango/moshen/ExampleInstrumentedTest.java @@ -1,9 +1,10 @@ -package com.yizhuan.xchat_android_core; +package com.mango.moshen; import android.content.Context; import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.ext.junit.runners.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; @@ -21,6 +22,7 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("com.yizhuan.xchat_android_core.test", appContext.getPackageName()); + assertEquals("com.mango.moshen_android_client", appContext.getPackageName()); } + } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index defcd88fe..e2952bf35 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="com.mango.moshen"> @@ -398,7 +398,7 @@ android:screenOrientation="behind" android:windowSoftInputMode="adjustResize|stateHidden" /> @@ -407,12 +407,12 @@ + android:targetActivity="com.mango.core.pay.PaymentActivity" /> @@ -542,12 +542,12 @@ android:label="黑名单" android:screenOrientation="portrait" /> @@ -973,26 +973,26 @@ android:screenOrientation="portrait" /> @@ -1217,7 +1217,7 @@ android:name=".vip.VipSettingActivity" 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..6c6d29a95 100644 --- a/app/src/main/java/com/jph/takephoto/app/TakePhotoActivity.java +++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoActivity.java @@ -12,8 +12,8 @@ import com.jph.takephoto.permission.InvokeListener; import com.jph.takephoto.permission.PermissionManager; import com.jph.takephoto.permission.PermissionManager.TPermissionType; import com.jph.takephoto.permission.TakePhotoInvocationHandler; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; /** * 继承这个类来让Activity获取拍照的能力
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..a66d62b59 100644 --- a/app/src/main/java/com/jph/takephoto/app/TakePhotoFragment.java +++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoFragment.java @@ -11,7 +11,7 @@ import com.jph.takephoto.model.TResult; import com.jph.takephoto.permission.InvokeListener; import com.jph.takephoto.permission.PermissionManager; import com.jph.takephoto.permission.TakePhotoInvocationHandler; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * 继承这个类来让Fragment获取拍照的能力
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..9aedb219b 100644 --- a/app/src/main/java/com/jph/takephoto/app/TakePhotoFragmentActivity.java +++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoFragmentActivity.java @@ -11,7 +11,7 @@ import com.jph.takephoto.model.TResult; import com.jph.takephoto.permission.InvokeListener; import com.jph.takephoto.permission.PermissionManager; import com.jph.takephoto.permission.TakePhotoInvocationHandler; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * 继承这个类来让Activity获取拍照的能力
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..5a5b0bc6f 100644 --- a/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java +++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java @@ -34,8 +34,8 @@ import com.jph.takephoto.uitl.TUriParse; import com.jph.takephoto.uitl.TUtils; import com.orhanobut.logger.Logger; import com.soundcloud.android.crop.Crop; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.io.File; import java.util.ArrayList; 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..b29f1c52d 100644 --- a/app/src/main/java/com/jph/takephoto/permission/PermissionManager.java +++ b/app/src/main/java/com/jph/takephoto/permission/PermissionManager.java @@ -12,8 +12,8 @@ import com.jph.takephoto.app.TakePhoto; import com.jph.takephoto.model.InvokeParam; import com.jph.takephoto.model.TContextWrap; import com.jph.takephoto.uitl.TConstant; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java b/app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java index 33711c70e..a91a9cdc8 100644 --- a/app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java +++ b/app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java @@ -12,8 +12,8 @@ import android.webkit.MimeTypeMap; import com.jph.takephoto.model.TException; import com.jph.takephoto.model.TExceptionType; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.io.ByteArrayOutputStream; import java.io.File; 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..fe7ea5f6c 100644 --- a/app/src/main/java/com/jph/takephoto/uitl/TUtils.java +++ b/app/src/main/java/com/jph/takephoto/uitl/TUtils.java @@ -19,8 +19,8 @@ import com.jph.takephoto.model.TExceptionType; import com.jph.takephoto.model.TImage; import com.jph.takephoto.model.TIntentWap; import com.soundcloud.android.crop.Crop; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/ErbanTakePhotoActivity.java b/app/src/main/java/com/mango/moshen/ErbanTakePhotoActivity.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ErbanTakePhotoActivity.java rename to app/src/main/java/com/mango/moshen/ErbanTakePhotoActivity.java index 21bf0c493..fd47532a7 100644 --- a/app/src/main/java/com/yizhuan/erban/ErbanTakePhotoActivity.java +++ b/app/src/main/java/com/mango/moshen/ErbanTakePhotoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.mango.moshen; import android.app.Activity; import android.content.Context; @@ -10,8 +10,8 @@ import com.jph.takephoto.app.TakePhotoActivity; import com.jph.takephoto.compress.CompressConfig; import com.jph.takephoto.model.CropOptions; import com.jph.takephoto.model.TResult; -import com.yizhuan.erban.common.permission.PermissionActivity; -import com.yizhuan.xchat_android_library.utils.file.JXFileUtils; +import com.mango.moshen.common.permission.PermissionActivity; +import com.mango.xchat_android_library.utils.file.JXFileUtils; import java.io.File; diff --git a/app/src/main/java/com/yizhuan/erban/GuideAdapter.java b/app/src/main/java/com/mango/moshen/GuideAdapter.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/GuideAdapter.java rename to app/src/main/java/com/mango/moshen/GuideAdapter.java index 0dbc2f47f..5dd755261 100644 --- a/app/src/main/java/com/yizhuan/erban/GuideAdapter.java +++ b/app/src/main/java/com/mango/moshen/GuideAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.mango.moshen; import android.content.Context; import androidx.viewpager.widget.PagerAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/mango/moshen/MainActivity.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/MainActivity.java rename to app/src/main/java/com/mango/moshen/MainActivity.java index 263eba362..b9b3b7822 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/mango/moshen/MainActivity.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban; +package com.mango.moshen; -import static com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE; +import static com.mango.core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE; import android.animation.ObjectAnimator; import android.annotation.SuppressLint; @@ -20,7 +20,6 @@ import android.view.animation.LinearInterpolator; import android.widget.LinearLayout; import android.widget.TextView; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; @@ -42,86 +41,86 @@ import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; import com.orhanobut.logger.Logger; import com.tencent.bugly.crashreport.CrashReport; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.application.ActivityStackManager; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.avroom.ktv.KtvMusicManager; -import com.yizhuan.erban.avroom.newuserchargegift.NewUserChargeGiftDialog; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.common.widget.DragLayout; -import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity; -import com.yizhuan.erban.community.publish.view.PublishActivity; -import com.yizhuan.erban.community.square.SquareFragment; -import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; -import com.yizhuan.erban.home.HomeViewModel; -import com.yizhuan.erban.home.dialog.NewUserHelloDialog; -import com.yizhuan.erban.home.dialog.ProtocolUpdateDialog; -import com.yizhuan.erban.home.fragment.ContactsListFragment; -import com.yizhuan.erban.home.fragment.HomeFragment; -import com.yizhuan.erban.home.fragment.MeFragment; -import com.yizhuan.erban.home.presenter.MainPresenter; -import com.yizhuan.erban.home.view.IMainView; -import com.yizhuan.erban.home.widget.AnchorCardView; -import com.yizhuan.erban.main.helper.NoticationsUiHelper; -import com.yizhuan.erban.miniworld.activity.MiniWorldGuestPageActivity; -import com.yizhuan.erban.module.Extras; -import com.yizhuan.erban.module_hall.secretcode.PwdCodeMgr; -import com.yizhuan.erban.quick_pass.QuickPassLoginAct; -import com.yizhuan.erban.service.DaemonService; -import com.yizhuan.erban.ui.im.ImInitHelper; -import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.erban.ui.login.BindPhoneActivity; -import com.yizhuan.erban.ui.login.fragment.AddUserInfoFragment; -import com.yizhuan.erban.ui.patriarch.help.LimitEnterRoomHelper; -import com.yizhuan.erban.ui.patriarch.help.PmDialogShowMrg; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.LivingIconView; -import com.yizhuan.erban.ui.widget.MainTabLayout; -import com.yizhuan.erban.utils.CleanLeakUtils; -import com.yizhuan.erban.utils.PushMessageHandler; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.KickOutEvent; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel; -import com.yizhuan.xchat_android_core.community.event.SquareTaskEvent; -import com.yizhuan.xchat_android_core.community.event.UnReadCountEvent; -import com.yizhuan.xchat_android_core.home.bean.MainTabType; -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent; -import com.yizhuan.xchat_android_core.home.event.VisitorUnreadCountEvent; -import com.yizhuan.xchat_android_core.home.model.GameHomeModel; -import com.yizhuan.xchat_android_core.home.model.HomeModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.linked.LinkedModel; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMBroadcastManager; -import com.yizhuan.xchat_android_core.manager.IMMessageManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.patriarch.event.CloseMinRoomEvent; -import com.yizhuan.xchat_android_core.patriarch.event.ImPushMsgPmLimitTimeEvent; -import com.yizhuan.xchat_android_core.patriarch.event.PmDismissAllLimitDialogEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -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.LoadLoginUserInfoEvent; -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.CurrentTimeUtils; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.StringUtils; -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; +import com.mango.moshen.application.ActivityStackManager; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.avroom.ktv.KtvMusicManager; +import com.mango.moshen.avroom.newuserchargegift.NewUserChargeGiftDialog; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.common.widget.DragLayout; +import com.mango.moshen.community.dynamic.view.DynamicDetailActivity; +import com.mango.moshen.community.publish.view.PublishActivity; +import com.mango.moshen.community.square.SquareFragment; +import com.mango.moshen.family.view.activity.FamilyHomeActivity; +import com.mango.moshen.home.HomeViewModel; +import com.mango.moshen.home.dialog.NewUserHelloDialog; +import com.mango.moshen.home.dialog.ProtocolUpdateDialog; +import com.mango.moshen.home.fragment.ContactsListFragment; +import com.mango.moshen.home.fragment.HomeFragment; +import com.mango.moshen.home.fragment.MeFragment; +import com.mango.moshen.home.presenter.MainPresenter; +import com.mango.moshen.home.view.IMainView; +import com.mango.moshen.home.widget.AnchorCardView; +import com.mango.moshen.main.helper.NoticationsUiHelper; +import com.mango.moshen.miniworld.activity.MiniWorldGuestPageActivity; +import com.mango.moshen.module.Extras; +import com.mango.moshen.module_hall.secretcode.PwdCodeMgr; +import com.mango.moshen.quick_pass.QuickPassLoginAct; +import com.mango.moshen.service.DaemonService; +import com.mango.moshen.ui.im.ImInitHelper; +import com.mango.moshen.ui.im.avtivity.NimP2PMessageActivity; +import com.mango.moshen.ui.login.BindPhoneActivity; +import com.mango.moshen.ui.login.fragment.AddUserInfoFragment; +import com.mango.moshen.ui.patriarch.help.LimitEnterRoomHelper; +import com.mango.moshen.ui.patriarch.help.PmDialogShowMrg; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.ui.widget.LivingIconView; +import com.mango.moshen.ui.widget.MainTabLayout; +import com.mango.moshen.utils.CleanLeakUtils; +import com.mango.moshen.utils.PushMessageHandler; +import com.mango.core.Constants; +import com.mango.core.DemoCache; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.event.KickOutEvent; +import com.mango.core.auth.event.LoginEvent; +import com.mango.core.auth.event.LogoutEvent; +import com.mango.core.channel_page.model.ChannelPageModel; +import com.mango.core.community.event.SquareTaskEvent; +import com.mango.core.community.event.UnReadCountEvent; +import com.mango.core.home.bean.MainTabType; +import com.mango.core.home.event.RefreshHomeDataEvent; +import com.mango.core.home.event.VisitorUnreadCountEvent; +import com.mango.core.home.model.GameHomeModel; +import com.mango.core.home.model.HomeModel; +import com.mango.core.initial.InitialModel; +import com.mango.core.linked.LinkedModel; +import com.mango.core.linked.bean.LinkedInfo; +import com.mango.core.manager.AudioEngineManager; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMBroadcastManager; +import com.mango.core.manager.IMMessageManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.patriarch.event.CloseMinRoomEvent; +import com.mango.core.patriarch.event.ImPushMsgPmLimitTimeEvent; +import com.mango.core.patriarch.event.PmDismissAllLimitDialogEvent; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.user.event.LoadLoginUserInfoEvent; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.core.user.event.NeedBindPhoneEvent; +import com.mango.core.user.event.NeedCompleteInfoEvent; +import com.mango.core.utils.CurrentTimeUtils; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.StringUtils; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.threadmgr.ThreadPoolManager; +import com.mango.xchat_android_library.utils.JavaUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/MiddleActivity.java b/app/src/main/java/com/mango/moshen/MiddleActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/MiddleActivity.java rename to app/src/main/java/com/mango/moshen/MiddleActivity.java index f2e5efc71..b9436cad4 100644 --- a/app/src/main/java/com/yizhuan/erban/MiddleActivity.java +++ b/app/src/main/java/com/mango/moshen/MiddleActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.mango.moshen; import android.os.Bundle; import android.util.Log; @@ -6,9 +6,9 @@ import android.util.Log; import com.microquation.linkedme.android.LinkedME; import com.microquation.linkedme.android.util.LinkProperties; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.xchat_android_core.linked.LinkedModel; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; +import com.mango.moshen.base.BaseActivity; +import com.mango.core.linked.LinkedModel; +import com.mango.core.linked.bean.LinkedInfo; import java.util.HashMap; diff --git a/app/src/main/java/com/yizhuan/erban/NimMiddleActivity.java b/app/src/main/java/com/mango/moshen/NimMiddleActivity.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/NimMiddleActivity.java rename to app/src/main/java/com/mango/moshen/NimMiddleActivity.java index 457387207..49364e22a 100644 --- a/app/src/main/java/com/yizhuan/erban/NimMiddleActivity.java +++ b/app/src/main/java/com/mango/moshen/NimMiddleActivity.java @@ -1,31 +1,28 @@ -package com.yizhuan.erban; +package com.mango.moshen; import android.content.Intent; import android.os.Bundle; -import android.text.TextUtils; import android.util.Log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.coorchice.library.utils.LogUtils; -import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.NimIntent; -import com.netease.nimlib.sdk.mixpush.MixPushService; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.radish.signin.SignInActivity; -import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.utils.PushMessageHandler; -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.OpenRoomNotiAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomInviteFansAttachment; -import com.yizhuan.xchat_android_library.utils.UIUtils; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.radish.signin.SignInActivity; +import com.mango.moshen.ui.im.avtivity.NimP2PMessageActivity; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.utils.PushMessageHandler; +import com.mango.core.auth.AuthModel; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.OpenRoomNotiAttachment; +import com.mango.core.im.custom.bean.OpenSignInAttachment; +import com.mango.core.im.custom.bean.RedPackageAttachment; +import com.mango.core.im.custom.bean.RoomInviteFansAttachment; +import com.mango.xchat_android_library.utils.UIUtils; import java.util.ArrayList; import java.util.Map; diff --git a/app/src/main/java/com/yizhuan/erban/UIHelper.java b/app/src/main/java/com/mango/moshen/UIHelper.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/UIHelper.java rename to app/src/main/java/com/mango/moshen/UIHelper.java index b7d0030e2..ad93bce25 100644 --- a/app/src/main/java/com/yizhuan/erban/UIHelper.java +++ b/app/src/main/java/com/mango/moshen/UIHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.mango.moshen; import android.app.Activity; import android.content.ComponentName; @@ -9,19 +9,19 @@ import android.provider.Settings; import androidx.fragment.app.Fragment; -import com.yizhuan.erban.audio.AudioRecordActivity; -import com.yizhuan.erban.audio.MyVoiceActivity; -import com.yizhuan.erban.audio.RecordingVoiceActivity; -import com.yizhuan.erban.ui.login.AddUserInfoActivity; -import com.yizhuan.erban.ui.login.ModifyInfoActivity; -import com.yizhuan.erban.ui.setting.SettingActivity; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.erban.ui.user.UserInfoModifyActivity; -import com.yizhuan.erban.ui.user.UserModifyPhotosActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; +import com.mango.moshen.audio.AudioRecordActivity; +import com.mango.moshen.audio.MyVoiceActivity; +import com.mango.moshen.audio.RecordingVoiceActivity; +import com.mango.moshen.ui.login.AddUserInfoActivity; +import com.mango.moshen.ui.login.ModifyInfoActivity; +import com.mango.moshen.ui.setting.SettingActivity; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.moshen.ui.user.UserInfoModifyActivity; +import com.mango.moshen.ui.user.UserModifyPhotosActivity; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.core.UriProvider; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; /** diff --git a/app/src/main/java/com/yizhuan/erban/UserGuideActivity.java b/app/src/main/java/com/mango/moshen/UserGuideActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/UserGuideActivity.java rename to app/src/main/java/com/mango/moshen/UserGuideActivity.java index 1ac99c395..b56252ead 100644 --- a/app/src/main/java/com/yizhuan/erban/UserGuideActivity.java +++ b/app/src/main/java/com/mango/moshen/UserGuideActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.mango.moshen; import android.content.Context; import android.content.Intent; @@ -7,8 +7,8 @@ import androidx.viewpager.widget.ViewPager; import android.view.View; import android.widget.ImageView; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.xchat_android_core.PreferencesUtils; +import com.mango.moshen.base.BaseActivity; +import com.mango.core.PreferencesUtils; public class UserGuideActivity extends BaseActivity { diff --git a/app/src/main/java/com/yizhuan/erban/application/ActivityLifeManager.java b/app/src/main/java/com/mango/moshen/application/ActivityLifeManager.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/application/ActivityLifeManager.java rename to app/src/main/java/com/mango/moshen/application/ActivityLifeManager.java index 7948f13ad..b981a5b09 100644 --- a/app/src/main/java/com/yizhuan/erban/application/ActivityLifeManager.java +++ b/app/src/main/java/com/mango/moshen/application/ActivityLifeManager.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.application; +package com.mango.moshen.application; import android.app.Activity; import android.app.Application; import android.os.Bundle; -import com.yizhuan.erban.location.LocationManager; -import com.yizhuan.xchat_android_core.auth.AuthModel; +import com.mango.moshen.location.LocationManager; +import com.mango.core.auth.AuthModel; /** * activity的管理 diff --git a/app/src/main/java/com/yizhuan/erban/application/ActivityStackManager.java b/app/src/main/java/com/mango/moshen/application/ActivityStackManager.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/application/ActivityStackManager.java rename to app/src/main/java/com/mango/moshen/application/ActivityStackManager.java index b334ea18c..9a3df924c 100644 --- a/app/src/main/java/com/yizhuan/erban/application/ActivityStackManager.java +++ b/app/src/main/java/com/mango/moshen/application/ActivityStackManager.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.application; +package com.mango.moshen.application; import android.app.Activity; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.utils.ActWhiteListMrg; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.utils.ActWhiteListMrg; import java.lang.ref.WeakReference; @@ -18,7 +18,7 @@ public class ActivityStackManager { /** * 用于保持最顶的Activity实例，排除中转的activity - * 比如{@link com.yizhuan.erban.MiddleActivity} + * 比如{@link com.mango.moshen.MiddleActivity} */ @Getter private WeakReference topUpgradeWeakRef; diff --git a/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java b/app/src/main/java/com/mango/moshen/application/GlobalHandleManager.java similarity index 75% rename from app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java rename to app/src/main/java/com/mango/moshen/application/GlobalHandleManager.java index 0891c0595..e417d14c7 100644 --- a/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java +++ b/app/src/main/java/com/mango/moshen/application/GlobalHandleManager.java @@ -1,30 +1,30 @@ -package com.yizhuan.erban.application; +package com.mango.moshen.application; import android.app.Activity; import com.tencent.bugly.beta.Beta; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.yizhuan.erban.avroom.newuserchargegift.NewUserChargePrizeDialog; -import com.yizhuan.erban.relation.cp.dialog.CpGlobalDialog; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.LevelUpDialog; -import com.yizhuan.erban.ui.widget.RecallDialog; -import com.yizhuan.erban.ui.widget.lottery_dialog.LotteryDialogManager; -import com.yizhuan.erban.vip.VipUpgradeDialog; -import com.yizhuan.xchat_android_core.activity.bean.LotteryInfo; -import com.yizhuan.xchat_android_core.level.event.CharmLevelUpEvent; -import com.yizhuan.xchat_android_core.level.event.LevelUpEvent; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.pay.bean.ShowCommonWebEvent; -import com.yizhuan.xchat_android_core.pay.event.NewUserChargeEvent; -import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo; -import com.yizhuan.xchat_android_core.recall.event.CheckLostUserEvent; -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo; -import com.yizhuan.xchat_android_core.upgrade.event.ImPushUpdateAppEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.vip.VipUpgradeEvent; +import com.mango.moshen.avroom.newuserchargegift.NewUserChargePrizeDialog; +import com.mango.moshen.relation.cp.dialog.CpGlobalDialog; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.ui.widget.LevelUpDialog; +import com.mango.moshen.ui.widget.RecallDialog; +import com.mango.moshen.ui.widget.lottery_dialog.LotteryDialogManager; +import com.mango.moshen.vip.VipUpgradeDialog; +import com.mango.core.activity.bean.LotteryInfo; +import com.mango.core.level.event.CharmLevelUpEvent; +import com.mango.core.level.event.LevelUpEvent; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.pay.bean.ShowCommonWebEvent; +import com.mango.core.pay.event.NewUserChargeEvent; +import com.mango.core.recall.bean.CheckLostUserInfo; +import com.mango.core.recall.event.CheckLostUserEvent; +import com.mango.core.relation.cp.CpInviteInfo; +import com.mango.core.upgrade.event.ImPushUpdateAppEvent; +import com.mango.core.user.UserModel; +import com.mango.core.utils.ActivityUtil; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.vip.VipUpgradeEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/mango/moshen/application/XChatApplication.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/application/XChatApplication.java rename to app/src/main/java/com/mango/moshen/application/XChatApplication.java index ba980c678..928a6b945 100644 --- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java +++ b/app/src/main/java/com/mango/moshen/application/XChatApplication.java @@ -1,19 +1,19 @@ -package com.yizhuan.erban.application; +package com.mango.moshen.application; -import static com.yizhuan.xchat_android_constants.XChatConstants.HW_APP_ID; -import static com.yizhuan.xchat_android_constants.XChatConstants.HW_CERTIFICATE_NAME; -import static com.yizhuan.xchat_android_constants.XChatConstants.MZ_APP_ID; -import static com.yizhuan.xchat_android_constants.XChatConstants.MZ_APP_KEY; -import static com.yizhuan.xchat_android_constants.XChatConstants.MZ_CERTIFICATE_NAME; -import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_APP_ID; -import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_APP_KEY; -import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_CERTIFICATE_NAME; -import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_SECRET; -import static com.yizhuan.xchat_android_constants.XChatConstants.VIVO_CERTIFICATE_NAME; -import static com.yizhuan.xchat_android_constants.XChatConstants.XM_APP_ID; -import static com.yizhuan.xchat_android_constants.XChatConstants.XM_APP_KEY; -import static com.yizhuan.xchat_android_constants.XChatConstants.XM_CERTIFICATE_NAME; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; +import static com.mango.xchat_android_constants.XChatConstants.HW_APP_ID; +import static com.mango.xchat_android_constants.XChatConstants.HW_CERTIFICATE_NAME; +import static com.mango.xchat_android_constants.XChatConstants.MZ_APP_ID; +import static com.mango.xchat_android_constants.XChatConstants.MZ_APP_KEY; +import static com.mango.xchat_android_constants.XChatConstants.MZ_CERTIFICATE_NAME; +import static com.mango.xchat_android_constants.XChatConstants.OPPO_APP_ID; +import static com.mango.xchat_android_constants.XChatConstants.OPPO_APP_KEY; +import static com.mango.xchat_android_constants.XChatConstants.OPPO_CERTIFICATE_NAME; +import static com.mango.xchat_android_constants.XChatConstants.OPPO_SECRET; +import static com.mango.xchat_android_constants.XChatConstants.VIVO_CERTIFICATE_NAME; +import static com.mango.xchat_android_constants.XChatConstants.XM_APP_ID; +import static com.mango.xchat_android_constants.XChatConstants.XM_APP_KEY; +import static com.mango.xchat_android_constants.XChatConstants.XM_CERTIFICATE_NAME; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -62,56 +62,56 @@ import com.tencent.bugly.crashreport.CrashReport; import com.tencent.vasdolly.helper.ChannelReaderUtil; import com.umeng.analytics.MobclickAgent; import com.umeng.commonsdk.UMConfigure; -import com.yizhuan.erban.BuildConfig; -import com.yizhuan.erban.MainActivity; -import com.yizhuan.erban.MiddleActivity; -import com.yizhuan.erban.NimMiddleActivity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.module_hall.HallDataManager; -import com.yizhuan.erban.other.activity.SplashActivity; -import com.yizhuan.erban.quick_pass.QuickPassLoginAct; -import com.yizhuan.erban.radish.wallet.RadishWalletManager; -import com.yizhuan.erban.utils.PushMessageHandler; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.Env; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.channel.ChannelModel; -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.initial.InitialModel; -import com.yizhuan.xchat_android_core.interceptor.NoParamsInterceptor; -import com.yizhuan.xchat_android_core.interceptor.ParamsInterceptor; -import com.yizhuan.xchat_android_core.manager.IMMessageManager; -import com.yizhuan.xchat_android_core.manager.IMSystemMsgManager; -import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; -import com.yizhuan.xchat_android_core.mentoring_relationship.model.MentoringRelationshipModel; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel; -import com.yizhuan.xchat_android_core.radish.RadishModel; -import com.yizhuan.xchat_android_core.radish.signin.bean.ImNotice; -import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; -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.event.NeedCompleteInfoEvent; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.ServerException; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.net.rxnet.converter.GsonConverterPlugins; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.AppUtils; -import com.yizhuan.xchat_android_library.utils.DeviceUuidFactory; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.SystemUtils; -import com.yizhuan.xchat_android_library.utils.VersionUtil; -import com.yizhuan.xchat_android_library.utils.codec.MD5Utils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.BuildConfig; +import com.mango.moshen.MainActivity; +import com.mango.moshen.MiddleActivity; +import com.mango.moshen.NimMiddleActivity; +import com.mango.moshen.R; +import com.mango.moshen.module_hall.HallDataManager; +import com.mango.moshen.other.activity.SplashActivity; +import com.mango.moshen.quick_pass.QuickPassLoginAct; +import com.mango.moshen.radish.wallet.RadishWalletManager; +import com.mango.moshen.utils.PushMessageHandler; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.Constants; +import com.mango.core.DemoCache; +import com.mango.core.Env; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.channel.ChannelModel; +import com.mango.core.family.model.FamilyModel; +import com.mango.core.gift.GiftModel; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.OpenSignInAttachment; +import com.mango.core.initial.InitialModel; +import com.mango.core.interceptor.NoParamsInterceptor; +import com.mango.core.interceptor.ParamsInterceptor; +import com.mango.core.manager.IMMessageManager; +import com.mango.core.manager.IMSystemMsgManager; +import com.mango.core.market_verify.MarketVerifyModel; +import com.mango.core.mentoring_relationship.model.MentoringRelationshipModel; +import com.mango.core.pay.PayModel; +import com.mango.core.public_chat_hall.model.PublicChatHallModel; +import com.mango.core.radish.RadishModel; +import com.mango.core.radish.signin.bean.ImNotice; +import com.mango.core.room.face.DynamicFaceModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.user.event.NeedCompleteInfoEvent; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.ServerException; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.net.rxnet.converter.GsonConverterPlugins; +import com.mango.xchat_android_library.utils.AppMetaDataUtil; +import com.mango.xchat_android_library.utils.AppUtils; +import com.mango.xchat_android_library.utils.DeviceUuidFactory; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.SystemUtils; +import com.mango.xchat_android_library.utils.VersionUtil; +import com.mango.xchat_android_library.utils.codec.MD5Utils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/erban/audio/AudioRecordActivity.java b/app/src/main/java/com/mango/moshen/audio/AudioRecordActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/audio/AudioRecordActivity.java rename to app/src/main/java/com/mango/moshen/audio/AudioRecordActivity.java index f457e580e..1f6a505fa 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/AudioRecordActivity.java +++ b/app/src/main/java/com/mango/moshen/audio/AudioRecordActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.audio; +package com.mango.moshen.audio; import android.annotation.SuppressLint; import android.content.Intent; @@ -12,22 +12,20 @@ import com.netease.nimlib.sdk.media.player.OnPlayListener; import com.netease.nimlib.sdk.media.record.AudioRecorder; import com.netease.nimlib.sdk.media.record.IAudioRecordCallback; import com.netease.nimlib.sdk.media.record.RecordType; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.databinding.ActivityAudiorecordBinding; -import com.yizhuan.xchat_android_core.audio.AudioPlayAndRecordManager; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.file.FileModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.log.MLog; - -import org.greenrobot.eventbus.EventBus; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.databinding.ActivityAudiorecordBinding; +import com.mango.core.audio.AudioPlayAndRecordManager; +import com.mango.core.auth.AuthModel; +import com.mango.core.file.FileModel; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.log.MLog; import java.io.File; diff --git a/app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java b/app/src/main/java/com/mango/moshen/audio/MyVoiceActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java rename to app/src/main/java/com/mango/moshen/audio/MyVoiceActivity.java index a3dbcbf27..9159f1130 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java +++ b/app/src/main/java/com/mango/moshen/audio/MyVoiceActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.audio; +package com.mango.moshen.audio; import android.Manifest; import android.content.Intent; @@ -9,22 +9,22 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import android.view.View; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.audio.adapter.MyVoiceListAdapter; -import com.yizhuan.erban.audio.helper.AudioPlayerHelper; -import com.yizhuan.erban.audio.presenter.MyVoicePresenter; -import com.yizhuan.erban.audio.view.IMyVoiceView; -import com.yizhuan.erban.base.BaseMvpActivity; -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.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.audio.adapter.MyVoiceListAdapter; +import com.mango.moshen.audio.helper.AudioPlayerHelper; +import com.mango.moshen.audio.presenter.MyVoicePresenter; +import com.mango.moshen.audio.view.IMyVoiceView; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.recyclerview.decoration.HorizontalDecoration; +import com.mango.core.audio.bean.UserVoiceInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.log.MLog; import java.util.List; @@ -99,7 +99,7 @@ public class MyVoiceActivity extends BaseMvpActivity { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomRankListActivity.java b/app/src/main/java/com/mango/moshen/avroom/activity/RoomRankListActivity.java similarity index 80% rename from app/src/main/java/com/yizhuan/erban/avroom/activity/RoomRankListActivity.java rename to app/src/main/java/com/mango/moshen/avroom/activity/RoomRankListActivity.java index e4888a949..5336688dd 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomRankListActivity.java +++ b/app/src/main/java/com/mango/moshen/avroom/activity/RoomRankListActivity.java @@ -1,23 +1,21 @@ -package com.yizhuan.erban.avroom.activity; +package com.mango.moshen.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.view.View; -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.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 com.mango.moshen.R; +import com.mango.moshen.avroom.fragment.RoomCharmListFragment; +import com.mango.moshen.avroom.fragment.RoomContributeListFragment; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.databinding.ActivityRoomRankListBinding; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.xchat_android_library.annatation.ActLayoutRes; 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/mango/moshen/avroom/activity/RoomSettingActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/avroom/activity/RoomSettingActivity.java rename to app/src/main/java/com/mango/moshen/avroom/activity/RoomSettingActivity.java index fb7537814..0cf9d9041 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomSettingActivity.java +++ b/app/src/main/java/com/mango/moshen/avroom/activity/RoomSettingActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.activity; +package com.mango.moshen.avroom.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -16,45 +16,45 @@ import androidx.databinding.DataBindingUtil; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.dialog.SelectLabelDialog; -import com.yizhuan.erban.avroom.presenter.RoomSettingPresenter; -import com.yizhuan.erban.avroom.view.IRoomSettingView; -import com.yizhuan.erban.avroom.widget.EditRoomTitleDialog; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.databinding.ActivityRoomSettingBinding; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.KickOutEvent; -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.RoomNoticeAttachment; -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; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomMessageViewNoticeInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo; -import com.yizhuan.xchat_android_core.room.bean.SingleRoomSortInfo; -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.RoomSettingModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; -import com.yizhuan.xchat_android_library.utils.CommonUtils; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.R; +import com.mango.moshen.avroom.dialog.SelectLabelDialog; +import com.mango.moshen.avroom.presenter.RoomSettingPresenter; +import com.mango.moshen.avroom.view.IRoomSettingView; +import com.mango.moshen.avroom.widget.EditRoomTitleDialog; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.databinding.ActivityRoomSettingBinding; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.utils.RegexUtil; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.event.KickOutEvent; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.RoomNoticeAttachment; +import com.mango.core.kick.KickModel; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomMessageViewNoticeInfo; +import com.mango.core.room.bean.RoomSettingTabInfo; +import com.mango.core.room.bean.SingleRoomSortInfo; +import com.mango.core.room.giftvalue.GiftValueModel; +import com.mango.core.room.giftvalue.helper.GiftValueMrg; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.room.model.RoomSettingModel; +import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.xchat_android_library.utils.CommonUtils; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.codec.DESUtils; +import com.mango.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/activity/RoomTitleEditActivity.java b/app/src/main/java/com/mango/moshen/avroom/activity/RoomTitleEditActivity.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/avroom/activity/RoomTitleEditActivity.java rename to app/src/main/java/com/mango/moshen/avroom/activity/RoomTitleEditActivity.java index ab2828d65..da24a4aeb 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/RoomTitleEditActivity.java +++ b/app/src/main/java/com/mango/moshen/avroom/activity/RoomTitleEditActivity.java @@ -1,25 +1,23 @@ -package com.yizhuan.erban.avroom.activity; +package com.mango.moshen.avroom.activity; import android.app.Activity; import android.content.Intent; -import android.os.Bundle; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; import android.view.View; -import android.widget.Toast; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.databinding.ActivityRoomTitleEditBinding; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.databinding.ActivityRoomTitleEditBinding; +import com.mango.core.auth.AuthModel; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.model.RoomSettingModel; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.SingleToastUtil; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/AuctionListAdapter.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/AuctionListAdapter.java index 4f70f59e0..369d7f518 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/AuctionListAdapter.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; -import com.yizhuan.xchat_android_library.list.ArrayListAdapter; -import com.yizhuan.xchat_android_library.list.ListItem; +import com.mango.xchat_android_library.list.ArrayListAdapter; +import com.mango.xchat_android_library.list.ListItem; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListEmptyItem.java b/app/src/main/java/com/mango/moshen/avroom/adapter/AuctionListEmptyItem.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListEmptyItem.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/AuctionListEmptyItem.java index d88bb3e44..fff708dd3 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListEmptyItem.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/AuctionListEmptyItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -6,9 +6,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.list.BaseGroupItem; -import com.yizhuan.xchat_android_library.list.ViewHolder; +import com.mango.moshen.R; +import com.mango.xchat_android_library.list.BaseGroupItem; +import com.mango.xchat_android_library.list.ViewHolder; /** * Created by chenran on 2017/8/9. diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListHeaderItem.java b/app/src/main/java/com/mango/moshen/avroom/adapter/AuctionListHeaderItem.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListHeaderItem.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/AuctionListHeaderItem.java index b4bd0d880..efc439526 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListHeaderItem.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/AuctionListHeaderItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -6,9 +6,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.list.BaseGroupItem; -import com.yizhuan.xchat_android_library.list.ViewHolder; +import com.mango.moshen.R; +import com.mango.xchat_android_library.list.BaseGroupItem; +import com.mango.xchat_android_library.list.ViewHolder; /** * Created by chenran on 2017/8/9. diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListItem.java b/app/src/main/java/com/mango/moshen/avroom/adapter/AuctionListItem.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListItem.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/AuctionListItem.java index 1e58fe649..0ba7b224f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListItem.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/AuctionListItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.content.Context; import android.graphics.Color; @@ -9,12 +9,12 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionListUserInfo; -import com.yizhuan.xchat_android_library.list.BaseGroupItem; -import com.yizhuan.xchat_android_library.list.ViewHolder; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.room.auction.bean.AuctionListUserInfo; +import com.mango.xchat_android_library.list.BaseGroupItem; +import com.mango.xchat_android_library.list.ViewHolder; /** * Created by chenran on 2017/8/9. diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/BaseMicroViewAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/BaseMicroViewAdapter.java index 227a95d83..0912002ed 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/BaseMicroViewAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.content.Context; @@ -19,28 +19,28 @@ import android.widget.TextView; import com.coorchice.library.SuperTextView; import com.netease.nim.uikit.common.util.string.StringUtil; import com.opensource.svgaplayer.SVGAImageView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.webview.DialogWebViewActivity; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.bean.RoomMicInfo; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -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.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueData; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueFormat; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.webview.DialogWebViewActivity; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.utils.RegexUtil; +import com.mango.core.UriProvider; +import com.mango.core.bean.RoomMicInfo; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.noble.NobleResourceType; +import com.mango.core.noble.NobleUtil; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.giftvalue.bean.GiftValueData; +import com.mango.core.room.giftvalue.helper.GiftValueFormat; +import com.mango.core.room.pk.bean.PKTeamInfo; +import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.user.UserModel; +import com.mango.core.utils.ActivityUtil; +import com.mango.core.utils.StringExtensionKt; +import com.mango.xchat_android_library.utils.config.BasicConfig; /** * @author xiaoyu diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/CpMicroViewAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/CpMicroViewAdapter.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/CpMicroViewAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/CpMicroViewAdapter.java index 3272f965f..cb6152bab 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/CpMicroViewAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/CpMicroViewAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.content.Context; import androidx.annotation.NonNull; @@ -10,8 +10,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; +import com.mango.moshen.R; +import com.mango.core.bean.RoomQueueInfo; public class CpMicroViewAdapter extends BaseMicroViewAdapter { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/CreateRoomGameAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/adapter/CreateRoomGameAdapter.kt similarity index 73% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/CreateRoomGameAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/adapter/CreateRoomGameAdapter.kt index bf4bf99a7..f4e6d83dd 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/CreateRoomGameAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/CreateRoomGameAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.erban.avroom.adapter +package com.mango.moshen.avroom.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.room.game.GameInfo +import com.mango.moshen.R +import com.mango.moshen.ui.utils.load +import com.mango.core.room.game.GameInfo class CreateRoomGameAdapter : BaseQuickAdapter(R.layout.item_room_create_game) { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/DatingMicroViewAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/adapter/DatingMicroViewAdapter.kt similarity index 95% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/DatingMicroViewAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/adapter/DatingMicroViewAdapter.kt index 2b7956af4..67b8a0432 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/DatingMicroViewAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/DatingMicroViewAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter +package com.mango.moshen.avroom.adapter import android.annotation.SuppressLint import android.content.Context @@ -12,13 +12,13 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.erban.utils.UserUtils -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.bean.RoomInfo +import com.mango.moshen.R +import com.mango.moshen.ui.utils.load +import com.mango.moshen.utils.UserUtils +import com.mango.core.Constants +import com.mango.core.bean.RoomQueueInfo +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.room.bean.RoomInfo /** diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/ExitRoomAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/adapter/ExitRoomAdapter.kt similarity index 71% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/ExitRoomAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/adapter/ExitRoomAdapter.kt index 35b906e38..7f40f4f11 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/ExitRoomAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/ExitRoomAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.erban.avroom.adapter +package com.mango.moshen.avroom.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.mango.moshen.R +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.utils.subAndReplaceDot class ExitRoomAdapter : BaseQuickAdapter(R.layout.item_exit_room) { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/GameMicroViewAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/adapter/GameMicroViewAdapter.kt similarity index 93% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/GameMicroViewAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/adapter/GameMicroViewAdapter.kt index e98f5676e..6ca4fb8c2 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/GameMicroViewAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/GameMicroViewAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter +package com.mango.moshen.avroom.adapter import android.annotation.SuppressLint import android.content.Context @@ -11,10 +11,9 @@ import androidx.core.view.updateLayoutParams import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import kotlin.math.max +import com.mango.moshen.R +import com.mango.core.bean.RoomQueueInfo +import com.mango.core.manager.AvRoomDataManager /** diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/GameMiniMicroViewAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/adapter/GameMiniMicroViewAdapter.kt similarity index 86% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/GameMiniMicroViewAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/adapter/GameMiniMicroViewAdapter.kt index 80e05808c..f2c89a226 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/GameMiniMicroViewAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/GameMiniMicroViewAdapter.kt @@ -1,17 +1,15 @@ -package com.yizhuan.erban.avroom.adapter +package com.mango.moshen.avroom.adapter import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import kotlin.math.max +import com.mango.moshen.R +import com.mango.core.bean.RoomQueueInfo +import com.mango.core.manager.AvRoomDataManager /** diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/HomePartyPageAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/HomePartyPageAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/HomePartyPageAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/HomePartyPageAdapter.java index 92c57b03a..a13f83ae8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/HomePartyPageAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/HomePartyPageAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/InviteFriendListAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/InviteFriendListAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/InviteFriendListAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/InviteFriendListAdapter.java index 9dfcbadcd..93d355129 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/InviteFriendListAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/InviteFriendListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.app.Activity; import androidx.appcompat.widget.AppCompatImageView; @@ -8,14 +8,14 @@ import android.widget.CheckBox; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.public_chat_hall.bean.PublicChatHallFriendInfo; -import com.yizhuan.erban.public_chat_hall.event.AitFriendEvent; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.public_chat_hall.bean.PublicChatHallFriendInfo; +import com.mango.moshen.public_chat_hall.event.AitFriendEvent; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.NobleAvatarView; +import com.mango.core.noble.NobleUtil; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/KtvMicroViewAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/KtvMicroViewAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/KtvMicroViewAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/KtvMicroViewAdapter.java index 0623d3d7a..5bad536d4 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/KtvMicroViewAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/KtvMicroViewAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.content.Context; @@ -13,17 +13,16 @@ import android.widget.ImageView; import android.widget.TextView; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.ktv.KtvMusicManager; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.ktv.event.MusicCountEvent; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.utils.StringUtils; -import com.yizhuan.xchat_android_library.rxbus.RxBus; +import com.mango.moshen.R; +import com.mango.moshen.avroom.ktv.KtvMusicManager; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.ktv.event.MusicCountEvent; +import com.mango.core.room.pk.bean.PKTeamInfo; +import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.utils.StringUtils; +import com.mango.xchat_android_library.rxbus.RxBus; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicQueueAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/MicQueueAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/MicQueueAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/MicQueueAdapter.java index 3a56c7934..c5d2d5044 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicQueueAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/MicQueueAdapter.java @@ -1,21 +1,20 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.graphics.drawable.GradientDrawable; import androidx.appcompat.widget.AppCompatImageView; -import android.view.View; import android.widget.TextView; 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.common.widget.CircleImageView; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.GroupType; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicMemeberInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.queuing_mic.bean.GroupType; +import com.mango.core.room.queuing_mic.bean.QueuingMicMemeberInfo; +import com.mango.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/MicroViewAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/MicroViewAdapter.java index 87b2d8dde..a22bc1ade 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/MicroViewAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.annotation.SuppressLint; import android.content.Context; @@ -11,9 +11,9 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; +import com.mango.moshen.R; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.manager.AvRoomDataManager; /** * @author xiaoyu diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnMicroItemClickListener.java b/app/src/main/java/com/mango/moshen/avroom/adapter/OnMicroItemClickListener.java similarity index 71% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/OnMicroItemClickListener.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/OnMicroItemClickListener.java index 8ef0b607a..f120cd28f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnMicroItemClickListener.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/OnMicroItemClickListener.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; +import com.mango.core.room.queue.bean.MicMemberInfo; /** * Created by lvzebiao on 2018/11/5. diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/OnlineUserAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/OnlineUserAdapter.java index 6a7f3f686..f8bdc7bd2 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/OnlineUserAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.content.Context; import android.text.TextUtils; @@ -16,20 +16,20 @@ import com.netease.nim.uikit.impl.cache.NimUserInfoCache; import com.netease.nimlib.sdk.RequestCallbackWrapper; import com.netease.nimlib.sdk.uinfo.constant.GenderEnum; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.NobleAvatarView; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.level.UserLevelResourceType; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.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.UserInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.NobleAvatarView; +import com.mango.moshen.utils.RegexUtil; +import com.mango.core.auth.AuthModel; +import com.mango.core.level.UserLevelResourceType; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.noble.NobleResourceType; +import com.mango.core.noble.NobleUtil; +import com.mango.core.room.bean.OnlineChatMember; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/PKMicQueueAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/PKMicQueueAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/PKMicQueueAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/PKMicQueueAdapter.java index 851aa0190..1d66cdee6 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/PKMicQueueAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/PKMicQueueAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import androidx.appcompat.widget.AppCompatImageView; import android.view.View; @@ -7,12 +7,12 @@ import android.widget.TextView; 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.common.widget.CircleImageView; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.pk.bean.PKQueuingMicMemberInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.pk.bean.PKQueuingMicMemberInfo; +import com.mango.core.room.pk.bean.PKTeamInfo; +import com.mango.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RecordForPKAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/RecordForPKAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/RecordForPKAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/RecordForPKAdapter.java index 62e7cd7d0..b5a9a0955 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RecordForPKAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/RecordForPKAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.content.Context; import android.graphics.drawable.GradientDrawable; @@ -9,12 +9,12 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -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_library.utils.FormatUtils; +import com.mango.moshen.R; +import com.mango.core.room.pk.bean.PKRecordInfo; +import com.mango.core.room.pk.bean.PKTeamInfo; +import com.mango.core.room.pk.bean.PKTeamMember; +import com.mango.core.room.pk.bean.RoomPkData; +import com.mango.xchat_android_library.utils.FormatUtils; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomBlackListAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomBlackListAdapter.java similarity index 81% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomBlackListAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/RoomBlackListAdapter.java index 56d1e8695..787d2e44b 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomBlackListAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomBlackListAdapter.java @@ -1,14 +1,13 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.content.Context; -import androidx.annotation.NonNull; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; /** diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumeListAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomConsumeListAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumeListAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/RoomConsumeListAdapter.java index 7c3b3d94c..8381c749c 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumeListAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomConsumeListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.content.Context; import androidx.appcompat.widget.AppCompatImageView; @@ -11,15 +11,15 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.NobleAvatarView; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.NobleAvatarView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.utils.RegexUtil; +import com.mango.core.noble.NobleInfo; +import com.mango.core.noble.NobleUtil; +import com.mango.core.room.bean.RoomContributeUserInfo; +import com.mango.core.room.bean.RoomRankMultiItem; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumerListAdapterTemp.java b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomConsumerListAdapterTemp.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumerListAdapterTemp.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/RoomConsumerListAdapterTemp.java index 7d835e7f7..a80438231 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumerListAdapterTemp.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomConsumerListAdapterTemp.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.content.Context; import androidx.appcompat.widget.AppCompatImageView; @@ -10,13 +10,12 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.fragment.RoomRankDialogUtils; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.utils.RegexUtil; +import com.mango.core.room.bean.RoomContributeUserInfo; +import com.mango.core.room.bean.RoomRankMultiItem; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomContributeListAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomContributeListAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomContributeListAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/RoomContributeListAdapter.java index 850c94708..4b556d8fe 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomContributeListAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomContributeListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomInviteAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomInviteAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomInviteAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/RoomInviteAdapter.java index 0bd64d940..85880bdd4 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomInviteAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomInviteAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.content.Context; import androidx.recyclerview.widget.DiffUtil; @@ -14,13 +14,13 @@ import com.netease.nimlib.sdk.RequestCallbackWrapper; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.netease.nimlib.sdk.uinfo.constant.GenderEnum; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.ChatMemberDiffUtilCallback; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; +import com.mango.moshen.R; +import com.mango.moshen.avroom.ChatMemberDiffUtilCallback; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.RoomEvent; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomNormalListAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomNormalListAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomNormalListAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/RoomNormalListAdapter.java index 7e3ffbd75..d87e6fb9f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomNormalListAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomNormalListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.content.Context; import androidx.recyclerview.widget.RecyclerView; @@ -8,9 +8,9 @@ import android.view.ViewGroup; import android.widget.TextView; 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.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.utils.ImageLoadUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomRankFragmentPageAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomRankFragmentPageAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomRankFragmentPageAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/RoomRankFragmentPageAdapter.java index ea8177900..b5960ae93 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomRankFragmentPageAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomRankFragmentPageAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomRankHalfHourListAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomRankHalfHourListAdapter.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomRankHalfHourListAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/RoomRankHalfHourListAdapter.java index c883fd446..a7b956e56 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomRankHalfHourListAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomRankHalfHourListAdapter.java @@ -1,16 +1,16 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.content.Context; import android.widget.TextView; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.fragment.RoomRankDialogUtils; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourRankInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; +import com.mango.moshen.R; +import com.mango.moshen.avroom.fragment.RoomRankDialogUtils; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.room.bean.RoomRankHalfHourRankInfo; +import com.mango.core.room.bean.RoomRankMultiItem; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomVPAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomVPAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomVPAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/RoomVPAdapter.java index aaeb6512d..eb09c0d5e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomVPAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/RoomVPAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/SelectGameAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/adapter/SelectGameAdapter.kt similarity index 72% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/SelectGameAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/adapter/SelectGameAdapter.kt index 33c42f7e1..f43bc5a6b 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/SelectGameAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/SelectGameAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.erban.avroom.adapter +package com.mango.moshen.avroom.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.room.game.GameInfo +import com.mango.moshen.R +import com.mango.core.room.game.GameInfo class SelectGameAdapter : BaseQuickAdapter(R.layout.item_room_select_game) { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/SendBroadcastAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/adapter/SendBroadcastAdapter.kt similarity index 83% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/SendBroadcastAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/adapter/SendBroadcastAdapter.kt index 49f152af1..ca8aada5e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/SendBroadcastAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/SendBroadcastAdapter.kt @@ -1,8 +1,8 @@ -package com.yizhuan.erban.avroom.adapter +package com.mango.moshen.avroom.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R +import com.mango.moshen.R class SendBroadcastAdapter : BaseQuickAdapter(R.layout.item_send_broadcast) { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/SingleAnchorMicroViewAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/adapter/SingleAnchorMicroViewAdapter.kt similarity index 96% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/SingleAnchorMicroViewAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/adapter/SingleAnchorMicroViewAdapter.kt index 6ec8db121..0f3d58a62 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/SingleAnchorMicroViewAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/SingleAnchorMicroViewAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter +package com.mango.moshen.avroom.adapter import android.annotation.SuppressLint import android.content.Context @@ -10,8 +10,8 @@ import androidx.core.view.updateLayoutParams import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.opensource.svgaplayer.SVGAImageView -import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo +import com.mango.moshen.R +import com.mango.core.bean.RoomQueueInfo /** * @author xiaoyu diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/SingleRoomPKMicroViewAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/adapter/SingleRoomPKMicroViewAdapter.kt similarity index 86% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/SingleRoomPKMicroViewAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/adapter/SingleRoomPKMicroViewAdapter.kt index aee0e4457..6ad236b3f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/SingleRoomPKMicroViewAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/SingleRoomPKMicroViewAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter +package com.mango.moshen.avroom.adapter import android.content.Context import android.view.LayoutInflater @@ -10,19 +10,14 @@ import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.erban.R -import com.yizhuan.erban.common.widget.CircleImageView -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.praise.PraiseModel -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent -import com.yizhuan.xchat_android_core.utils.toast -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 com.mango.moshen.R +import com.mango.moshen.common.widget.CircleImageView +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.bean.RoomQueueInfo +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.praise.PraiseModel +import com.mango.core.utils.toast +import com.mango.xchat_android_library.utils.config.BasicConfig class SingleRoomPKMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context) { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/UpMicAdapter.java b/app/src/main/java/com/mango/moshen/avroom/adapter/UpMicAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/avroom/adapter/UpMicAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/adapter/UpMicAdapter.java index 1210eb205..af59a7a1c 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/UpMicAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/adapter/UpMicAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.adapter; +package com.mango.moshen.avroom.adapter; import android.annotation.SuppressLint; import android.content.Context; @@ -7,10 +7,10 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; +import com.mango.moshen.R; +import com.mango.core.Constants; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.manager.AvRoomDataManager; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKBoardView.kt b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKBoardView.kt similarity index 88% rename from app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKBoardView.kt rename to app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKBoardView.kt index f0a7dfc59..b8f15e7c7 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKBoardView.kt +++ b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKBoardView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.anotherroompk +package com.mango.moshen.avroom.anotherroompk import android.annotation.SuppressLint import android.content.Context @@ -16,19 +16,19 @@ import androidx.core.view.updateLayoutParams import androidx.lifecycle.Observer import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.netease.nim.uikit.common.util.sys.TimeUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.common.widget.DragLayout -import com.yizhuan.erban.databinding.LayoutRoomPkBoardViewBinding -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowGiftDialogEvent -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_library.rxbus.RxBus -import com.yizhuan.xchat_android_library.utils.CommonUtils +import com.mango.moshen.R +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.common.widget.DragLayout +import com.mango.moshen.databinding.LayoutRoomPkBoardViewBinding +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.im.custom.bean.RoomPkBean +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.room.anotherroompk.ShowGiftDialogEvent +import com.mango.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.mango.core.utils.CurrentTimeUtils +import com.mango.core.utils.subAndReplaceDot +import com.mango.xchat_android_library.rxbus.RxBus +import com.mango.xchat_android_library.utils.CommonUtils import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKCreateActivity.kt b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKCreateActivity.kt similarity index 83% rename from app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKCreateActivity.kt rename to app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKCreateActivity.kt index db1337d26..6b8e1a61e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKCreateActivity.kt +++ b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKCreateActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.anotherroompk +package com.mango.moshen.avroom.anotherroompk import android.annotation.SuppressLint import android.content.Context @@ -7,20 +7,18 @@ import android.text.Editable import android.view.Gravity import android.view.WindowManager import androidx.core.view.isVisible -import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.databinding.ActivityRoomPkCreateBinding -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.erban.ui.widget.TextWatcherSimple -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.utils.ifNotNullOrEmpty -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toIntOrDef -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.databinding.ActivityRoomPkCreateBinding +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.moshen.ui.widget.TextWatcherSimple +import com.mango.core.auth.AuthModel +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.room.anotherroompk.RoomPKModel +import com.mango.core.room.anotherroompk.SimpleRoomInfo +import com.mango.core.utils.ifNotNullOrEmpty +import com.mango.core.utils.subAndReplaceDot +import com.mango.core.utils.toIntOrDef +import com.mango.core.utils.toast class RoomPKCreateActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKRankListView.kt b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKRankListView.kt similarity index 85% rename from app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKRankListView.kt rename to app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKRankListView.kt index a0c9e1d4a..a2f0496fa 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKRankListView.kt +++ b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKRankListView.kt @@ -1,16 +1,16 @@ -package com.yizhuan.erban.avroom.anotherroompk +package com.mango.moshen.avroom.anotherroompk import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import android.widget.FrameLayout import androidx.core.view.isGone -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.LayoutRoomPkRankListViewBinding -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent -import com.yizhuan.xchat_android_library.rxbus.RxBus +import com.mango.moshen.R +import com.mango.moshen.databinding.LayoutRoomPkRankListViewBinding +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.im.custom.bean.RoomPkBean +import com.mango.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.mango.xchat_android_library.rxbus.RxBus class RoomPKRankListView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchActivity.kt b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKSearchActivity.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchActivity.kt rename to app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKSearchActivity.kt index 345f9320a..d6c156d83 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchActivity.kt +++ b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKSearchActivity.kt @@ -1,27 +1,22 @@ -package com.yizhuan.erban.avroom.anotherroompk +package com.mango.moshen.avroom.anotherroompk import android.annotation.SuppressLint import android.app.Activity -import android.content.Context import android.content.Intent -import android.text.Editable import android.view.Gravity import android.view.WindowManager import android.widget.CheckBox import androidx.recyclerview.widget.LinearLayoutManager -import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.ActivityRoomPkSearchBinding -import com.yizhuan.erban.ui.user.UserInfoActivity -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.erban.ui.widget.TextWatcherSimple -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.R +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.ActivityRoomPkSearchBinding +import com.mango.moshen.ui.user.UserInfoActivity +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.room.anotherroompk.RoomPKModel +import com.mango.core.room.anotherroompk.SimpleRoomInfo +import com.mango.core.utils.toast import kotlinx.android.synthetic.main.activity_give_gold_search.* class RoomPKSearchActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKSearchAdapter.kt similarity index 71% rename from app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKSearchAdapter.kt index d877d587d..c3092aac9 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKSearchAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.erban.avroom.anotherroompk +package com.mango.moshen.avroom.anotherroompk import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.mango.moshen.R +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.room.anotherroompk.SimpleRoomInfo +import com.mango.core.utils.subAndReplaceDot class RoomPKSearchAdapter : BaseQuickAdapter(R.layout.item_room_pk_search) { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkFinishDialog.kt b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPkFinishDialog.kt similarity index 91% rename from app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkFinishDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPkFinishDialog.kt index 24f90646b..0f9b6564b 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkFinishDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPkFinishDialog.kt @@ -1,15 +1,15 @@ -package com.yizhuan.erban.avroom.anotherroompk +package com.mango.moshen.avroom.anotherroompk import android.annotation.SuppressLint import android.os.Bundle import android.view.WindowManager import androidx.core.view.isVisible -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogRoomPkFinishBinding -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.mango.moshen.R +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogRoomPkFinishBinding +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.im.custom.bean.RoomPkBean +import com.mango.core.utils.subAndReplaceDot class RoomPkFinishDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkForceFinishDialog.kt b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPkForceFinishDialog.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkForceFinishDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPkForceFinishDialog.kt index 4c4989a57..253206173 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkForceFinishDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPkForceFinishDialog.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.avroom.anotherroompk +package com.mango.moshen.avroom.anotherroompk import android.annotation.SuppressLint import android.os.Bundle import android.view.WindowManager -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogRoomPkForceFinishBinding -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.mango.moshen.R +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogRoomPkForceFinishBinding +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.im.custom.bean.RoomPkBean +import com.mango.core.utils.subAndReplaceDot class RoomPkForceFinishDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkReceivedDialog.kt b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPkReceivedDialog.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkReceivedDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPkReceivedDialog.kt index 54c0e82aa..1ef74117a 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkReceivedDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPkReceivedDialog.kt @@ -1,16 +1,16 @@ -package com.yizhuan.erban.avroom.anotherroompk +package com.mango.moshen.avroom.anotherroompk import android.annotation.SuppressLint import android.os.Bundle import androidx.core.view.isVisible -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogRoomPkReceivedBinding -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel -import com.yizhuan.xchat_android_core.utils.ifNotNullOrEmpty -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogRoomPkReceivedBinding +import com.mango.core.im.custom.bean.RoomPkBean +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.room.anotherroompk.RoomPKModel +import com.mango.core.utils.ifNotNullOrEmpty +import com.mango.core.utils.subAndReplaceDot +import com.mango.core.utils.toast import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkRuleDialog.kt b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPkRuleDialog.kt similarity index 68% rename from app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkRuleDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPkRuleDialog.kt index 4525b3ce6..1329a549e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkRuleDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPkRuleDialog.kt @@ -1,7 +1,7 @@ -package com.yizhuan.erban.avroom.anotherroompk +package com.mango.moshen.avroom.anotherroompk -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogRoomPkRuleBinding +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogRoomPkRuleBinding class RoomPkRuleDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/AttentionHintDialog.java b/app/src/main/java/com/mango/moshen/avroom/dialog/AttentionHintDialog.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/AttentionHintDialog.java rename to app/src/main/java/com/mango/moshen/avroom/dialog/AttentionHintDialog.java index 6a4c87b7e..98cf27cb3 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/AttentionHintDialog.java +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/AttentionHintDialog.java @@ -1,15 +1,15 @@ -package com.yizhuan.erban.avroom.dialog; +package com.mango.moshen.avroom.dialog; import android.content.Context; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBsDialog; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBsDialog; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.praise.PraiseModel; +import com.mango.xchat_android_library.utils.SingleToastUtil; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/CreateRoomDialog.kt b/app/src/main/java/com/mango/moshen/avroom/dialog/CreateRoomDialog.kt similarity index 83% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/CreateRoomDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/dialog/CreateRoomDialog.kt index a4f35a85c..5d5717e3b 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/CreateRoomDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/CreateRoomDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.dialog +package com.mango.moshen.avroom.dialog import android.annotation.SuppressLint import android.view.Gravity @@ -6,16 +6,16 @@ import android.view.WindowManager import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.erban.avroom.adapter.CreateRoomGameAdapter -import com.yizhuan.erban.base.BaseActivity -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogCreateRoomBinding -import com.yizhuan.erban.home.helper.OpenRoomHelper -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.room.bean.RoomInfo -import com.yizhuan.xchat_android_core.room.game.GameInfo -import com.yizhuan.xchat_android_core.room.game.GameModel -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.avroom.adapter.CreateRoomGameAdapter +import com.mango.moshen.base.BaseActivity +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogCreateRoomBinding +import com.mango.moshen.home.helper.OpenRoomHelper +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.room.bean.RoomInfo +import com.mango.core.room.game.GameInfo +import com.mango.core.room.game.GameModel +import com.mango.core.utils.toast class CreateRoomDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/DatingVipRuleDialog.java b/app/src/main/java/com/mango/moshen/avroom/dialog/DatingVipRuleDialog.java similarity index 73% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/DatingVipRuleDialog.java rename to app/src/main/java/com/mango/moshen/avroom/dialog/DatingVipRuleDialog.java index 704f56bd9..a923177b8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/DatingVipRuleDialog.java +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/DatingVipRuleDialog.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.avroom.dialog; +package com.mango.moshen.avroom.dialog; import android.content.Context; import android.text.method.ScrollingMovementMethod; import android.view.View; -import com.yizhuan.erban.R; -import com.yizhuan.erban.databinding.DialogDatingVipRuleBinding; -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.R; +import com.mango.moshen.databinding.DialogDatingVipRuleBinding; +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog; +import com.mango.xchat_android_library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.dialog_dating_vip_rule) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/ExitRoomPopupWindow.kt b/app/src/main/java/com/mango/moshen/avroom/dialog/ExitRoomPopupWindow.kt similarity index 87% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/ExitRoomPopupWindow.kt rename to app/src/main/java/com/mango/moshen/avroom/dialog/ExitRoomPopupWindow.kt index 4af560179..a08118af8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/ExitRoomPopupWindow.kt +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/ExitRoomPopupWindow.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.dialog +package com.mango.moshen.avroom.dialog import android.annotation.SuppressLint import android.graphics.Color @@ -13,19 +13,19 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.UIHelper -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.avroom.adapter.ExitRoomAdapter -import com.yizhuan.erban.avroom.presenter.HomePartyPresenter -import com.yizhuan.erban.common.widget.dialog.DialogManager.LambdaOkDialogListener -import com.yizhuan.erban.common.widget.dialog.DialogManager.OkCancelDialogListener -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_constants.XChatConstants -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.model.AvRoomModel -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.UIHelper +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.avroom.adapter.ExitRoomAdapter +import com.mango.moshen.avroom.presenter.HomePartyPresenter +import com.mango.moshen.common.widget.dialog.DialogManager.LambdaOkDialogListener +import com.mango.moshen.common.widget.dialog.DialogManager.OkCancelDialogListener +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.xchat_android_constants.XChatConstants +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.room.model.AvRoomModel +import com.mango.xchat_android_library.annatation.ActLayoutRes import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java b/app/src/main/java/com/mango/moshen/avroom/dialog/MicQueueDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java rename to app/src/main/java/com/mango/moshen/avroom/dialog/MicQueueDialog.java index abffbdb46..14bb784ea 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/MicQueueDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.dialog; +package com.mango.moshen.avroom.dialog; import android.content.Context; import android.graphics.Color; @@ -22,30 +22,30 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.MicQueueAdapter; -import com.yizhuan.erban.home.helper.LoadPageDataHelper; -import com.yizhuan.erban.ui.widget.dialog.BaseDialog; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.HomePartyModel; -import com.yizhuan.xchat_android_core.room.model.MicQueueModel; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.GroupType; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicMemeberInfo; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.RespQueuingMicListInfo; -import com.yizhuan.xchat_android_core.user.bean.BaseInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; -import com.yizhuan.xchat_android_library.utils.CommonUtils; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.MicQueueAdapter; +import com.mango.moshen.home.helper.LoadPageDataHelper; +import com.mango.moshen.ui.widget.dialog.BaseDialog; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.moshen.ui.widget.recyclerview.decoration.ColorDecoration; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.giftvalue.helper.GiftValueMrg; +import com.mango.core.room.model.HomePartyModel; +import com.mango.core.room.model.MicQueueModel; +import com.mango.core.room.queuing_mic.bean.GroupType; +import com.mango.core.room.queuing_mic.bean.QueuingMicMemeberInfo; +import com.mango.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.mango.core.user.bean.BaseInfo; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.xchat_android_library.utils.CommonUtils; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/NewUserGiftDialog.kt b/app/src/main/java/com/mango/moshen/avroom/dialog/NewUserGiftDialog.kt similarity index 61% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/NewUserGiftDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/dialog/NewUserGiftDialog.kt index d548dcca6..5af08bb51 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/NewUserGiftDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/NewUserGiftDialog.kt @@ -1,11 +1,11 @@ -package com.yizhuan.erban.avroom.dialog +package com.mango.moshen.avroom.dialog -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogNewUserGiftBinding -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogNewUserGiftBinding +import com.mango.moshen.ui.utils.load +import com.mango.core.gift.bean.GiftInfo +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol class NewUserGiftDialog(val giftInfo: GiftInfo) : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKMicQueueDialog.java b/app/src/main/java/com/mango/moshen/avroom/dialog/PKMicQueueDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/PKMicQueueDialog.java rename to app/src/main/java/com/mango/moshen/avroom/dialog/PKMicQueueDialog.java index 9d8a1f2d4..b409e7a7a 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKMicQueueDialog.java +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/PKMicQueueDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.dialog; +package com.mango.moshen.avroom.dialog; import android.content.Context; import android.graphics.Color; @@ -19,28 +19,28 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.PKMicQueueAdapter; -import com.yizhuan.erban.home.helper.LoadPageDataHelper; -import com.yizhuan.erban.ui.widget.dialog.BaseDialog; -import com.yizhuan.erban.ui.widget.dialog.CommonLoadingDialog; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -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.PKRespQueuingMicListInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.PKMicQueueAdapter; +import com.mango.moshen.home.helper.LoadPageDataHelper; +import com.mango.moshen.ui.widget.dialog.BaseDialog; +import com.mango.moshen.ui.widget.dialog.CommonLoadingDialog; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.moshen.ui.widget.recyclerview.decoration.ColorDecoration; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.pk.bean.PKMemberInfo; +import com.mango.core.room.pk.bean.PKQueuingMicMemberInfo; +import com.mango.core.room.pk.bean.PKRespQueuingMicListInfo; +import com.mango.core.room.pk.bean.PKTeamInfo; +import com.mango.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.mango.core.room.pk.model.PkModel; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKResultDialog.java b/app/src/main/java/com/mango/moshen/avroom/dialog/PKResultDialog.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/PKResultDialog.java rename to app/src/main/java/com/mango/moshen/avroom/dialog/PKResultDialog.java index 29270fe3f..f321e7541 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKResultDialog.java +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/PKResultDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.dialog; +package com.mango.moshen.avroom.dialog; import android.content.Context; import android.graphics.Color; @@ -19,16 +19,16 @@ import android.widget.TextView; 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.common.widget.CircleImageView; -import com.yizhuan.erban.ui.widget.dialog.BaseDialog; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration; -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_library.utils.FormatUtils; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.widget.dialog.BaseDialog; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.moshen.ui.widget.recyclerview.decoration.ColorDecoration; +import com.mango.core.auth.AuthModel; +import com.mango.core.room.pk.bean.PKTeamInfo; +import com.mango.core.room.pk.bean.PKTeamMember; +import com.mango.core.room.pk.bean.RoomPkData; +import com.mango.xchat_android_library.utils.FormatUtils; 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/mango/moshen/avroom/dialog/PKScoreBoardDialog.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/PKScoreBoardDialog.java rename to app/src/main/java/com/mango/moshen/avroom/dialog/PKScoreBoardDialog.java index 05cd59991..1c8043b06 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKScoreBoardDialog.java +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/PKScoreBoardDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.dialog; +package com.mango.moshen.avroom.dialog; import android.content.Context; import android.os.Bundle; @@ -7,25 +7,25 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.widget.dialog.BaseDialog; -import com.yizhuan.erban.ui.widget.dialog.CommonTipDialog; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo; -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.event.PKDataUpdateEvent; -import com.yizhuan.xchat_android_core.room.pk.event.PKTimeFinishEvent; -import com.yizhuan.xchat_android_core.room.pk.event.PKTimeTickEvent; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_library.utils.FormatUtils; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.widget.dialog.BaseDialog; +import com.mango.moshen.ui.widget.dialog.CommonTipDialog; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.room.pk.bean.PKMemberInfo; +import com.mango.core.room.pk.bean.PKTeamInfo; +import com.mango.core.room.pk.bean.PKTeamMember; +import com.mango.core.room.pk.bean.RoomPkData; +import com.mango.core.room.pk.event.PKDataUpdateEvent; +import com.mango.core.room.pk.event.PKTimeFinishEvent; +import com.mango.core.room.pk.event.PKTimeTickEvent; +import com.mango.core.room.pk.model.PkModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.xchat_android_library.utils.FormatUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKSelectPeopleDialog.java b/app/src/main/java/com/mango/moshen/avroom/dialog/PKSelectPeopleDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/PKSelectPeopleDialog.java rename to app/src/main/java/com/mango/moshen/avroom/dialog/PKSelectPeopleDialog.java index 6f76f2495..558ad64c6 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKSelectPeopleDialog.java +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/PKSelectPeopleDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.dialog; +package com.mango.moshen.avroom.dialog; import android.content.Context; import android.graphics.Rect; @@ -14,16 +14,15 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; 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.common.widget.CircleImageView; -import com.yizhuan.erban.ui.widget.dialog.BaseDialog; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.widget.dialog.BaseDialog; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.pk.bean.PKMemberInfo; +import com.mango.core.room.pk.model.PkModel; +import com.mango.core.room.queue.bean.MicMemberInfo; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKTimePickerDialog.java b/app/src/main/java/com/mango/moshen/avroom/dialog/PKTimePickerDialog.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/PKTimePickerDialog.java rename to app/src/main/java/com/mango/moshen/avroom/dialog/PKTimePickerDialog.java index ffd999826..60cc990f9 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKTimePickerDialog.java +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/PKTimePickerDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.dialog; +package com.mango.moshen.avroom.dialog; import android.content.Context; import android.os.Bundle; @@ -15,8 +15,8 @@ import com.jzxiang.pickerview.config.PickerConfig; import com.jzxiang.pickerview.utils.PickerContants; import com.jzxiang.pickerview.wheel.WheelView; import com.orhanobut.logger.Logger; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.dialog.BaseDialog; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.dialog.BaseDialog; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RequestUpMicDialog.kt b/app/src/main/java/com/mango/moshen/avroom/dialog/RequestUpMicDialog.kt similarity index 65% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/RequestUpMicDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/dialog/RequestUpMicDialog.kt index 7342d035c..ac5501bfb 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RequestUpMicDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/RequestUpMicDialog.kt @@ -1,16 +1,15 @@ -package com.yizhuan.erban.avroom.dialog +package com.mango.moshen.avroom.dialog import android.content.Context import android.view.View -import android.view.WindowManager -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.DialogRequestUpmicBinding -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager -import com.yizhuan.xchat_android_core.user.bean.BaseInfo -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.databinding.DialogRequestUpmicBinding +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.manager.IMNetEaseManager +import com.mango.core.user.bean.BaseInfo +import com.mango.core.user.bean.UserInfo +import com.mango.xchat_android_library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_request_upmic) class RequestUpMicDialog(context: Context) : diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java b/app/src/main/java/com/mango/moshen/avroom/dialog/RoomImposeDialog.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java rename to app/src/main/java/com/mango/moshen/avroom/dialog/RoomImposeDialog.java index 90acb3230..29b9ee641 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/RoomImposeDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.dialog; +package com.mango.moshen.avroom.dialog; import android.content.Context; import android.content.Intent; @@ -13,21 +13,21 @@ import android.view.View; import android.view.WindowManager; import android.widget.FrameLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.CpRoomInviteActivity; -import com.yizhuan.erban.avroom.widget.EditRoomTitleDialog; -import com.yizhuan.erban.databinding.DialogRoomImposeBinding; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -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; -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 com.mango.moshen.R; +import com.mango.moshen.avroom.activity.CpRoomInviteActivity; +import com.mango.moshen.avroom.widget.EditRoomTitleDialog; +import com.mango.moshen.databinding.DialogRoomImposeBinding; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.core.auth.AuthModel; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.model.RoomSettingModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.codec.DESUtils; public class RoomImposeDialog extends BottomSheetDialog implements View.OnClickListener { private Context context; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/mango/moshen/avroom/dialog/RoomOperationDialog.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java rename to app/src/main/java/com/mango/moshen/avroom/dialog/RoomOperationDialog.java index 2ad84a5fa..6048e0f99 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/RoomOperationDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.dialog; +package com.mango.moshen.avroom.dialog; import android.annotation.SuppressLint; import android.content.Context; @@ -17,37 +17,37 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.coorchice.library.utils.LogUtils; import com.google.android.material.bottomsheet.BottomSheetDialog; import com.tongdaxing.erban.sadmin.RoomSAdminManagerActivity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.CreatePKActivity; -import com.yizhuan.erban.avroom.activity.RoomSettingActivity; -import com.yizhuan.erban.avroom.anotherroompk.RoomPKCreateActivity; -import com.yizhuan.erban.avroom.giftvalue.GiftValueDialogUiHelper; -import com.yizhuan.erban.avroom.singleroompk.SingleRoomPKCreateActivity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -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; -import com.yizhuan.erban.vip.VipBroadcastDialog; -import com.yizhuan.tutu.room_chat.activity.RoomInviteFansActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.redpackage.RedPackageModel; -import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.GiftValueModel; -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.queuing_mic.event.HasAnimationEffect; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.CreatePKActivity; +import com.mango.moshen.avroom.activity.RoomSettingActivity; +import com.mango.moshen.avroom.anotherroompk.RoomPKCreateActivity; +import com.mango.moshen.avroom.giftvalue.GiftValueDialogUiHelper; +import com.mango.moshen.avroom.singleroompk.SingleRoomPKCreateActivity; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.moshen.ui.widget.recyclerview.decoration.ColorDecoration; +import com.mango.moshen.ui.widget.recyclerview.layoutmanager.FullyGridLayoutManager; +import com.mango.moshen.vip.VipBroadcastDialog; +import com.mango.moshen.room_chat.activity.RoomInviteFansActivity; +import com.mango.core.auth.AuthModel; +import com.mango.core.im.custom.bean.RoomPkBean; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.redpackage.RedPackageModel; +import com.mango.core.room.anotherroompk.SingleRoomPKModel; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.giftvalue.GiftValueModel; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.room.model.HomePartyModel; +import com.mango.core.room.queuing_mic.event.HasAnimationEffect; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.super_admin.model.SuperAdminModel; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.core.utils.CurrentTimeUtils; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/SelectLabelDialog.kt b/app/src/main/java/com/mango/moshen/avroom/dialog/SelectLabelDialog.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/SelectLabelDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/dialog/SelectLabelDialog.kt index 1b93a9eef..ae1f71d90 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/SelectLabelDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/SelectLabelDialog.kt @@ -1,12 +1,12 @@ -package com.yizhuan.erban.avroom.dialog +package com.mango.moshen.avroom.dialog import android.content.Context import android.view.View import com.donkingliang.labels.LabelsView -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.DialogSelectLabelBinding -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.databinding.DialogSelectLabelBinding +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog +import com.mango.xchat_android_library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_select_label) class SelectLabelDialog( diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/SendBroadcastDialog.kt b/app/src/main/java/com/mango/moshen/avroom/dialog/SendBroadcastDialog.kt similarity index 87% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/SendBroadcastDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/dialog/SendBroadcastDialog.kt index d054f82ea..44ca01a45 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/SendBroadcastDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/SendBroadcastDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.dialog +package com.mango.moshen.avroom.dialog import android.annotation.SuppressLint import android.graphics.Color @@ -7,18 +7,18 @@ import android.text.Editable import android.text.style.ForegroundColorSpan import android.view.WindowManager import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.erban.avroom.adapter.SendBroadcastAdapter -import com.yizhuan.erban.base.BaseActivity -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogSendBroadcastBinding -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.erban.utils.SpannableBuilder -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.bean.BroadcastInfo -import com.yizhuan.xchat_android_core.room.model.AvRoomModel -import com.yizhuan.xchat_android_core.utils.toast -import com.yizhuan.xchat_android_library.utils.CommonUtils -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper +import com.mango.moshen.avroom.adapter.SendBroadcastAdapter +import com.mango.moshen.base.BaseActivity +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogSendBroadcastBinding +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.moshen.utils.SpannableBuilder +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.room.bean.BroadcastInfo +import com.mango.core.room.model.AvRoomModel +import com.mango.core.utils.toast +import com.mango.xchat_android_library.utils.CommonUtils +import com.mango.xchat_android_library.utils.TextWatcherWrapper import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/SingleRoomTipDialog.kt b/app/src/main/java/com/mango/moshen/avroom/dialog/SingleRoomTipDialog.kt similarity index 75% rename from app/src/main/java/com/yizhuan/erban/avroom/dialog/SingleRoomTipDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/dialog/SingleRoomTipDialog.kt index 6f63d335b..6d1c6b189 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/SingleRoomTipDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/SingleRoomTipDialog.kt @@ -1,9 +1,9 @@ -package com.yizhuan.erban.avroom.dialog +package com.mango.moshen.avroom.dialog import android.annotation.SuppressLint import android.view.WindowManager -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogSingleRoomTipBinding +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogSingleRoomTipBinding class SingleRoomTipDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt b/app/src/main/java/com/mango/moshen/avroom/firstcharge/FirstChargeDialog.kt similarity index 88% rename from app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/firstcharge/FirstChargeDialog.kt index 7ded00eb5..fd6ca3cb4 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/firstcharge/FirstChargeDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.firstcharge +package com.mango.moshen.avroom.firstcharge import android.annotation.SuppressLint import android.content.Context @@ -18,27 +18,27 @@ import com.google.android.flexbox.AlignItems import com.google.android.flexbox.FlexboxLayoutManager import com.google.android.flexbox.JustifyContent import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.bank_card.activity.AddBankCardAgreementActivity -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.common.widget.dialog.DialogManager.AbsOkDialogListener -import com.yizhuan.erban.databinding.DialogFirstChargeBinding -import com.yizhuan.erban.ui.setting.ModifyPwdActivity -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.erban.ui.webview.CommonWebViewActivity -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.PaymentActivity -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.pay.bean.PaymentResult -import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent -import com.yizhuan.xchat_android_core.pay.model.unionpay.UnionPayModel -import com.yizhuan.xchat_android_core.utils.toast -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 com.mango.moshen.R +import com.mango.moshen.bank_card.activity.AddBankCardAgreementActivity +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.common.widget.dialog.DialogManager.AbsOkDialogListener +import com.mango.moshen.databinding.DialogFirstChargeBinding +import com.mango.moshen.ui.setting.ModifyPwdActivity +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.moshen.ui.webview.CommonWebViewActivity +import com.mango.core.UriProvider +import com.mango.core.auth.AuthModel +import com.mango.core.pay.PayModel +import com.mango.core.pay.PaymentActivity +import com.mango.core.pay.bean.FirstChargeGoods +import com.mango.core.pay.bean.FirstChargeReward +import com.mango.core.pay.bean.PaymentResult +import com.mango.core.pay.event.FirstChargeEvent +import com.mango.core.pay.model.unionpay.UnionPayModel +import com.mango.core.utils.toast +import com.mango.xchat_android_library.annatation.ActLayoutRes +import com.mango.xchat_android_library.utils.JavaUtil +import com.mango.xchat_android_library.utils.SingleToastUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargePrizeDialog.kt b/app/src/main/java/com/mango/moshen/avroom/firstcharge/FirstChargePrizeDialog.kt similarity index 73% rename from app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargePrizeDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/firstcharge/FirstChargePrizeDialog.kt index 523d18896..7481da7a8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargePrizeDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/firstcharge/FirstChargePrizeDialog.kt @@ -1,15 +1,15 @@ -package com.yizhuan.erban.avroom.firstcharge +package com.mango.moshen.avroom.firstcharge import android.content.Context import com.google.android.flexbox.AlignItems import com.google.android.flexbox.FlexboxLayoutManager import com.google.android.flexbox.JustifyContent -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.DialogFirstChargePrizeBinding -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.databinding.DialogFirstChargePrizeBinding +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.pay.bean.FirstChargeReward +import com.mango.xchat_android_library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_first_charge_prize) class FirstChargePrizeDialog( diff --git a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/RewardAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/firstcharge/RewardAdapter.kt similarity index 79% rename from app/src/main/java/com/yizhuan/erban/avroom/firstcharge/RewardAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/firstcharge/RewardAdapter.kt index 906632ae5..b23c158e6 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/RewardAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/firstcharge/RewardAdapter.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.avroom.firstcharge +package com.mango.moshen.avroom.firstcharge import androidx.core.view.updateLayoutParams import androidx.recyclerview.widget.RecyclerView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.mango.moshen.R +import com.mango.core.pay.bean.FirstChargeReward +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.utils.TextUtils class RewardAdapter : BaseQuickAdapter(R.layout.item_first_charge_reward) { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/SelectPayTypeDialog.kt b/app/src/main/java/com/mango/moshen/avroom/firstcharge/SelectPayTypeDialog.kt similarity index 86% rename from app/src/main/java/com/yizhuan/erban/avroom/firstcharge/SelectPayTypeDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/firstcharge/SelectPayTypeDialog.kt index 9347537a3..fdd083145 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/SelectPayTypeDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/firstcharge/SelectPayTypeDialog.kt @@ -1,20 +1,20 @@ -package com.yizhuan.erban.avroom.firstcharge +package com.mango.moshen.avroom.firstcharge import android.annotation.SuppressLint import android.os.Bundle import android.view.Gravity import android.view.View import android.view.WindowManager -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogSelectPayTypeBinding -import com.yizhuan.erban.ui.pay.ChargeActivity -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.PaymentActivity -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.SingleToastUtil +import com.mango.moshen.R +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogSelectPayTypeBinding +import com.mango.moshen.ui.pay.ChargeActivity +import com.mango.core.Constants +import com.mango.core.pay.PayModel +import com.mango.core.pay.PaymentActivity +import com.mango.core.pay.bean.WalletInfo +import com.mango.xchat_android_library.annatation.ActLayoutRes +import com.mango.xchat_android_library.utils.SingleToastUtil /** * 充值方式选择弹窗 diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/mango/moshen/avroom/fragment/BaseRoomFragment.kt similarity index 90% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt rename to app/src/main/java/com/mango/moshen/avroom/fragment/BaseRoomFragment.kt index 6e71e1c54..27f48128d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/BaseRoomFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.fragment +package com.mango.moshen.avroom.fragment import android.Manifest import android.annotation.SuppressLint @@ -33,89 +33,87 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage import com.orhanobut.logger.Logger import com.tbruyelle.rxpermissions2.RxPermissions import com.trello.rxlifecycle3.android.FragmentEvent -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.BottomViewListenerWrapper -import com.yizhuan.erban.avroom.SoftKeyBoardListener -import com.yizhuan.erban.avroom.SoftKeyBoardListener.OnSoftKeyBoardChangeListener -import com.yizhuan.erban.avroom.activity.RoomInviteActivity -import com.yizhuan.erban.avroom.activity.RoomTitleEditActivity -import com.yizhuan.erban.avroom.adapter.OnMicroItemClickListener -import com.yizhuan.erban.avroom.dialog.AttentionHintDialog -import com.yizhuan.erban.avroom.dialog.DatingVipRuleDialog -import com.yizhuan.erban.avroom.dialog.RoomOperationDialog -import com.yizhuan.erban.avroom.firstcharge.FirstChargeDialog -import com.yizhuan.erban.avroom.presenter.BaseRoomPresenter -import com.yizhuan.erban.avroom.redpackage.RedPackageSendDialog -import com.yizhuan.erban.avroom.view.IBaseRoomView -import com.yizhuan.erban.avroom.widget.BottomView -import com.yizhuan.erban.avroom.widget.MessageView -import com.yizhuan.erban.avroom.widget.MicroView -import com.yizhuan.erban.base.BaseMvpActivity -import com.yizhuan.erban.base.BaseMvpFragment -import com.yizhuan.erban.event.OpenRoomIntroEvent -import com.yizhuan.erban.friend.view.SelectFriendActivity -import com.yizhuan.erban.home.adapter.RoomActAdapter -import com.yizhuan.erban.home.adapter.RoomActAdapter.RoomActClickListener -import com.yizhuan.erban.shipantics.PullRadishActivity -import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper -import com.yizhuan.erban.ui.utils.loadAvatar -import com.yizhuan.erban.ui.webview.DialogWebViewActivity -import com.yizhuan.erban.ui.widget.ButtonItem -import com.yizhuan.erban.ui.widget.GiftDialog -import com.yizhuan.erban.ui.widget.GiftDialog.OnGiftDialogBtnClickListener -import com.yizhuan.erban.ui.widget.GiftDialog.SenGiftCallback -import com.yizhuan.erban.ui.widget.UserInfoDialog -import com.yizhuan.erban.ui.widget.dynamicface.DynamicFaceDialog -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView -import com.yizhuan.erban.ui.widget.rollviewpager.Util -import com.yizhuan.erban.ui.widget.rollviewpager.hintview.ColorPointHintView -import com.yizhuan.erban.utils.KeyBoardUtils -import com.yizhuan.tutu.music.widget.MusicPlayerView -import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity -import com.yizhuan.xchat_android_constants.XChatConstants -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.DemoCache -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.bean.RoomMicInfo -import com.yizhuan.xchat_android_core.gift.GiftModel -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo -import com.yizhuan.xchat_android_core.helper.AtProxy -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment -import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment2 -import com.yizhuan.xchat_android_core.initial.InitialModel -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo -import com.yizhuan.xchat_android_core.manager.AudioEngineManager -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager -import com.yizhuan.xchat_android_core.manager.RoomEvent -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringStopCountingEvent -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowGiftDialogEvent -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo -import com.yizhuan.xchat_android_core.room.bean.RoomInfo -import com.yizhuan.xchat_android_core.room.event.RoomAtEvent -import com.yizhuan.xchat_android_core.room.event.RoomClearScreenEvent -import com.yizhuan.xchat_android_core.room.game.GameStatus -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo -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.super_admin.SaConstant -import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel -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 -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils -import com.yizhuan.xchat_android_core.utils.net.VipLevelNotEnoughException -import com.yizhuan.xchat_android_library.net.rxnet.utils.RxNetWorkUtils -import com.yizhuan.xchat_android_library.rxbus.RxBus -import com.yizhuan.xchat_android_library.utils.* -import com.yizhuan.xchat_android_library.utils.config.BasicConfig +import com.mango.moshen.R +import com.mango.moshen.avroom.BottomViewListenerWrapper +import com.mango.moshen.avroom.SoftKeyBoardListener +import com.mango.moshen.avroom.SoftKeyBoardListener.OnSoftKeyBoardChangeListener +import com.mango.moshen.avroom.activity.RoomInviteActivity +import com.mango.moshen.avroom.activity.RoomTitleEditActivity +import com.mango.moshen.avroom.adapter.OnMicroItemClickListener +import com.mango.moshen.avroom.dialog.AttentionHintDialog +import com.mango.moshen.avroom.dialog.DatingVipRuleDialog +import com.mango.moshen.avroom.dialog.RoomOperationDialog +import com.mango.moshen.avroom.firstcharge.FirstChargeDialog +import com.mango.moshen.avroom.presenter.BaseRoomPresenter +import com.mango.moshen.avroom.redpackage.RedPackageSendDialog +import com.mango.moshen.avroom.view.IBaseRoomView +import com.mango.moshen.avroom.widget.BottomView +import com.mango.moshen.avroom.widget.MessageView +import com.mango.moshen.avroom.widget.MicroView +import com.mango.moshen.base.BaseMvpActivity +import com.mango.moshen.base.BaseMvpFragment +import com.mango.moshen.event.OpenRoomIntroEvent +import com.mango.moshen.friend.view.SelectFriendActivity +import com.mango.moshen.home.adapter.RoomActAdapter +import com.mango.moshen.home.adapter.RoomActAdapter.RoomActClickListener +import com.mango.moshen.shipantics.PullRadishActivity +import com.mango.moshen.treasure_box.widget.GoldBoxHelper +import com.mango.moshen.ui.utils.loadAvatar +import com.mango.moshen.ui.webview.DialogWebViewActivity +import com.mango.moshen.ui.widget.ButtonItem +import com.mango.moshen.ui.widget.GiftDialog +import com.mango.moshen.ui.widget.GiftDialog.OnGiftDialogBtnClickListener +import com.mango.moshen.ui.widget.GiftDialog.SenGiftCallback +import com.mango.moshen.ui.widget.UserInfoDialog +import com.mango.moshen.ui.widget.dynamicface.DynamicFaceDialog +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil +import com.mango.moshen.ui.widget.rollviewpager.RollPagerView +import com.mango.moshen.ui.widget.rollviewpager.Util +import com.mango.moshen.ui.widget.rollviewpager.hintview.ColorPointHintView +import com.mango.moshen.utils.KeyBoardUtils +import com.mango.moshen.music.widget.MusicPlayerView +import com.mango.moshen.room_chat.activity.RoomMsgActivity +import com.mango.xchat_android_constants.XChatConstants +import com.mango.core.Constants +import com.mango.core.DemoCache +import com.mango.core.UriProvider +import com.mango.core.auth.AuthModel +import com.mango.core.bean.RoomMicInfo +import com.mango.core.gift.GiftModel +import com.mango.core.gift.bean.GiftInfo +import com.mango.core.helper.AtProxy +import com.mango.core.home.bean.BannerInfo +import com.mango.core.im.custom.bean.RoomFollowOwnerAttachment +import com.mango.core.im.custom.bean.RoomFollowOwnerAttachment2 +import com.mango.core.manager.AudioEngineManager +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.manager.IMNetEaseManager +import com.mango.core.manager.RoomEvent +import com.mango.core.mentoring_relationship.event.MentoringStopCountingEvent +import com.mango.core.room.anotherroompk.ShowGiftDialogEvent +import com.mango.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.mango.core.room.bean.RoomContributeUserInfo +import com.mango.core.room.bean.RoomInfo +import com.mango.core.room.event.RoomAtEvent +import com.mango.core.room.event.RoomClearScreenEvent +import com.mango.core.room.game.GameStatus +import com.mango.core.room.giftvalue.helper.GiftValueMrg +import com.mango.core.room.queue.bean.MicMemberInfo +import com.mango.core.share.bean.SessionType +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.core.super_admin.SaConstant +import com.mango.core.super_admin.model.SuperAdminModel +import com.mango.core.super_admin.util.SuperAdminUtil +import com.mango.core.user.UserModel +import com.mango.core.user.bean.BaseInfo +import com.mango.core.user.bean.UserInfo +import com.mango.core.utils.CurrentTimeUtils +import com.mango.core.utils.net.VipLevelNotEnoughException +import com.mango.xchat_android_library.net.rxnet.utils.RxNetWorkUtils +import com.mango.xchat_android_library.rxbus.RxBus +import com.mango.xchat_android_library.utils.* +import com.mango.xchat_android_library.utils.config.BasicConfig import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/FakeSingleRoomBackFragment.kt b/app/src/main/java/com/mango/moshen/avroom/fragment/FakeSingleRoomBackFragment.kt similarity index 86% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/FakeSingleRoomBackFragment.kt rename to app/src/main/java/com/mango/moshen/avroom/fragment/FakeSingleRoomBackFragment.kt index 71b92cbbd..6cc7ca6b7 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/FakeSingleRoomBackFragment.kt +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/FakeSingleRoomBackFragment.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.avroom.fragment +package com.mango.moshen.avroom.fragment import android.annotation.SuppressLint -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.base.BaseViewBindingFragment -import com.yizhuan.erban.databinding.FragmentFakeSingleRoomBinding -import com.yizhuan.xchat_android_core.room.bean.RoomInfo -import com.yizhuan.xchat_android_core.room.event.SwitchRoomEvent -import com.yizhuan.xchat_android_core.room.model.AvRoomModel -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils -import com.yizhuan.xchat_android_core.utils.StringUtils +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.base.BaseViewBindingFragment +import com.mango.moshen.databinding.FragmentFakeSingleRoomBinding +import com.mango.core.room.bean.RoomInfo +import com.mango.core.room.event.SwitchRoomEvent +import com.mango.core.room.model.AvRoomModel +import com.mango.core.utils.CurrentTimeUtils +import com.mango.core.utils.StringUtils import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/FakeSingleRoomFragment.kt b/app/src/main/java/com/mango/moshen/avroom/fragment/FakeSingleRoomFragment.kt similarity index 85% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/FakeSingleRoomFragment.kt rename to app/src/main/java/com/mango/moshen/avroom/fragment/FakeSingleRoomFragment.kt index 211bdbc2c..374cc2a11 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/FakeSingleRoomFragment.kt +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/FakeSingleRoomFragment.kt @@ -1,19 +1,19 @@ -package com.yizhuan.erban.avroom.fragment +package com.mango.moshen.avroom.fragment import android.annotation.SuppressLint import com.opensource.svgaplayer.SVGADrawable import com.opensource.svgaplayer.SVGAImageView import com.opensource.svgaplayer.SVGAParser import com.opensource.svgaplayer.SVGAVideoEntity -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.base.BaseViewBindingFragment -import com.yizhuan.erban.databinding.FragmentFakeSingleRoomBinding -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.bean.RoomInfo -import com.yizhuan.xchat_android_core.room.event.SwitchRoomEvent -import com.yizhuan.xchat_android_core.room.model.AvRoomModel -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils -import com.yizhuan.xchat_android_core.utils.StringUtils +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.base.BaseViewBindingFragment +import com.mango.moshen.databinding.FragmentFakeSingleRoomBinding +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.room.bean.RoomInfo +import com.mango.core.room.event.SwitchRoomEvent +import com.mango.core.room.model.AvRoomModel +import com.mango.core.utils.CurrentTimeUtils +import com.mango.core.utils.StringUtils import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt b/app/src/main/java/com/mango/moshen/avroom/fragment/GameRoomFragment.kt similarity index 79% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt rename to app/src/main/java/com/mango/moshen/avroom/fragment/GameRoomFragment.kt index 1952da7e3..af8ae1191 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/GameRoomFragment.kt @@ -1,33 +1,28 @@ -package com.yizhuan.erban.avroom.fragment +package com.mango.moshen.avroom.fragment import android.annotation.SuppressLint import android.os.Bundle import android.view.View -import android.widget.LinearLayout import androidx.core.view.isInvisible import androidx.core.view.isVisible -import androidx.core.view.updateLayoutParams import androidx.databinding.DataBindingUtil -import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.adapter.GameMicroViewAdapter -import com.yizhuan.erban.avroom.adapter.GameMiniMicroViewAdapter -import com.yizhuan.erban.avroom.adapter.OnMicroItemClickListener -import com.yizhuan.erban.avroom.firstcharge.FirstChargePrizeDialog -import com.yizhuan.erban.avroom.game.GameDelegate -import com.yizhuan.erban.avroom.game.OnGameStatusChangeListener -import com.yizhuan.erban.avroom.presenter.GameRoomPresenter -import com.yizhuan.erban.avroom.view.IGameRoomView -import com.yizhuan.erban.databinding.FragmentGameRoomBinding -import com.yizhuan.erban.ui.widget.GiftDialog.OnGiftDialogBtnClickListener -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.music.model.PlayerModel -import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent -import com.yizhuan.xchat_android_core.room.event.FinishAvRoomEvent -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter -import org.greenrobot.eventbus.EventBus +import com.mango.moshen.R +import com.mango.moshen.avroom.adapter.GameMicroViewAdapter +import com.mango.moshen.avroom.adapter.GameMiniMicroViewAdapter +import com.mango.moshen.avroom.adapter.OnMicroItemClickListener +import com.mango.moshen.avroom.firstcharge.FirstChargePrizeDialog +import com.mango.moshen.avroom.game.GameDelegate +import com.mango.moshen.avroom.game.OnGameStatusChangeListener +import com.mango.moshen.avroom.presenter.GameRoomPresenter +import com.mango.moshen.avroom.view.IGameRoomView +import com.mango.moshen.databinding.FragmentGameRoomBinding +import com.mango.moshen.ui.widget.GiftDialog.OnGiftDialogBtnClickListener +import com.mango.core.home.bean.BannerInfo +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.music.model.PlayerModel +import com.mango.core.pay.event.FirstChargeEvent +import com.mango.core.room.event.FinishAvRoomEvent +import com.mango.xchat_android_library.base.factory.CreatePresenter import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyFragment.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyFragment.java index 30730676f..d920b5cee 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; import android.annotation.SuppressLint; import android.content.Intent; @@ -22,46 +22,46 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.opensource.svgaplayer.SVGAImageView; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.avroom.activity.RoomOnlineUserActivity; -import com.yizhuan.erban.avroom.adapter.SelectGameAdapter; -import com.yizhuan.erban.avroom.dialog.ExitRoomPopupWindow; -import com.yizhuan.erban.avroom.widget.GiftV2View; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.databinding.FragmentChatroomGameMainBinding; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.home.helper.OpenRoomHelper; -import com.yizhuan.erban.ui.widget.ShareDialog; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_core.home.event.FollowRoomEvent; -import com.yizhuan.xchat_android_core.home.event.ShareRoomEvent; -import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomInfoAttachment; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo; -import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomModeType; -import com.yizhuan.xchat_android_core.room.game.GameInfo; -import com.yizhuan.xchat_android_core.room.game.GameModel; -import com.yizhuan.xchat_android_core.room.queuing_mic.event.HasAnimationEffect; -import com.yizhuan.xchat_android_core.share.ShareModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -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.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.avroom.activity.RoomOnlineUserActivity; +import com.mango.moshen.avroom.adapter.SelectGameAdapter; +import com.mango.moshen.avroom.dialog.ExitRoomPopupWindow; +import com.mango.moshen.avroom.widget.GiftV2View; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.databinding.FragmentChatroomGameMainBinding; +import com.mango.moshen.friend.view.SelectFriendActivity; +import com.mango.moshen.home.helper.OpenRoomHelper; +import com.mango.moshen.ui.widget.ShareDialog; +import com.mango.moshen.utils.RegexUtil; +import com.mango.core.gift.bean.GiftMultiReceiverInfo; +import com.mango.core.gift.bean.GiftReceiveInfo; +import com.mango.core.gift.bean.LuckyBagGifts; +import com.mango.core.gift.bean.MultiGiftReceiveInfo; +import com.mango.core.home.event.FollowRoomEvent; +import com.mango.core.home.event.ShareRoomEvent; +import com.mango.core.home.model.CollectionRoomModel; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.RoomInfoAttachment; +import com.mango.core.magic.bean.MagicReceivedInfo; +import com.mango.core.magic.bean.MultiMagicReceivedInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.praise.PraiseModel; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomModeType; +import com.mango.core.room.game.GameInfo; +import com.mango.core.room.game.GameModel; +import com.mango.core.room.queuing_mic.event.HasAnimationEffect; +import com.mango.core.share.ShareModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyRoomFragment.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyRoomFragment.java index 0df856ae9..341696690 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyRoomFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; import android.annotation.SuppressLint; import android.os.Bundle; @@ -10,65 +10,65 @@ import androidx.databinding.DataBindingUtil; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.support.glide.GlideApp; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.avroom.adapter.BaseMicroViewAdapter; -import com.yizhuan.erban.avroom.adapter.CpMicroViewAdapter; -import com.yizhuan.erban.avroom.adapter.DatingMicroViewAdapter; -import com.yizhuan.erban.avroom.adapter.KtvMicroViewAdapter; -import com.yizhuan.erban.avroom.adapter.MicroViewAdapter; -import com.yizhuan.erban.avroom.anotherroompk.RoomPkFinishDialog; -import com.yizhuan.erban.avroom.anotherroompk.RoomPkForceFinishDialog; -import com.yizhuan.erban.avroom.anotherroompk.RoomPkReceivedDialog; -import com.yizhuan.erban.avroom.dialog.MicQueueDialog; -import com.yizhuan.erban.avroom.dialog.PKMicQueueDialog; -import com.yizhuan.erban.avroom.dialog.PKResultDialog; -import com.yizhuan.erban.avroom.dialog.PKScoreBoardDialog; -import com.yizhuan.erban.avroom.firstcharge.FirstChargePrizeDialog; -import com.yizhuan.erban.avroom.giftvalue.GiftValueDialogUiHelper; -import com.yizhuan.erban.avroom.ktv.KtvSongListActivity; -import com.yizhuan.erban.avroom.presenter.HomePartyPresenter; -import com.yizhuan.erban.avroom.view.IHomePartyView; -import com.yizhuan.erban.avroom.widget.PKBoardView; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.databinding.FragmentAvRoomGameBinding; -import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper; -import com.yizhuan.erban.ui.webview.DatingRuleWebViewActivity; -import com.yizhuan.erban.ui.webview.DialogWebViewActivity; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.home.event.ShareRoomEvent; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPKAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; -import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.event.DatingSelectUserEvent; -import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; -import com.yizhuan.xchat_android_core.room.face.FaceInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.MicQueueModel; -import com.yizhuan.xchat_android_core.room.pk.bean.PKRespQueuingMicListInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; -import com.yizhuan.xchat_android_core.room.pk.event.PKStateEvent; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.RespQueuingMicListInfo; -import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicEmptyEvent; -import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicNotEmptyEvent; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; -import com.yizhuan.xchat_android_library.utils.UIUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.avroom.adapter.BaseMicroViewAdapter; +import com.mango.moshen.avroom.adapter.CpMicroViewAdapter; +import com.mango.moshen.avroom.adapter.DatingMicroViewAdapter; +import com.mango.moshen.avroom.adapter.KtvMicroViewAdapter; +import com.mango.moshen.avroom.adapter.MicroViewAdapter; +import com.mango.moshen.avroom.anotherroompk.RoomPkFinishDialog; +import com.mango.moshen.avroom.anotherroompk.RoomPkForceFinishDialog; +import com.mango.moshen.avroom.anotherroompk.RoomPkReceivedDialog; +import com.mango.moshen.avroom.dialog.MicQueueDialog; +import com.mango.moshen.avroom.dialog.PKMicQueueDialog; +import com.mango.moshen.avroom.dialog.PKResultDialog; +import com.mango.moshen.avroom.dialog.PKScoreBoardDialog; +import com.mango.moshen.avroom.firstcharge.FirstChargePrizeDialog; +import com.mango.moshen.avroom.giftvalue.GiftValueDialogUiHelper; +import com.mango.moshen.avroom.ktv.KtvSongListActivity; +import com.mango.moshen.avroom.presenter.HomePartyPresenter; +import com.mango.moshen.avroom.view.IHomePartyView; +import com.mango.moshen.avroom.widget.PKBoardView; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.databinding.FragmentAvRoomGameBinding; +import com.mango.moshen.treasure_box.widget.GoldBoxHelper; +import com.mango.moshen.ui.webview.DatingRuleWebViewActivity; +import com.mango.moshen.ui.webview.DialogWebViewActivity; +import com.mango.moshen.utils.UserUtils; +import com.mango.core.Constants; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.home.bean.BannerInfo; +import com.mango.core.home.event.ShareRoomEvent; +import com.mango.core.im.custom.bean.RoomPKAttachment; +import com.mango.core.im.custom.bean.RoomPkBean; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.market_verify.MarketVerifyModel; +import com.mango.core.pay.event.FirstChargeEvent; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.event.DatingSelectUserEvent; +import com.mango.core.room.face.DynamicFaceModel; +import com.mango.core.room.face.FaceInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.room.model.MicQueueModel; +import com.mango.core.room.pk.bean.PKRespQueuingMicListInfo; +import com.mango.core.room.pk.bean.RoomPkData; +import com.mango.core.room.pk.event.PKStateEvent; +import com.mango.core.room.pk.model.PkModel; +import com.mango.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.mango.core.room.queuing_mic.event.QueuingMicEmptyEvent; +import com.mango.core.room.queuing_mic.event.QueuingMicNotEmptyEvent; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.core.user.UserModel; +import com.mango.core.utils.CurrentTimeUtils; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.TimeUtils; +import com.mango.xchat_android_library.utils.UIUtils; +import com.mango.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/IRoomRankDialogChangePageListener.java b/app/src/main/java/com/mango/moshen/avroom/fragment/IRoomRankDialogChangePageListener.java similarity index 67% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/IRoomRankDialogChangePageListener.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/IRoomRankDialogChangePageListener.java index de6ef8d91..db50742d7 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/IRoomRankDialogChangePageListener.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/IRoomRankDialogChangePageListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; public interface IRoomRankDialogChangePageListener { void onChangePage(int pos); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/IRoomRankDialogDismissListener.java b/app/src/main/java/com/mango/moshen/avroom/fragment/IRoomRankDialogDismissListener.java similarity index 63% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/IRoomRankDialogDismissListener.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/IRoomRankDialogDismissListener.java index 423344361..3e9f0926a 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/IRoomRankDialogDismissListener.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/IRoomRankDialogDismissListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; public interface IRoomRankDialogDismissListener { void onDismiss(); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/IRoomRankHalfHourView.java b/app/src/main/java/com/mango/moshen/avroom/fragment/IRoomRankHalfHourView.java similarity index 51% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/IRoomRankHalfHourView.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/IRoomRankHalfHourView.java index 13dc77d50..b1c83a715 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/IRoomRankHalfHourView.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/IRoomRankHalfHourView.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourMeInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourRankInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.room.bean.RoomRankHalfHourMeInfo; +import com.mango.core.room.bean.RoomRankHalfHourRankInfo; +import com.mango.core.room.bean.RoomRankMultiItem; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/InputPwdDialogFragment.java b/app/src/main/java/com/mango/moshen/avroom/fragment/InputPwdDialogFragment.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/InputPwdDialogFragment.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/InputPwdDialogFragment.java index acb921623..56f8dcf65 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/InputPwdDialogFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/InputPwdDialogFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; import android.os.Bundle; import androidx.annotation.Nullable; @@ -10,8 +10,8 @@ import android.view.ViewGroup; import android.widget.EditText; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.codec.DESUtils; /** *

密码框输入

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/InviteFriendListFragment.java b/app/src/main/java/com/mango/moshen/avroom/fragment/InviteFriendListFragment.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/InviteFriendListFragment.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/InviteFriendListFragment.java index b1f5133ae..596172fa7 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/InviteFriendListFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/InviteFriendListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; import android.os.Bundle; import androidx.annotation.Nullable; @@ -6,16 +6,16 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -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.bean.PublicChatHallFriendInfo; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RelationShipEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.InviteFriendListAdapter; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.public_chat_hall.bean.PublicChatHallFriendInfo; +import com.mango.core.im.friend.IMFriendModel; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RelationShipEvent; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/OnlineUserFragment.java b/app/src/main/java/com/mango/moshen/avroom/fragment/OnlineUserFragment.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/OnlineUserFragment.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/OnlineUserFragment.java index 54f7df78b..b64a2f7ae 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/OnlineUserFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/OnlineUserFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; import android.view.View; @@ -12,20 +12,20 @@ import com.orhanobut.logger.Logger; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.OnlineUserAdapter; -import com.yizhuan.erban.avroom.presenter.HomePartyUserListPresenter; -import com.yizhuan.erban.avroom.view.IHomePartyUserListView; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.ui.widget.UserInfoDialog; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.OnlineUserAdapter; +import com.mango.moshen.avroom.presenter.HomePartyUserListPresenter; +import com.mango.moshen.avroom.view.IHomePartyUserListView; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.ui.widget.UserInfoDialog; +import com.mango.core.Constants; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.OnlineChatMember; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.Iterator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmListFragment.java b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomCharmListFragment.java similarity index 65% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmListFragment.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/RoomCharmListFragment.java index 8975da47a..60c077c8e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmListFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomCharmListFragment.java @@ -1,17 +1,16 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; import androidx.fragment.app.Fragment; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.erban.avroom.widget.RankNavigatorAdapter; -import com.yizhuan.erban.base.BaseBindingFragment; -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.erban.databinding.FragmentRoomCharmListBinding; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.RoomContributeListAdapter; +import com.mango.moshen.avroom.widget.RankNavigatorAdapter; +import com.mango.moshen.base.BaseBindingFragment; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.core.room.bean.RoomContributeDataInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.databinding.FragmentRoomCharmListBinding; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmRankingListFragment.java b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomCharmRankingListFragment.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmRankingListFragment.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/RoomCharmRankingListFragment.java index e9b3229a1..61b5a2d22 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmRankingListFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomCharmRankingListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -12,24 +12,21 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.netease.nim.uikit.common.util.sys.NetworkUtil; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.ButtonItemFactory; -import com.yizhuan.erban.avroom.adapter.RoomConsumerListAdapterTemp; -import com.yizhuan.erban.avroom.presenter.RoomCharmRankingPresenter; -import com.yizhuan.erban.avroom.view.IRoomCharmRankingListView; -import com.yizhuan.erban.avroom.widget.ViewItem; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.ui.widget.GiftDialog; -import com.yizhuan.erban.ui.widget.UserInfoDialog; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.RoomConsumerListAdapterTemp; +import com.mango.moshen.avroom.presenter.RoomCharmRankingPresenter; +import com.mango.moshen.avroom.view.IRoomCharmRankingListView; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.ui.widget.GiftDialog; +import com.mango.moshen.ui.widget.UserInfoDialog; +import com.mango.core.Constants; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.RoomContributeUserInfo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomRankMultiItem; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeFragment.java b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomContributeFragment.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeFragment.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/RoomContributeFragment.java index 090aedef5..96ac94f88 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomContributeFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; import android.os.Bundle; import androidx.recyclerview.widget.LinearLayoutManager; @@ -11,21 +11,18 @@ import com.netease.nim.uikit.common.util.sys.NetworkUtil; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.ButtonItemFactory; -import com.yizhuan.erban.avroom.adapter.RoomConsumerListAdapterTemp; -import com.yizhuan.erban.avroom.presenter.RoomContributeListPresenter; -import com.yizhuan.erban.avroom.view.IRoomContributeListView; -import com.yizhuan.erban.avroom.widget.ViewItem; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.ui.widget.GiftDialog; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.ui.widget.UserInfoDialog; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.RoomConsumerListAdapterTemp; +import com.mango.moshen.avroom.presenter.RoomContributeListPresenter; +import com.mango.moshen.avroom.view.IRoomContributeListView; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.core.room.bean.RoomRankMultiItem; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.ui.widget.UserInfoDialog; +import com.mango.core.Constants; +import com.mango.core.room.bean.RoomContributeDataInfo; +import com.mango.core.room.bean.RoomContributeUserInfo; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomContributeListFragment.java similarity index 72% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/RoomContributeListFragment.java index 43d9d9307..691cfd4b3 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomContributeListFragment.java @@ -1,18 +1,18 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.erban.avroom.widget.RankNavigatorAdapter; -import com.yizhuan.erban.base.BaseMvpFragment; -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.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.RoomContributeListAdapter; +import com.mango.moshen.avroom.widget.RankNavigatorAdapter; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.RoomContributeDataInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomRankDialogFragment.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/RoomRankDialogFragment.java index cdd9e25de..7dcb3ab3b 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomRankDialogFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; import android.app.Dialog; import android.content.Context; @@ -15,8 +15,8 @@ import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.RoomRankFragmentPageAdapter; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.RoomRankFragmentPageAdapter; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogUtils.java b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomRankDialogUtils.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogUtils.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/RoomRankDialogUtils.java index 6f261dc5e..71a8df76f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogUtils.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomRankDialogUtils.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.math.BigDecimal; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankListFragment.java b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomRankListFragment.java similarity index 81% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankListFragment.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/RoomRankListFragment.java index c2aceec1e..3a10d7a3a 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankListFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomRankListFragment.java @@ -1,19 +1,19 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; import androidx.fragment.app.Fragment; import android.view.View; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.erban.avroom.widget.RoomRankNavigatorAdapter; -import com.yizhuan.erban.base.BaseBindingFragment; -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.RoomContributeListAdapter; +import com.mango.moshen.avroom.widget.RoomRankNavigatorAdapter; +import com.mango.moshen.base.BaseBindingFragment; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.xchat_android_library.annatation.ActLayoutRes; import java.util.ArrayList; import java.util.List; -import com.yizhuan.erban.databinding.FragmentRoomRankListBinding; +import com.mango.moshen.databinding.FragmentRoomRankListBinding; @ActLayoutRes(R.layout.fragment_room_rank_list) public class RoomRankListFragment extends BaseBindingFragment implements View.OnClickListener, IRoomRankDialogDismissListener{ diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomTitleDialogFragment.java b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomTitleDialogFragment.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomTitleDialogFragment.java rename to app/src/main/java/com/mango/moshen/avroom/fragment/RoomTitleDialogFragment.java index 60469ff7b..3db231cd6 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomTitleDialogFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/RoomTitleDialogFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.fragment; +package com.mango.moshen.avroom.fragment; import android.os.Bundle; import androidx.annotation.NonNull; @@ -14,7 +14,7 @@ import android.view.Window; import android.view.WindowManager; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; public class RoomTitleDialogFragment extends DialogFragment { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt b/app/src/main/java/com/mango/moshen/avroom/fragment/SingleRoomFragment.kt similarity index 81% rename from app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt rename to app/src/main/java/com/mango/moshen/avroom/fragment/SingleRoomFragment.kt index 414ab85b8..7760084a2 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/SingleRoomFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.fragment +package com.mango.moshen.avroom.fragment import android.annotation.SuppressLint import android.os.Bundle @@ -9,40 +9,38 @@ import androidx.core.view.updateLayoutParams import androidx.databinding.DataBindingUtil import androidx.fragment.app.viewModels import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.adapter.OnMicroItemClickListener -import com.yizhuan.erban.avroom.adapter.SingleAnchorMicroViewAdapter -import com.yizhuan.erban.avroom.adapter.SingleRoomPKMicroViewAdapter -import com.yizhuan.erban.avroom.dialog.RequestUpMicDialog -import com.yizhuan.erban.avroom.firstcharge.FirstChargePrizeDialog -import com.yizhuan.erban.avroom.presenter.SingleRoomPresenter -import com.yizhuan.erban.avroom.singleroompk.SingleRoomPkFinishDialog -import com.yizhuan.erban.avroom.singleroompk.SingleRoomPkForceFinishDialog -import com.yizhuan.erban.avroom.singleroompk.SingleRoomPkReceivedDialog -import com.yizhuan.erban.avroom.view.ISingleRoomView -import com.yizhuan.erban.databinding.FragmentSingleRoomBinding -import com.yizhuan.erban.fansteam.FansTeamJoinActivity -import com.yizhuan.erban.fansteam.FansTeamJoinedActivity -import com.yizhuan.erban.fansteam.FansTeamViewModel -import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.erban.ui.webview.CommonWebViewActivity -import com.yizhuan.erban.ui.webview.DialogWebViewActivity -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.fansteam.FansTeamInitInfo -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_core.im.custom.bean.FansTeamMsgAttachment -import com.yizhuan.xchat_android_core.im.custom.bean.RequestUpmicAttachment -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPKAttachment -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.manager.RoomEvent -import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueFormat -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter +import com.mango.moshen.R +import com.mango.moshen.avroom.adapter.OnMicroItemClickListener +import com.mango.moshen.avroom.adapter.SingleAnchorMicroViewAdapter +import com.mango.moshen.avroom.adapter.SingleRoomPKMicroViewAdapter +import com.mango.moshen.avroom.dialog.RequestUpMicDialog +import com.mango.moshen.avroom.firstcharge.FirstChargePrizeDialog +import com.mango.moshen.avroom.presenter.SingleRoomPresenter +import com.mango.moshen.avroom.singleroompk.SingleRoomPkFinishDialog +import com.mango.moshen.avroom.singleroompk.SingleRoomPkForceFinishDialog +import com.mango.moshen.avroom.singleroompk.SingleRoomPkReceivedDialog +import com.mango.moshen.avroom.view.ISingleRoomView +import com.mango.moshen.databinding.FragmentSingleRoomBinding +import com.mango.moshen.fansteam.FansTeamJoinActivity +import com.mango.moshen.fansteam.FansTeamJoinedActivity +import com.mango.moshen.fansteam.FansTeamViewModel +import com.mango.moshen.treasure_box.widget.GoldBoxHelper +import com.mango.moshen.ui.utils.load +import com.mango.moshen.ui.webview.CommonWebViewActivity +import com.mango.moshen.ui.webview.DialogWebViewActivity +import com.mango.core.UriProvider +import com.mango.core.auth.AuthModel +import com.mango.core.fansteam.FansTeamInitInfo +import com.mango.core.home.bean.BannerInfo +import com.mango.core.im.custom.bean.FansTeamMsgAttachment +import com.mango.core.im.custom.bean.RequestUpmicAttachment +import com.mango.core.im.custom.bean.RoomPKAttachment +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.manager.RoomEvent +import com.mango.core.pay.event.FirstChargeEvent +import com.mango.core.user.UserModel +import com.mango.core.user.bean.UserInfo +import com.mango.xchat_android_library.base.factory.CreatePresenter import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/AppConfig.java b/app/src/main/java/com/mango/moshen/avroom/game/AppConfig.java similarity index 78% rename from app/src/main/java/com/yizhuan/erban/avroom/game/AppConfig.java rename to app/src/main/java/com/mango/moshen/avroom/game/AppConfig.java index 735fe3def..7dbd78fe8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/game/AppConfig.java +++ b/app/src/main/java/com/mango/moshen/avroom/game/AppConfig.java @@ -2,9 +2,9 @@ Copyright © Sud.Tech https://sud.tech */ -package com.yizhuan.erban.avroom.game; +package com.mango.moshen.avroom.game; -import com.yizhuan.erban.BuildConfig; +import com.mango.moshen.BuildConfig; public class AppConfig { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt b/app/src/main/java/com/mango/moshen/avroom/game/GameDelegate.kt similarity index 96% rename from app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt rename to app/src/main/java/com/mango/moshen/avroom/game/GameDelegate.kt index 064e15eae..847994b67 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt +++ b/app/src/main/java/com/mango/moshen/avroom/game/GameDelegate.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.game +package com.mango.moshen.avroom.game import android.annotation.SuppressLint import android.app.Activity @@ -12,17 +12,17 @@ import android.view.ViewTreeObserver.OnGlobalLayoutListener import android.widget.FrameLayout import com.google.gson.Gson import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.game.GameCfg -import com.yizhuan.xchat_android_core.room.game.GameModel -import com.yizhuan.xchat_android_core.room.game.GameStatus -import com.yizhuan.xchat_android_core.room.model.HomePartyModel -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.utils.LogUtils -import com.yizhuan.xchat_android_core.utils.net.RxHelper -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack -import com.yizhuan.xchat_android_library.utils.SingleToastUtil +import com.mango.core.auth.AuthModel +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.room.game.GameCfg +import com.mango.core.room.game.GameModel +import com.mango.core.room.game.GameStatus +import com.mango.core.room.model.HomePartyModel +import com.mango.core.user.UserModel +import com.mango.core.utils.LogUtils +import com.mango.core.utils.net.RxHelper +import com.mango.xchat_android_library.net.rxnet.callback.CallBack +import com.mango.xchat_android_library.utils.SingleToastUtil import okhttp3.* import org.json.JSONException import org.json.JSONObject diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/OnGameStatusChangeListener.kt b/app/src/main/java/com/mango/moshen/avroom/game/OnGameStatusChangeListener.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/avroom/game/OnGameStatusChangeListener.kt rename to app/src/main/java/com/mango/moshen/avroom/game/OnGameStatusChangeListener.kt index 9314bd771..de4e26acc 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/game/OnGameStatusChangeListener.kt +++ b/app/src/main/java/com/mango/moshen/avroom/game/OnGameStatusChangeListener.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.game +package com.mango.moshen.avroom.game interface OnGameStatusChangeListener { /** diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/SudMGPAPPState.java b/app/src/main/java/com/mango/moshen/avroom/game/SudMGPAPPState.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/avroom/game/SudMGPAPPState.java rename to app/src/main/java/com/mango/moshen/avroom/game/SudMGPAPPState.java index 65a47b0c3..73ef56e73 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/game/SudMGPAPPState.java +++ b/app/src/main/java/com/mango/moshen/avroom/game/SudMGPAPPState.java @@ -2,7 +2,7 @@ Copyright © Sud.Tech https://sud.tech */ -package com.yizhuan.erban.avroom.game; +package com.mango.moshen.avroom.game; /** * Time:2021/10/19 diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/SudMGPMGState.java b/app/src/main/java/com/mango/moshen/avroom/game/SudMGPMGState.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/avroom/game/SudMGPMGState.java rename to app/src/main/java/com/mango/moshen/avroom/game/SudMGPMGState.java index 7421af13e..aefb7d094 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/game/SudMGPMGState.java +++ b/app/src/main/java/com/mango/moshen/avroom/game/SudMGPMGState.java @@ -2,7 +2,7 @@ Copyright © Sud.Tech https://sud.tech */ -package com.yizhuan.erban.avroom.game; +package com.mango.moshen.avroom.game; /** * Time:2021/10/19 diff --git a/app/src/main/java/com/yizhuan/erban/avroom/giftvalue/GiftValueDialogUiHelper.java b/app/src/main/java/com/mango/moshen/avroom/giftvalue/GiftValueDialogUiHelper.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/avroom/giftvalue/GiftValueDialogUiHelper.java rename to app/src/main/java/com/mango/moshen/avroom/giftvalue/GiftValueDialogUiHelper.java index 0db0324e6..1efebb9bf 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/giftvalue/GiftValueDialogUiHelper.java +++ b/app/src/main/java/com/mango/moshen/avroom/giftvalue/GiftValueDialogUiHelper.java @@ -1,14 +1,14 @@ -package com.yizhuan.erban.avroom.giftvalue; +package com.mango.moshen.avroom.giftvalue; import android.content.Context; import androidx.annotation.Nullable; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.utils.ActivityUtil; +import com.mango.core.utils.SharedPreferenceUtils; /** * 礼物值的弹框处理 diff --git a/app/src/main/java/com/yizhuan/erban/avroom/helper/AnimHelper.java b/app/src/main/java/com/mango/moshen/avroom/helper/AnimHelper.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/avroom/helper/AnimHelper.java rename to app/src/main/java/com/mango/moshen/avroom/helper/AnimHelper.java index b2edc55eb..7f8daf78e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/helper/AnimHelper.java +++ b/app/src/main/java/com/mango/moshen/avroom/helper/AnimHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.helper; +package com.mango.moshen.avroom.helper; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -26,10 +26,10 @@ import com.coorchice.library.utils.LogUtils; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nim.uikit.support.glide.GlideApp; import com.opensource.svgaplayer.SVGADynamicEntity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.application.XChatApplication; +import com.mango.moshen.R; +import com.mango.moshen.application.XChatApplication; -import static com.yizhuan.xchat_android_constants.XChatConstants.SELECT_ANIM_DURATION; +import static com.mango.xchat_android_constants.XChatConstants.SELECT_ANIM_DURATION; public class AnimHelper { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/helper/RoomViewModel.java b/app/src/main/java/com/mango/moshen/avroom/helper/RoomViewModel.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/avroom/helper/RoomViewModel.java rename to app/src/main/java/com/mango/moshen/avroom/helper/RoomViewModel.java index 8d4b97d7f..ec243acdc 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/helper/RoomViewModel.java +++ b/app/src/main/java/com/mango/moshen/avroom/helper/RoomViewModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.helper; +package com.mango.moshen.avroom.helper; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KickDownMicEvent.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KickDownMicEvent.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KickDownMicEvent.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KickDownMicEvent.java index d5b506dde..f3ff11a29 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KickDownMicEvent.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KickDownMicEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; public class KickDownMicEvent { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvCommitErrorDialog.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvCommitErrorDialog.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvCommitErrorDialog.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvCommitErrorDialog.java index 0b0609636..9b05fa446 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvCommitErrorDialog.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvCommitErrorDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; import android.content.Context; import android.text.TextUtils; @@ -7,12 +7,12 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog; -import com.yizhuan.erban.databinding.DialogKtvCommitErrorBinding; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog; +import com.mango.moshen.databinding.DialogKtvCommitErrorBinding; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.SingleToastUtil; @ActLayoutRes(R.layout.dialog_ktv_commit_error) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvHelper.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvHelper.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvHelper.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvHelper.java index 0cf65e758..92d7e4f40 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvHelper.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; import android.content.Context; import android.view.LayoutInflater; @@ -10,16 +10,16 @@ import android.widget.TextView; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.erban.R; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.xchat_android_core.im.custom.bean.MusicInfoAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; +import com.mango.moshen.R; +import com.mango.moshen.utils.UserUtils; +import com.mango.core.im.custom.bean.MusicInfoAttachment; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.room.ktv.bean.MusicInfo; +import com.mango.xchat_android_library.utils.NetworkUtils; import io.reactivex.Single; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_KTV; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_KTV; public class KtvHelper { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvMusicManager.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvMusicManager.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvMusicManager.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvMusicManager.java index a4c740b6b..79ec578b5 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvMusicManager.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvMusicManager.java @@ -1,22 +1,22 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.coorchice.library.utils.LogUtils; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; +import com.mango.moshen.utils.UserUtils; +import com.mango.core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.room.ktv.KtvModel; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; -import com.yizhuan.xchat_android_core.room.ktv.bean.RoomMusicInfo; -import com.yizhuan.xchat_android_core.room.ktv.event.KtvEvent; -import com.yizhuan.xchat_android_core.room.ktv.event.MusicCountEvent; -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 com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.AudioEngineManager; +import com.mango.core.room.ktv.KtvModel; +import com.mango.core.room.ktv.bean.MusicInfo; +import com.mango.core.room.ktv.bean.RoomMusicInfo; +import com.mango.core.room.ktv.event.KtvEvent; +import com.mango.core.room.ktv.event.MusicCountEvent; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.Iterator; @@ -29,9 +29,9 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_DELETE_USER_ALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_FINISH; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_SWITCH; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_DELETE_USER_ALL; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_FINISH; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_SWITCH; public enum KtvMusicManager { INSTANCE; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListActivity.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvRoomListActivity.java similarity index 75% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListActivity.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvRoomListActivity.java index e22672263..e6a06e13c 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListActivity.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvRoomListActivity.java @@ -1,19 +1,19 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; import android.content.Context; import android.content.Intent; import androidx.fragment.app.Fragment; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.common.ViewPagerAdapter; -import com.yizhuan.erban.databinding.ActivityKtvRoomListBinding; -import com.yizhuan.erban.decoration.view.widgets.CarMagicIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; -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.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.CommonUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.common.ViewPagerAdapter; +import com.mango.moshen.databinding.ActivityKtvRoomListBinding; +import com.mango.moshen.decoration.view.widgets.CarMagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.core.home.bean.TabInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.CommonUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListFragment.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvRoomListFragment.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListFragment.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvRoomListFragment.java index e4bf62bfe..4cc8dbb4d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvRoomListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; import android.os.Bundle; @@ -6,14 +6,14 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.BR; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.base.BaseBindingFragment; -import com.yizhuan.erban.bindadapter.BaseAdapter; -import com.yizhuan.erban.databinding.FragmentRecyclerViewBindNoBgBinding; -import com.yizhuan.xchat_android_core.room.ktv.bean.KtvRoomInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.base.BaseBindingFragment; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.databinding.FragmentRecyclerViewBindNoBgBinding; +import com.mango.core.room.ktv.bean.KtvRoomInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.fragment_recycler_view_bind_no_bg) public class KtvRoomListFragment extends BaseBindingFragment implements SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListVm.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvRoomListVm.java similarity index 58% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListVm.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvRoomListVm.java index 970b6bcc4..28a945c4d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvRoomListVm.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvRoomListVm.java @@ -1,12 +1,11 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; -import com.yizhuan.erban.base.BaseListViewModel; -import com.yizhuan.erban.base.BaseMsListViewModel; -import com.yizhuan.erban.databinding.FragmentRecyclerViewBindNoBgBinding; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.ktv.KtvModel; -import com.yizhuan.xchat_android_core.room.ktv.bean.KtvRoomInfo; +import com.mango.moshen.base.BaseMsListViewModel; +import com.mango.moshen.databinding.FragmentRecyclerViewBindNoBgBinding; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.ktv.KtvModel; +import com.mango.core.room.ktv.bean.KtvRoomInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSearchSongActivity.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSearchSongActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSearchSongActivity.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvSearchSongActivity.java index bf69bb953..195fb1acb 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSearchSongActivity.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSearchSongActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; import android.annotation.SuppressLint; import android.content.Context; @@ -18,21 +18,21 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.chad.library.adapter.base.BaseQuickAdapter; import com.coorchice.library.SuperTextView; import com.google.android.flexbox.FlexboxLayout; -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.ActivityKtvSearchSongBinding; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; -import com.yizhuan.xchat_android_core.room.ktv.event.KtvEvent; -import com.yizhuan.xchat_android_core.room.ktv.event.MusicCountEvent; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.rxbus.RxBus; -import com.yizhuan.xchat_android_library.utils.CommonUtils; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.databinding.ActivityKtvSearchSongBinding; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.utils.UserUtils; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.ktv.bean.MusicInfo; +import com.mango.core.room.ktv.event.KtvEvent; +import com.mango.core.room.ktv.event.MusicCountEvent; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_library.utils.CommonUtils; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSearchSongVm.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSearchSongVm.java similarity index 78% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSearchSongVm.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvSearchSongVm.java index 95043c670..ee1af9af6 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSearchSongVm.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSearchSongVm.java @@ -1,16 +1,16 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; import android.text.TextUtils; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.erban.base.BaseMsListViewModel; -import com.yizhuan.erban.databinding.ActivityKtvSearchSongBinding; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.ktv.KtvModel; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.mango.moshen.base.BaseMsListViewModel; +import com.mango.moshen.databinding.ActivityKtvSearchSongBinding; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.ktv.KtvModel; +import com.mango.core.room.ktv.bean.MusicInfo; +import com.mango.core.utils.SharedPreferenceUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSelectSongActivity.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSelectSongActivity.java similarity index 77% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSelectSongActivity.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvSelectSongActivity.java index e8576229a..7a49b92c4 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSelectSongActivity.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSelectSongActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; import android.annotation.SuppressLint; import android.content.Context; @@ -8,22 +8,22 @@ import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; -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.common.widget.dialog.DialogManager; -import com.yizhuan.erban.databinding.ActivityKtvSelectSongBinding; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; -import com.yizhuan.xchat_android_core.room.ktv.event.MusicCountEvent; -import com.yizhuan.xchat_android_core.super_admin.SaConstant; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.rxbus.RxBus; -import com.yizhuan.xchat_android_library.utils.CommonUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.databinding.ActivityKtvSelectSongBinding; +import com.mango.moshen.utils.UserUtils; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.ktv.bean.MusicInfo; +import com.mango.core.room.ktv.event.MusicCountEvent; +import com.mango.core.super_admin.SaConstant; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_library.utils.CommonUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSelectSongDialog.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSelectSongDialog.java similarity index 74% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSelectSongDialog.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvSelectSongDialog.java index af296398a..0bd0c0b1e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSelectSongDialog.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSelectSongDialog.java @@ -1,27 +1,27 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; import android.content.Context; import android.text.style.ForegroundColorSpan; import android.view.View; -import com.yizhuan.erban.R; -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog; -import com.yizhuan.erban.avroom.widget.MessageView; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.databinding.DialogKtvSelectSongBinding; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; -import com.yizhuan.xchat_android_core.room.ktv.event.KtvEvent; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.rxbus.RxBus; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog; +import com.mango.moshen.avroom.widget.MessageView; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.databinding.DialogKtvSelectSongBinding; +import com.mango.moshen.utils.UserUtils; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.AudioEngineManager; +import com.mango.core.room.ktv.bean.MusicInfo; +import com.mango.core.room.ktv.event.KtvEvent; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_library.utils.SingleToastUtil; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_ADD; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_ADD; @ActLayoutRes(R.layout.dialog_ktv_select_song) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSelectSongVm.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSelectSongVm.java similarity index 53% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSelectSongVm.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvSelectSongVm.java index 9c1554eb8..64d62c067 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSelectSongVm.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSelectSongVm.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; -import com.yizhuan.erban.base.BaseMsListViewModel; -import com.yizhuan.erban.databinding.ActivityKtvSelectSongBinding; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.ktv.KtvModel; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; +import com.mango.moshen.base.BaseMsListViewModel; +import com.mango.moshen.databinding.ActivityKtvSelectSongBinding; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.ktv.KtvModel; +import com.mango.core.room.ktv.bean.MusicInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListActivity.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSongListActivity.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListActivity.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvSongListActivity.java index 6ebcfb2bd..b35c16e73 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListActivity.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSongListActivity.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_DELETE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_TOP; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_DELETE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_TOP; import android.content.Context; import android.content.Intent; @@ -13,21 +13,21 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.BR; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bindadapter.BaseAdapter; -import com.yizhuan.erban.databinding.ActivityKtvSongListBinding; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; -import com.yizhuan.xchat_android_core.room.ktv.event.KtvEvent; -import com.yizhuan.xchat_android_core.super_admin.SaConstant; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.rxbus.RxBus; -import com.yizhuan.xchat_android_library.utils.CommonUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.databinding.ActivityKtvSongListBinding; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.room.ktv.bean.MusicInfo; +import com.mango.core.room.ktv.event.KtvEvent; +import com.mango.core.super_admin.SaConstant; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_library.utils.CommonUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.Collections; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListAdapter.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSongListAdapter.java similarity index 74% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvSongListAdapter.java index 0d1debb6f..a10b64e9e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSongListAdapter.java @@ -1,14 +1,14 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; import androidx.annotation.Nullable; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bindadapter.BaseAdapter; -import com.yizhuan.erban.bindadapter.BindingViewHolder; -import com.yizhuan.erban.ui.widget.LivingIconView; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; +import com.mango.moshen.R; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.bindadapter.BindingViewHolder; +import com.mango.moshen.ui.widget.LivingIconView; +import com.mango.moshen.utils.UserUtils; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.ktv.bean.MusicInfo; public class KtvSongListAdapter extends BaseAdapter { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListVm.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSongListVm.java similarity index 73% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListVm.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvSongListVm.java index 37f9100ed..e3c0de459 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvSongListVm.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvSongListVm.java @@ -1,15 +1,14 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; import androidx.lifecycle.MutableLiveData; -import androidx.databinding.ObservableInt; -import com.yizhuan.erban.base.BaseMsListViewModel; -import com.yizhuan.erban.databinding.ActivityKtvSongListBinding; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.ktv.KtvModel; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; +import com.mango.moshen.base.BaseMsListViewModel; +import com.mango.moshen.databinding.ActivityKtvSongListBinding; +import com.mango.moshen.utils.UserUtils; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.ktv.KtvModel; +import com.mango.core.room.ktv.bean.MusicInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvView.java b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvView.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvView.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/KtvView.java index 743df8235..2643aaf67 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/KtvView.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/KtvView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; import android.annotation.SuppressLint; import android.content.Context; @@ -20,23 +20,23 @@ import com.coorchice.library.SuperTextView; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.orhanobut.logger.Logger; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; -import com.yizhuan.xchat_android_core.room.ktv.event.KtvEvent; -import com.yizhuan.xchat_android_core.room.ktv.event.RemoteVideoEvent; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.super_admin.SaConstant; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_library.rxbus.RxBus; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.utils.UserUtils; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.AudioEngineManager; +import com.mango.core.room.ktv.bean.MusicInfo; +import com.mango.core.room.ktv.event.KtvEvent; +import com.mango.core.room.ktv.event.RemoteVideoEvent; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.super_admin.SaConstant; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.concurrent.TimeUnit; @@ -52,7 +52,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.Disposable; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_CLOSE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_KTV_CLOSE; public class KtvView extends CardView { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ktv/LambdaOnSeekBarChangeListener.java b/app/src/main/java/com/mango/moshen/avroom/ktv/LambdaOnSeekBarChangeListener.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/avroom/ktv/LambdaOnSeekBarChangeListener.java rename to app/src/main/java/com/mango/moshen/avroom/ktv/LambdaOnSeekBarChangeListener.java index fafca7b98..c77233b37 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/ktv/LambdaOnSeekBarChangeListener.java +++ b/app/src/main/java/com/mango/moshen/avroom/ktv/LambdaOnSeekBarChangeListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.ktv; +package com.mango.moshen.avroom.ktv; import android.widget.SeekBar; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt b/app/src/main/java/com/mango/moshen/avroom/newuserchargegift/NewUserChargeGiftDialog.kt similarity index 82% rename from app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/newuserchargegift/NewUserChargeGiftDialog.kt index 77f015900..8cce69547 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/newuserchargegift/NewUserChargeGiftDialog.kt @@ -1,49 +1,43 @@ -package com.yizhuan.erban.avroom.newuserchargegift +package com.mango.moshen.avroom.newuserchargegift import android.annotation.SuppressLint import android.content.Context import android.content.Intent -import android.graphics.Color -import android.text.Spannable -import android.text.SpannableStringBuilder -import android.text.style.ForegroundColorSpan import android.view.Gravity import android.view.View import android.view.WindowManager -import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.netease.nim.uikit.common.util.sys.TimeUtil import com.trello.rxlifecycle3.android.ActivityEvent -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.firstcharge.SelectPayTypeDialog -import com.yizhuan.erban.bank_card.activity.AddBankCardAgreementActivity -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.common.widget.dialog.DialogManager -import com.yizhuan.erban.common.widget.dialog.DialogManager.AbsOkDialogListener -import com.yizhuan.erban.databinding.DialogNewUserChargeGiftBinding -import com.yizhuan.erban.ui.setting.ModifyPwdActivity -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.erban.ui.webview.CommonWebViewActivity -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.PaymentActivity -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.pay.bean.PaymentResult -import com.yizhuan.xchat_android_core.pay.event.NewUserChargeEvent -import com.yizhuan.xchat_android_core.pay.model.unionpay.UnionPayModel -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.utils.CurrentTimeUtils -import com.yizhuan.xchat_android_core.utils.toast -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 com.mango.moshen.R +import com.mango.moshen.avroom.firstcharge.SelectPayTypeDialog +import com.mango.moshen.bank_card.activity.AddBankCardAgreementActivity +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.common.widget.dialog.DialogManager.AbsOkDialogListener +import com.mango.moshen.databinding.DialogNewUserChargeGiftBinding +import com.mango.moshen.ui.setting.ModifyPwdActivity +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.moshen.ui.webview.CommonWebViewActivity +import com.mango.core.UriProvider +import com.mango.core.auth.AuthModel +import com.mango.core.pay.PayModel +import com.mango.core.pay.PaymentActivity +import com.mango.core.pay.bean.FirstChargeGoods +import com.mango.core.pay.bean.FirstChargeReward +import com.mango.core.pay.bean.PaymentResult +import com.mango.core.pay.event.NewUserChargeEvent +import com.mango.core.pay.model.unionpay.UnionPayModel +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.core.user.UserModel +import com.mango.core.utils.CurrentTimeUtils +import com.mango.core.utils.toast +import com.mango.xchat_android_library.annatation.ActLayoutRes +import com.mango.xchat_android_library.utils.JavaUtil +import com.mango.xchat_android_library.utils.SingleToastUtil import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargePrizeDialog.kt b/app/src/main/java/com/mango/moshen/avroom/newuserchargegift/NewUserChargePrizeDialog.kt similarity index 68% rename from app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargePrizeDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/newuserchargegift/NewUserChargePrizeDialog.kt index 2bdc72469..138392e55 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargePrizeDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/newuserchargegift/NewUserChargePrizeDialog.kt @@ -1,16 +1,16 @@ -package com.yizhuan.erban.avroom.newuserchargegift +package com.mango.moshen.avroom.newuserchargegift import android.content.Context import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.DialogNewUserChargePrizeBinding -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.databinding.DialogNewUserChargePrizeBinding +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.pay.bean.FirstChargeReward +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.xchat_android_library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_new_user_charge_prize) class NewUserChargePrizeDialog( diff --git a/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/RewardAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/newuserchargegift/RewardAdapter.kt similarity index 71% rename from app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/RewardAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/newuserchargegift/RewardAdapter.kt index a78bde608..393199bb0 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/RewardAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/newuserchargegift/RewardAdapter.kt @@ -1,12 +1,12 @@ -package com.yizhuan.erban.avroom.newuserchargegift +package com.mango.moshen.avroom.newuserchargegift import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.mango.moshen.R +import com.mango.moshen.ui.utils.load +import com.mango.core.pay.bean.FirstChargeReward +import com.mango.core.utils.TextUtils class RewardAdapter : BaseQuickAdapter(R.layout.item_new_user_charge_reward) { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/AvRoomPresenter.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/AvRoomPresenter.java index 25a4b9c55..9e99fc8a2 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/AvRoomPresenter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; import android.annotation.SuppressLint; import android.os.Bundle; @@ -18,46 +18,46 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomInfo; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData; import com.netease.nimlib.sdk.util.Entry; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.avroom.view.IAvRoomView; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.DemoCache; -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.response.ServiceResult; -import com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.miniworld.event.AudioPartyOpenEvent; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.model.MonsterHuntingModel; -import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -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.MicQueueModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicMemeberInfo; -import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicNotEmptyEvent; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.super_admin.SuperAdminDataMrg; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.LogUtils; -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; -import com.yizhuan.xchat_android_library.threadmgr.ThreadPoolManager; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.avroom.view.IAvRoomView; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.Constants; +import com.mango.core.DemoCache; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.RoomMicInfo; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.channel_page.model.ChannelPageModel; +import com.mango.core.manager.AudioEngineManager; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.miniworld.event.AudioPartyOpenEvent; +import com.mango.core.module_hall.hall.HallModel; +import com.mango.core.monsterhunting.bean.MonsterInfo; +import com.mango.core.monsterhunting.model.MonsterHuntingModel; +import com.mango.core.patriarch.exception.PmRoomLimitException; +import com.mango.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.mango.core.room.anotherroompk.RoomPKModel; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.giftvalue.helper.GiftValueMrg; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.room.model.MicQueueModel; +import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.room.queuing_mic.bean.QueuingMicMemeberInfo; +import com.mango.core.room.queuing_mic.event.QueuingMicNotEmptyEvent; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.super_admin.SuperAdminDataMrg; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.LogUtils; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.xchat_android_library.threadmgr.ThreadPoolManager; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/BaseRoomPresenter.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/BaseRoomPresenter.java index 703917d50..a6305c161 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/BaseRoomPresenter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -9,53 +9,43 @@ import androidx.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.netease.nimlib.sdk.NIMClient; -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.ChatRoomService; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; -import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum; import com.netease.nimlib.sdk.util.Entry; import com.orhanobut.logger.Logger; -import com.yizhuan.erban.avroom.view.IBaseRoomView; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.helper.AtProxy; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RequestUpmicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomInfoAttachment; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.exception.AntiSpamHitException; -import com.yizhuan.xchat_android_core.room.game.GameStatus; -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.RoomBaseModel; -import com.yizhuan.xchat_android_core.room.model.RoomContributeListModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel; -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; -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.base.PresenterEvent; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.avroom.view.IBaseRoomView; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.helper.AtProxy; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.RequestUpmicAttachment; +import com.mango.core.im.custom.bean.RoomInfoAttachment; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.praise.PraiseModel; +import com.mango.core.room.bean.RoomContributeDataInfo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.exception.AntiSpamHitException; +import com.mango.core.room.game.GameStatus; +import com.mango.core.room.giftvalue.helper.GiftValueMrg; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.room.model.HomePartyModel; +import com.mango.core.room.model.RoomBaseModel; +import com.mango.core.room.model.RoomContributeListModel; +import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.super_admin.model.SuperAdminModel; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.BaseInfo; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; -import java.util.Collections; -import java.util.List; import java.util.Objects; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomRankPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/BaseRoomRankPresenter.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomRankPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/BaseRoomRankPresenter.java index 01e7077cd..083b57f78 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomRankPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/BaseRoomRankPresenter.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; import android.os.Bundle; import androidx.annotation.Nullable; -import com.yizhuan.erban.avroom.adapter.RoomConsumerListAdapterTemp; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.moshen.avroom.adapter.RoomConsumerListAdapterTemp; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.room.bean.RoomContributeUserInfo; +import com.mango.core.room.bean.RoomRankMultiItem; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/CreatePKPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/CreatePKPresenter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/CreatePKPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/CreatePKPresenter.java index 0422472e3..eb95e86e8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/CreatePKPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/CreatePKPresenter.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; -import com.yizhuan.erban.avroom.view.ICreatePKView; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.avroom.view.ICreatePKView; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.room.pk.model.PkModel; +import com.mango.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/GameRoomPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/GameRoomPresenter.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/GameRoomPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/GameRoomPresenter.java index 64f705833..b3da50ee2 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/GameRoomPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/GameRoomPresenter.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; import android.annotation.SuppressLint; -import com.yizhuan.erban.avroom.view.IGameRoomView; -import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; +import com.mango.moshen.avroom.view.IGameRoomView; +import com.mango.moshen.treasure_box.widget.GoldBoxHelper; +import com.mango.moshen.utils.UserUtils; +import com.mango.core.home.bean.BannerInfo; +import com.mango.core.room.model.AvRoomModel; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/HomePartyPresenter.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/HomePartyPresenter.java index 363f9ab5f..267a80fbb 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/HomePartyPresenter.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; -import static com.yizhuan.xchat_android_core.manager.RoomEvent.DRAGON_BAR_CANCEL; -import static com.yizhuan.xchat_android_core.manager.RoomEvent.DRAGON_BAR_END; +import static com.mango.core.manager.RoomEvent.DRAGON_BAR_CANCEL; +import static com.mango.core.manager.RoomEvent.DRAGON_BAR_END; import android.annotation.SuppressLint; @@ -10,31 +10,31 @@ import androidx.annotation.NonNull; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; -import com.yizhuan.erban.avroom.view.IHomePartyView; -import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -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.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.bean.DragonBarInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.dragonball.DragonBallModel; -import com.yizhuan.xchat_android_core.room.face.FaceInfo; -import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -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.BeanObserver; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.avroom.view.IHomePartyView; +import com.mango.moshen.treasure_box.widget.GoldBoxHelper; +import com.mango.moshen.utils.UserUtils; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.home.bean.BannerInfo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.FaceAttachment; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.room.bean.DragonBarInfo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.dragonball.DragonBallModel; +import com.mango.core.room.face.FaceInfo; +import com.mango.core.room.face.FaceReceiveInfo; +import com.mango.core.room.giftvalue.helper.GiftValueMrg; +import com.mango.core.room.model.RoomSettingModel; +import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.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/presenter/HomePartyUserListPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/HomePartyUserListPresenter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyUserListPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/HomePartyUserListPresenter.java index fdc9aacfb..2944b5069 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyUserListPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/HomePartyUserListPresenter.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; import android.annotation.SuppressLint; import com.orhanobut.logger.Logger; -import com.yizhuan.erban.avroom.view.IHomePartyUserListView; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember; -import com.yizhuan.xchat_android_core.room.model.HomePartyUserListModel; +import com.mango.moshen.avroom.view.IHomePartyUserListView; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.room.bean.OnlineChatMember; +import com.mango.core.room.model.HomePartyUserListModel; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RecordForPKPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/RecordForPKPresenter.java similarity index 72% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/RecordForPKPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/RecordForPKPresenter.java index 730871f27..8d239c281 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RecordForPKPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/RecordForPKPresenter.java @@ -1,16 +1,15 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; -import com.yizhuan.erban.avroom.view.IRecordForPKView; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.home.helper.LoadPageDataHelper; -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_core.room.pk.bean.PKRecordInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordListInfo; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; +import com.mango.moshen.avroom.view.IRecordForPKView; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.home.helper.LoadPageDataHelper; +import com.mango.core.Constants; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.pk.bean.PKRecordInfo; +import com.mango.core.room.pk.bean.PKRecordListInfo; +import com.mango.core.room.pk.model.PkModel; -import java.util.ArrayList; import java.util.List; import io.reactivex.Single; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomBlackPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomBlackPresenter.java similarity index 70% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomBlackPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/RoomBlackPresenter.java index 381bf49da..1c48ef6ee 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomBlackPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomBlackPresenter.java @@ -1,16 +1,10 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.erban.avroom.view.IRoomBlackView; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.model.RoomBaseModel; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; - -import java.util.List; - -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Consumer; +import com.mango.moshen.avroom.view.IRoomBlackView; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.room.model.RoomBaseModel; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; /** *

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomCharmRankingPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomCharmRankingPresenter.java similarity index 77% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomCharmRankingPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/RoomCharmRankingPresenter.java index 9c94bf2eb..28d8f4963 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomCharmRankingPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomCharmRankingPresenter.java @@ -1,14 +1,13 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; -import com.yizhuan.erban.avroom.view.IRoomCharmRankingListView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; -import com.yizhuan.xchat_android_core.room.model.RoomCharmModel; -import com.yizhuan.xchat_android_core.room.model.inteface.IRoomCharmModel; +import com.mango.moshen.avroom.view.IRoomCharmRankingListView; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.RoomContributeDataInfo; +import com.mango.core.room.bean.RoomContributeUserInfo; +import com.mango.core.room.bean.RoomRankMultiItem; +import com.mango.core.room.model.RoomCharmModel; +import com.mango.core.room.model.inteface.IRoomCharmModel; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomContributeListPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomContributeListPresenter.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomContributeListPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/RoomContributeListPresenter.java index 788595880..52491734e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomContributeListPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomContributeListPresenter.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; import android.annotation.SuppressLint; -import com.yizhuan.erban.avroom.view.IRoomContributeListView; -import com.yizhuan.xchat_android_core.room.model.RoomContributeListModel; +import com.mango.moshen.avroom.view.IRoomContributeListView; +import com.mango.core.room.model.RoomContributeListModel; /** * Created by MadisonRong on 25/04/2018. diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomInvitePresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomInvitePresenter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomInvitePresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/RoomInvitePresenter.java index f3cb3a26d..622fd85b6 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomInvitePresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomInvitePresenter.java @@ -1,16 +1,16 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; import android.annotation.SuppressLint; import android.util.SparseArray; import com.netease.nimlib.sdk.chatroom.constant.MemberType; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.erban.avroom.view.IRoomInviteView; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.model.RoomInviteModel; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; +import com.mango.moshen.avroom.view.IRoomInviteView; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.model.RoomInviteModel; +import com.mango.core.super_admin.util.SuperAdminUtil; import java.util.List; import java.util.ListIterator; @@ -18,7 +18,6 @@ import java.util.Objects; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; /** *

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomManagerPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomManagerPresenter.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomManagerPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/RoomManagerPresenter.java index 6e64df895..c31497d1d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomManagerPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomManagerPresenter.java @@ -1,20 +1,18 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; import android.annotation.SuppressLint; import android.text.TextUtils; -import com.netease.nim.uikit.common.util.C; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.erban.avroom.view.IRoomManagerView; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.RoomBaseModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.moshen.avroom.view.IRoomManagerView; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.room.model.RoomBaseModel; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; import java.util.ArrayList; import java.util.HashMap; @@ -25,7 +23,6 @@ import java.util.Map; import io.reactivex.Single; import io.reactivex.SingleSource; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Consumer; import io.reactivex.functions.Function; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomNewbieHellowWordPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomNewbieHellowWordPresenter.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomNewbieHellowWordPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/RoomNewbieHellowWordPresenter.java index 90d6f5d95..d6fddae34 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomNewbieHellowWordPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomNewbieHellowWordPresenter.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; -import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module.IRoomNewbieMessageView; -import com.yizhuan.erban.module.RoomNewbieModel; +import com.mango.core.bean.RoomNewbieMessageInfo; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module.IRoomNewbieMessageView; +import com.mango.moshen.module.RoomNewbieModel; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomNewbiePresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomNewbiePresenter.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomNewbiePresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/RoomNewbiePresenter.java index cc15a1bf2..b28ce2aa8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomNewbiePresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomNewbiePresenter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; -import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module.IRoomNewbieView; -import com.yizhuan.erban.module.RoomNewbieModel; -import com.yizhuan.xchat_android_core.Constants; +import com.mango.core.bean.RoomNewbieInfo; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module.IRoomNewbieView; +import com.mango.moshen.module.RoomNewbieModel; +import com.mango.core.Constants; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomRankHalfHourPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomRankHalfHourPresenter.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomRankHalfHourPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/RoomRankHalfHourPresenter.java index 17d023d93..12643aa16 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomRankHalfHourPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomRankHalfHourPresenter.java @@ -1,14 +1,14 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; -import com.yizhuan.erban.avroom.fragment.IRoomRankHalfHourView; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourDataInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourRankInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; -import com.yizhuan.xchat_android_core.room.model.RoomRankModel; -import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.avroom.fragment.IRoomRankHalfHourView; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomRankHalfHourDataInfo; +import com.mango.core.room.bean.RoomRankHalfHourRankInfo; +import com.mango.core.room.bean.RoomRankMultiItem; +import com.mango.core.room.model.RoomRankModel; +import com.mango.xchat_android_library.base.factory.AbstractMvpPresenter; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomSettingPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomSettingPresenter.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomSettingPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/RoomSettingPresenter.java index 82952d900..da924c60f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomSettingPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/RoomSettingPresenter.java @@ -1,28 +1,28 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; import android.annotation.SuppressLint; import android.os.Handler; -import com.yizhuan.erban.avroom.view.IRoomSettingView; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -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.bean.RoomGiftValue; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.MicQueueModel; -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; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.moshen.avroom.view.IRoomSettingView; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.auth.AuthModel; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomSettingTabInfo; +import com.mango.core.room.giftvalue.GiftValueModel; +import com.mango.core.room.giftvalue.bean.RoomGiftValue; +import com.mango.core.room.giftvalue.helper.GiftValueMrg; +import com.mango.core.room.model.MicQueueModel; +import com.mango.core.room.model.RoomSettingModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/SingleRoomPresenter.java b/app/src/main/java/com/mango/moshen/avroom/presenter/SingleRoomPresenter.java similarity index 52% rename from app/src/main/java/com/yizhuan/erban/avroom/presenter/SingleRoomPresenter.java rename to app/src/main/java/com/mango/moshen/avroom/presenter/SingleRoomPresenter.java index 3e823edb6..bb5521603 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/SingleRoomPresenter.java +++ b/app/src/main/java/com/mango/moshen/avroom/presenter/SingleRoomPresenter.java @@ -1,16 +1,8 @@ -package com.yizhuan.erban.avroom.presenter; +package com.mango.moshen.avroom.presenter; import android.annotation.SuppressLint; -import com.yizhuan.erban.avroom.view.IGameRoomView; -import com.yizhuan.erban.avroom.view.ISingleRoomView; -import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; - -import java.util.ArrayList; -import java.util.List; +import com.mango.moshen.avroom.view.ISingleRoomView; /** diff --git a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/MyRecommendCardActivity.java b/app/src/main/java/com/mango/moshen/avroom/recommendcard/MyRecommendCardActivity.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/avroom/recommendcard/MyRecommendCardActivity.java rename to app/src/main/java/com/mango/moshen/avroom/recommendcard/MyRecommendCardActivity.java index 9e3f63620..71cf84142 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/MyRecommendCardActivity.java +++ b/app/src/main/java/com/mango/moshen/avroom/recommendcard/MyRecommendCardActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.recommendcard; +package com.mango.moshen.avroom.recommendcard; import android.content.Context; import android.content.Intent; @@ -9,16 +9,16 @@ import androidx.fragment.app.FragmentStatePagerAdapter; import androidx.viewpager.widget.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.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.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.module_hall.hall.view.indicator.StatisticsIndicatorAdapter; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.core.UriProvider; +import com.mango.core.room.recommendpos.bean.RcmdCardType; 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/mango/moshen/avroom/recommendcard/RecommendCardFragment.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java rename to app/src/main/java/com/mango/moshen/avroom/recommendcard/RecommendCardFragment.java index 38ecba722..5938b69ed 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/recommendcard/RecommendCardFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.recommendcard; +package com.mango.moshen.avroom.recommendcard; import android.content.Context; import android.os.Bundle; @@ -11,18 +11,18 @@ import android.view.ViewGroup; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseFragment; -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.RefreshRecyclerView; -import com.yizhuan.xchat_android_core.web.bean.H5NotifyData; -import com.yizhuan.erban.ui.webview.event.H5NotifyClientEvent; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.HorizontalDecoration; -import com.yizhuan.xchat_android_core.room.recommendpos.RecommendCardModel; -import com.yizhuan.xchat_android_core.room.recommendpos.bean.RcmdCardType; -import com.yizhuan.xchat_android_core.room.recommendpos.bean.RecommendCard; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.base.list.BaseViewHolder; +import com.mango.moshen.base.list.CommonAdapter; +import com.mango.moshen.base.list.IRecyclerListener; +import com.mango.moshen.base.list.RefreshRecyclerView; +import com.mango.core.web.bean.H5NotifyData; +import com.mango.moshen.ui.webview.event.H5NotifyClientEvent; +import com.mango.moshen.ui.widget.recyclerview.decoration.HorizontalDecoration; +import com.mango.core.room.recommendpos.RecommendCardModel; +import com.mango.core.room.recommendpos.bean.RcmdCardType; +import com.mango.core.room.recommendpos.bean.RecommendCard; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardListAdapter.java b/app/src/main/java/com/mango/moshen/avroom/recommendcard/RecommendCardListAdapter.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardListAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/recommendcard/RecommendCardListAdapter.java index cb22c1ba2..8da510714 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardListAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/recommendcard/RecommendCardListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.recommendcard; +package com.mango.moshen.avroom.recommendcard; import android.content.Context; import android.text.style.AbsoluteSizeSpan; @@ -6,18 +6,16 @@ import android.view.View; import com.coorchice.library.SuperTextView; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.avroom.widget.MessageView; -import com.yizhuan.erban.base.list.BaseViewHolder; -import com.yizhuan.erban.base.list.CommonAdapter; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.room.recommendpos.bean.RcmdCardType; -import com.yizhuan.xchat_android_core.room.recommendpos.bean.RecommendCard; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.avroom.widget.MessageView; +import com.mango.moshen.base.list.BaseViewHolder; +import com.mango.moshen.base.list.CommonAdapter; +import com.mango.core.room.recommendpos.bean.RcmdCardType; +import com.mango.core.room.recommendpos.bean.RecommendCard; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.utils.TimeUtils; /** * 推荐卡列表 diff --git a/app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageEvent.java b/app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageEvent.java new file mode 100644 index 000000000..7631cb3ff --- /dev/null +++ b/app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageEvent.java @@ -0,0 +1,4 @@ +package com.mango.moshen.avroom.redpackage; + +public class RedPackageEvent { +} diff --git a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageGiftAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageGiftAdapter.kt similarity index 77% rename from app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageGiftAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageGiftAdapter.kt index 05e0fac6d..4631776ee 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageGiftAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageGiftAdapter.kt @@ -1,12 +1,12 @@ -package com.yizhuan.erban.avroom.redpackage +package com.mango.moshen.avroom.redpackage import android.widget.TextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeGiftItemVO -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.ImageLoadUtils +import com.mango.core.redpackage.RedEnvelopeGiftItemVO +import com.mango.moshen.R +import com.mango.moshen.ui.utils.ImageLoadUtils class RedPackageGiftAdapter(layoutId: Int = R.layout.item_red_package_gift) : BaseQuickAdapter(layoutId) { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageGoRoomDialog.kt b/app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageGoRoomDialog.kt similarity index 83% rename from app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageGoRoomDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageGoRoomDialog.kt index 7387545a3..860a9bb68 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageGoRoomDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageGoRoomDialog.kt @@ -1,18 +1,17 @@ -package com.yizhuan.erban.avroom.redpackage +package com.mango.moshen.avroom.redpackage import android.os.Bundle -import android.view.LayoutInflater import android.view.WindowManager import android.view.animation.AnimationUtils -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.common.widget.dialog.DialogManager -import com.yizhuan.erban.databinding.DialogRedPackageGoRoomBinding -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.mango.moshen.R +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.common.widget.dialog.DialogManager +import com.mango.moshen.databinding.DialogRedPackageGoRoomBinding +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.redpackage.RedPackageNotifyInfo +import com.mango.core.utils.subAndReplaceDot import org.greenrobot.eventbus.EventBus class RedPackageGoRoomDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageOpenAdapter.kt similarity index 85% rename from app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageOpenAdapter.kt index bd96c93a1..db72f13b0 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageOpenAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.redpackage +package com.mango.moshen.avroom.redpackage import android.graphics.Color import android.view.View @@ -7,11 +7,11 @@ import androidx.recyclerview.widget.RecyclerView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeItemVO -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.erban.utils.UserUtils -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.mango.core.redpackage.RedEnvelopeItemVO +import com.mango.moshen.R +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.moshen.utils.UserUtils +import com.mango.core.utils.subAndReplaceDot import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenDialog.kt b/app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageOpenDialog.kt similarity index 83% rename from app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageOpenDialog.kt index 486230960..9f22985ea 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageOpenDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.redpackage +package com.mango.moshen.avroom.redpackage import android.animation.Animator @@ -8,34 +8,33 @@ import android.annotation.SuppressLint import android.graphics.Color import android.os.Bundle import android.text.style.ForegroundColorSpan -import android.view.LayoutInflater import android.view.View import android.view.WindowManager import android.view.animation.AccelerateDecelerateInterpolator import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeState.Companion.REMAIN_ZERO -import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeState.Companion.SUCCESS -import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeState.Companion.TIME_OUT -import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeState.Companion.TIME_OUT_BACK -import com.yizhuan.xchat_android_core.redpackage.RedPackageInfo -import com.yizhuan.xchat_android_core.redpackage.RedPackageModel -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.widget.MessageView -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogRedPackageOpenBinding -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.erban.utils.UserUtils -import com.yizhuan.xchat_android_core.DemoCache -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.home.event.FollowRoomEvent -import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.redpackage.ALL_DIAMOND -import com.yizhuan.xchat_android_core.redpackage.ALL_GIFT -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo -import com.yizhuan.xchat_android_library.utils.SingleToastUtil +import com.mango.core.redpackage.RedEnvelopeState.Companion.REMAIN_ZERO +import com.mango.core.redpackage.RedEnvelopeState.Companion.SUCCESS +import com.mango.core.redpackage.RedEnvelopeState.Companion.TIME_OUT +import com.mango.core.redpackage.RedEnvelopeState.Companion.TIME_OUT_BACK +import com.mango.core.redpackage.RedPackageInfo +import com.mango.core.redpackage.RedPackageModel +import com.mango.moshen.R +import com.mango.moshen.avroom.widget.MessageView +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogRedPackageOpenBinding +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.moshen.utils.UserUtils +import com.mango.core.DemoCache +import com.mango.core.auth.AuthModel +import com.mango.core.home.event.FollowRoomEvent +import com.mango.core.home.model.CollectionRoomModel +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.pay.PayModel +import com.mango.core.redpackage.ALL_DIAMOND +import com.mango.core.redpackage.ALL_GIFT +import com.mango.core.redpackage.RedPackageNotifyInfo +import com.mango.xchat_android_library.utils.SingleToastUtil import org.greenrobot.eventbus.EventBus class RedPackageOpenDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt b/app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageSendDialog.kt similarity index 87% rename from app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageSendDialog.kt index 1b78b81dd..7dfb1715c 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/redpackage/RedPackageSendDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.redpackage +package com.mango.moshen.avroom.redpackage import android.annotation.SuppressLint @@ -9,31 +9,31 @@ import android.view.KeyEvent import android.view.View import android.view.WindowManager import com.jungly.gridpasswordview.GridPasswordView -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.common.widget.dialog.DialogManager -import com.yizhuan.erban.databinding.DialogRedPackageSendBinding -import com.yizhuan.erban.pay.password.GiveGoldPassWordFragment -import com.yizhuan.erban.ui.login.BindPhoneActivity -import com.yizhuan.erban.ui.pay.ChargeActivity -import com.yizhuan.erban.ui.setting.ModifyPwdActivity -import com.yizhuan.erban.ui.webview.DialogWebViewActivity -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.initial.InitialModel -import com.yizhuan.xchat_android_core.initial.bean.InitInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent -import com.yizhuan.xchat_android_core.redpackage.* -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.utils.toIntOrDef -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.CommonUtils -import com.yizhuan.xchat_android_library.utils.SingleToastUtil -import com.yizhuan.xchat_android_library.utils.codec.DESUtils +import com.mango.moshen.R +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.common.widget.dialog.DialogManager +import com.mango.moshen.databinding.DialogRedPackageSendBinding +import com.mango.moshen.pay.password.GiveGoldPassWordFragment +import com.mango.moshen.ui.login.BindPhoneActivity +import com.mango.moshen.ui.pay.ChargeActivity +import com.mango.moshen.ui.setting.ModifyPwdActivity +import com.mango.moshen.ui.webview.DialogWebViewActivity +import com.mango.core.UriProvider +import com.mango.core.auth.AuthModel +import com.mango.core.initial.InitialModel +import com.mango.core.initial.bean.InitInfo +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.pay.PayModel +import com.mango.core.pay.event.UpdateWalletInfoEvent +import com.mango.core.redpackage.* +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.core.user.UserModel +import com.mango.core.utils.toIntOrDef +import com.mango.xchat_android_library.annatation.ActLayoutRes +import com.mango.xchat_android_library.utils.CommonUtils +import com.mango.xchat_android_library.utils.SingleToastUtil +import com.mango.xchat_android_library.utils.codec.DESUtils import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKBoardView.kt b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKBoardView.kt similarity index 86% rename from app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKBoardView.kt rename to app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKBoardView.kt index 92fc4a39c..5f6d8177e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKBoardView.kt +++ b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKBoardView.kt @@ -1,29 +1,24 @@ -package com.yizhuan.erban.avroom.singleroompk +package com.mango.moshen.avroom.singleroompk import android.annotation.SuppressLint import android.content.Context import android.graphics.Color -import android.graphics.drawable.ColorDrawable import android.util.AttributeSet -import android.view.Gravity import android.view.LayoutInflater -import android.view.View import android.widget.FrameLayout -import android.widget.PopupWindow import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.view.isVisible import androidx.lifecycle.Observer -import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.netease.nim.uikit.common.util.sys.TimeUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.databinding.LayoutSingleRoomPkBoardViewBinding -import com.yizhuan.erban.ui.user.UserInfoActivity -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.mango.moshen.R +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.databinding.LayoutSingleRoomPkBoardViewBinding +import com.mango.moshen.ui.user.UserInfoActivity +import com.mango.moshen.ui.utils.load +import com.mango.core.im.custom.bean.RoomPkBean +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.utils.CurrentTimeUtils +import com.mango.core.utils.subAndReplaceDot import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKCreateActivity.kt b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKCreateActivity.kt similarity index 85% rename from app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKCreateActivity.kt rename to app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKCreateActivity.kt index 8016548e3..cea3256b1 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKCreateActivity.kt +++ b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKCreateActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.singleroompk +package com.mango.moshen.avroom.singleroompk import android.annotation.SuppressLint import android.content.Context @@ -7,18 +7,18 @@ import android.text.Editable import android.view.Gravity import android.view.WindowManager import androidx.core.view.isVisible -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.databinding.ActivitySingleRoomPkCreateBinding -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.erban.ui.widget.TextWatcherSimple -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.utils.ifNotNullOrEmpty -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toIntOrDef -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.databinding.ActivitySingleRoomPkCreateBinding +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.moshen.ui.widget.TextWatcherSimple +import com.mango.core.auth.AuthModel +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.room.anotherroompk.SingleRoomPKModel +import com.mango.core.room.anotherroompk.SimpleRoomInfo +import com.mango.core.utils.ifNotNullOrEmpty +import com.mango.core.utils.subAndReplaceDot +import com.mango.core.utils.toIntOrDef +import com.mango.core.utils.toast class SingleRoomPKCreateActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKRankListView.kt b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKRankListView.kt similarity index 82% rename from app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKRankListView.kt rename to app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKRankListView.kt index 8855d7ae8..37b4c8fc5 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKRankListView.kt +++ b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKRankListView.kt @@ -1,18 +1,17 @@ -package com.yizhuan.erban.avroom.singleroompk +package com.mango.moshen.avroom.singleroompk import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import android.widget.FrameLayout -import androidx.core.view.isGone import androidx.core.view.isInvisible import androidx.core.view.isVisible -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.LayoutSingleRoomPkRankListViewBinding -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent -import com.yizhuan.xchat_android_library.rxbus.RxBus +import com.mango.moshen.R +import com.mango.moshen.databinding.LayoutSingleRoomPkRankListViewBinding +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.im.custom.bean.RoomPkBean +import com.mango.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.mango.xchat_android_library.rxbus.RxBus class SingleRoomPKRankListView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchActivity.kt b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKSearchActivity.kt similarity index 81% rename from app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchActivity.kt rename to app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKSearchActivity.kt index f0221c4bc..8a2a9c42e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchActivity.kt +++ b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKSearchActivity.kt @@ -1,22 +1,20 @@ -package com.yizhuan.erban.avroom.singleroompk +package com.mango.moshen.avroom.singleroompk import android.annotation.SuppressLint import android.app.Activity import android.content.Intent import android.view.Gravity import android.view.WindowManager -import android.widget.CheckBox import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.ActivitySingleRoomPkSearchBinding -import com.yizhuan.erban.ui.user.UserInfoActivity -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.R +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.ActivitySingleRoomPkSearchBinding +import com.mango.moshen.ui.user.UserInfoActivity +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.room.anotherroompk.SingleRoomPKModel +import com.mango.core.room.anotherroompk.SimpleRoomInfo class SingleRoomPKSearchActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKSearchAdapter.kt similarity index 82% rename from app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt rename to app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKSearchAdapter.kt index afdb08808..acb52dc01 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt +++ b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKSearchAdapter.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.avroom.singleroompk +package com.mango.moshen.avroom.singleroompk import android.graphics.Color import android.widget.TextView import androidx.core.graphics.toColorInt import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.mango.moshen.R +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.room.anotherroompk.SimpleRoomInfo +import com.mango.core.utils.subAndReplaceDot class SingleRoomPKSearchAdapter : BaseQuickAdapter(R.layout.item_single_room_pk_search) { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkFinishDialog.kt b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkFinishDialog.kt similarity index 91% rename from app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkFinishDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkFinishDialog.kt index 4d51dbada..7e0e52669 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkFinishDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkFinishDialog.kt @@ -1,15 +1,15 @@ -package com.yizhuan.erban.avroom.singleroompk +package com.mango.moshen.avroom.singleroompk import android.annotation.SuppressLint import android.os.Bundle import android.view.WindowManager import androidx.core.view.isVisible -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogSingleRoomPkFinishBinding -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.mango.moshen.R +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogSingleRoomPkFinishBinding +import com.mango.moshen.ui.utils.load +import com.mango.core.im.custom.bean.RoomPkBean +import com.mango.core.utils.subAndReplaceDot import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt index 132afb71d..f14b7aa46 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.avroom.singleroompk +package com.mango.moshen.avroom.singleroompk import android.annotation.SuppressLint import android.os.Bundle import android.view.WindowManager -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogSingleRoomPkForceFinishBinding -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.mango.moshen.R +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogSingleRoomPkForceFinishBinding +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.im.custom.bean.RoomPkBean +import com.mango.core.utils.subAndReplaceDot class SingleRoomPkForceFinishDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkReceivedDialog.kt b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkReceivedDialog.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkReceivedDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkReceivedDialog.kt index 2284a4732..dc8e3d115 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkReceivedDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkReceivedDialog.kt @@ -1,16 +1,16 @@ -package com.yizhuan.erban.avroom.singleroompk +package com.mango.moshen.avroom.singleroompk import android.annotation.SuppressLint import android.os.Bundle import androidx.core.view.isVisible -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogSingleRoomPkReceivedBinding -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel -import com.yizhuan.xchat_android_core.utils.ifNotNullOrEmpty -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogSingleRoomPkReceivedBinding +import com.mango.core.im.custom.bean.RoomPkBean +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.room.anotherroompk.SingleRoomPKModel +import com.mango.core.utils.ifNotNullOrEmpty +import com.mango.core.utils.subAndReplaceDot +import com.mango.core.utils.toast import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkRuleDialog.kt b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkRuleDialog.kt similarity index 73% rename from app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkRuleDialog.kt rename to app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkRuleDialog.kt index 78a4433f3..bde8fc75e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkRuleDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkRuleDialog.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.avroom.singleroompk +package com.mango.moshen.avroom.singleroompk import android.text.method.ScrollingMovementMethod -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogSingleRoomPkRuleBinding -import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogSingleRoomPkRuleBinding +import com.mango.core.room.anotherroompk.SingleRoomPKModel +import com.mango.core.utils.toast class SingleRoomPkRuleDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IAvRoomView.java b/app/src/main/java/com/mango/moshen/avroom/view/IAvRoomView.java similarity index 74% rename from app/src/main/java/com/yizhuan/erban/avroom/view/IAvRoomView.java rename to app/src/main/java/com/mango/moshen/avroom/view/IAvRoomView.java index 191ea9183..bc9b0e581 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/IAvRoomView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/IAvRoomView.java @@ -1,15 +1,11 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; -import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.ActionDialogInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -import java.util.List; +import com.mango.core.channel_page.bean.HelloMessageInfo; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.monsterhunting.bean.MonsterInfo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; /** *

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IBaseRoomView.kt b/app/src/main/java/com/mango/moshen/avroom/view/IBaseRoomView.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/avroom/view/IBaseRoomView.kt rename to app/src/main/java/com/mango/moshen/avroom/view/IBaseRoomView.kt index 638fb965c..c3f75d0eb 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/IBaseRoomView.kt +++ b/app/src/main/java/com/mango/moshen/avroom/view/IBaseRoomView.kt @@ -1,10 +1,8 @@ -package com.yizhuan.erban.avroom.view +package com.mango.moshen.avroom.view -import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage -import com.yizhuan.xchat_android_core.bean.RoomMicInfo -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo -import com.yizhuan.xchat_android_library.base.IMvpBaseView -import java.util.ArrayList +import com.mango.core.bean.RoomMicInfo +import com.mango.core.room.bean.RoomContributeUserInfo +import com.mango.xchat_android_library.base.IMvpBaseView /** * diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/ICreatePKView.java b/app/src/main/java/com/mango/moshen/avroom/view/ICreatePKView.java similarity index 54% rename from app/src/main/java/com/yizhuan/erban/avroom/view/ICreatePKView.java rename to app/src/main/java/com/mango/moshen/avroom/view/ICreatePKView.java index 5cb091816..a68689b0d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/ICreatePKView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/ICreatePKView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IGameRoomView.java b/app/src/main/java/com/mango/moshen/avroom/view/IGameRoomView.java similarity index 68% rename from app/src/main/java/com/yizhuan/erban/avroom/view/IGameRoomView.java rename to app/src/main/java/com/mango/moshen/avroom/view/IGameRoomView.java index 78392d98b..f95e6d532 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/IGameRoomView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/IGameRoomView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.mango.core.home.bean.BannerInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IHomePartyUserListView.java b/app/src/main/java/com/mango/moshen/avroom/view/IHomePartyUserListView.java similarity index 67% rename from app/src/main/java/com/yizhuan/erban/avroom/view/IHomePartyUserListView.java rename to app/src/main/java/com/mango/moshen/avroom/view/IHomePartyUserListView.java index 09a6c6d09..1e0c717e7 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/IHomePartyUserListView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/IHomePartyUserListView.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; -import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.room.bean.OnlineChatMember; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IHomePartyView.java b/app/src/main/java/com/mango/moshen/avroom/view/IHomePartyView.java similarity index 68% rename from app/src/main/java/com/yizhuan/erban/avroom/view/IHomePartyView.java rename to app/src/main/java/com/mango/moshen/avroom/view/IHomePartyView.java index 35081aaed..6f6476ba4 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/IHomePartyView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/IHomePartyView.java @@ -1,8 +1,7 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.mango.core.home.bean.BannerInfo; +import com.mango.core.room.bean.RoomInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/ILightChatConsumeView.java b/app/src/main/java/com/mango/moshen/avroom/view/ILightChatConsumeView.java similarity index 62% rename from app/src/main/java/com/yizhuan/erban/avroom/view/ILightChatConsumeView.java rename to app/src/main/java/com/mango/moshen/avroom/view/ILightChatConsumeView.java index 1b069c051..35a2581b2 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/ILightChatConsumeView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/ILightChatConsumeView.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; -import com.yizhuan.xchat_android_core.room.queue.bean.RoomConsumeInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.room.queue.bean.RoomConsumeInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/ILightChatOnlineView.java b/app/src/main/java/com/mango/moshen/avroom/view/ILightChatOnlineView.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/avroom/view/ILightChatOnlineView.java rename to app/src/main/java/com/mango/moshen/avroom/view/ILightChatOnlineView.java index 0c1e46586..4c295b51e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/ILightChatOnlineView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/ILightChatOnlineView.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; import android.util.SparseArray; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.erban.ui.widget.ButtonItem; +import com.mango.moshen.ui.widget.ButtonItem; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/ILightChatRoomView.java b/app/src/main/java/com/mango/moshen/avroom/view/ILightChatRoomView.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/avroom/view/ILightChatRoomView.java rename to app/src/main/java/com/mango/moshen/avroom/view/ILightChatRoomView.java index 7d683ecac..4bebac526 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/ILightChatRoomView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/ILightChatRoomView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** *

轻聊房

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IRecordForPKView.java b/app/src/main/java/com/mango/moshen/avroom/view/IRecordForPKView.java similarity index 55% rename from app/src/main/java/com/yizhuan/erban/avroom/view/IRecordForPKView.java rename to app/src/main/java/com/mango/moshen/avroom/view/IRecordForPKView.java index 015ef6f41..094133fea 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/IRecordForPKView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/IRecordForPKView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IRoomBlackView.java b/app/src/main/java/com/mango/moshen/avroom/view/IRoomBlackView.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/avroom/view/IRoomBlackView.java rename to app/src/main/java/com/mango/moshen/avroom/view/IRoomBlackView.java index 2bcc8b5f7..175b8fd71 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/IRoomBlackView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/IRoomBlackView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IRoomCharmRankingListView.java b/app/src/main/java/com/mango/moshen/avroom/view/IRoomCharmRankingListView.java similarity index 54% rename from app/src/main/java/com/yizhuan/erban/avroom/view/IRoomCharmRankingListView.java rename to app/src/main/java/com/mango/moshen/avroom/view/IRoomCharmRankingListView.java index 91a5476f6..3b12f6e56 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/IRoomCharmRankingListView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/IRoomCharmRankingListView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.room.bean.RoomRankMultiItem; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IRoomContributeListView.java b/app/src/main/java/com/mango/moshen/avroom/view/IRoomContributeListView.java similarity index 60% rename from app/src/main/java/com/yizhuan/erban/avroom/view/IRoomContributeListView.java rename to app/src/main/java/com/mango/moshen/avroom/view/IRoomContributeListView.java index a888d8569..ef080dea7 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/IRoomContributeListView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/IRoomContributeListView.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.room.bean.RoomContributeDataInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * Created by MadisonRong on 25/04/2018. diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IRoomInviteView.java b/app/src/main/java/com/mango/moshen/avroom/view/IRoomInviteView.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/avroom/view/IRoomInviteView.java rename to app/src/main/java/com/mango/moshen/avroom/view/IRoomInviteView.java index 17f129f4b..1d0ba9328 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/IRoomInviteView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/IRoomInviteView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IRoomManagerView.java b/app/src/main/java/com/mango/moshen/avroom/view/IRoomManagerView.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/avroom/view/IRoomManagerView.java rename to app/src/main/java/com/mango/moshen/avroom/view/IRoomManagerView.java index 5bf3d1722..36d86ad86 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/IRoomManagerView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/IRoomManagerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IRoomMemberView.java b/app/src/main/java/com/mango/moshen/avroom/view/IRoomMemberView.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/avroom/view/IRoomMemberView.java rename to app/src/main/java/com/mango/moshen/avroom/view/IRoomMemberView.java index d275c185c..a1e22d603 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/IRoomMemberView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/IRoomMemberView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IRoomSettingView.java b/app/src/main/java/com/mango/moshen/avroom/view/IRoomSettingView.java similarity index 73% rename from app/src/main/java/com/yizhuan/erban/avroom/view/IRoomSettingView.java rename to app/src/main/java/com/mango/moshen/avroom/view/IRoomSettingView.java index 8233297c9..a17799379 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/IRoomSettingView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/IRoomSettingView.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo; -import com.yizhuan.xchat_android_core.room.bean.SingleRoomSortInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomSettingTabInfo; +import com.mango.core.room.bean.SingleRoomSortInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/ISingleRoomView.java b/app/src/main/java/com/mango/moshen/avroom/view/ISingleRoomView.java similarity index 68% rename from app/src/main/java/com/yizhuan/erban/avroom/view/ISingleRoomView.java rename to app/src/main/java/com/mango/moshen/avroom/view/ISingleRoomView.java index ebd7b0f3a..8ce4dbc45 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/view/ISingleRoomView.java +++ b/app/src/main/java/com/mango/moshen/avroom/view/ISingleRoomView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.avroom.view; +package com.mango.moshen.avroom.view; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.mango.core.home.bean.BannerInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/ActivityTimerView.java b/app/src/main/java/com/mango/moshen/avroom/widget/ActivityTimerView.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/ActivityTimerView.java rename to app/src/main/java/com/mango/moshen/avroom/widget/ActivityTimerView.java index c4d52b17f..f45f1ed7f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/ActivityTimerView.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/ActivityTimerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.content.Context; @@ -7,8 +7,8 @@ import android.util.AttributeSet; import android.widget.LinearLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean; +import com.mango.moshen.R; +import com.mango.core.room.activitytimer.TimerBean; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/BottomView.java b/app/src/main/java/com/mango/moshen/avroom/widget/BottomView.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/BottomView.java rename to app/src/main/java/com/mango/moshen/avroom/widget/BottomView.java index 168bf4b59..b36371839 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/BottomView.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/BottomView.java @@ -1,6 +1,4 @@ -package com.yizhuan.erban.avroom.widget; - -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_ROOM_BROADCAST; +package com.mango.moshen.avroom.widget; import android.animation.Keyframe; import android.animation.ObjectAnimator; @@ -25,31 +23,27 @@ import androidx.annotation.Nullable; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; -import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.model.RecentContact; import com.netease.nimlib.sdk.uinfo.model.UserInfo; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.BottomViewListenerWrapper; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.vip.VipMainActivity; -import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity; -import com.yizhuan.xchat_android_core.helper.ImHelperUtils; -import com.yizhuan.xchat_android_core.im.custom.bean.VipMessageAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMMessageManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomModeType; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.avroom.BottomViewListenerWrapper; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.vip.VipMainActivity; +import com.mango.moshen.room_chat.activity.RoomMsgActivity; +import com.mango.core.helper.ImHelperUtils; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMMessageManager; +import com.mango.core.pay.event.FirstChargeEvent; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomModeType; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.core.user.UserModel; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.StringExtensionKt; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java b/app/src/main/java/com/mango/moshen/avroom/widget/EditRoomTitleDialog.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java rename to app/src/main/java/com/mango/moshen/avroom/widget/EditRoomTitleDialog.java index 9410f7b19..0b681064c 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/EditRoomTitleDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.content.Context; import android.content.DialogInterface; @@ -15,9 +15,9 @@ import android.widget.TextView; import com.trello.rxlifecycle3.android.ActivityEvent; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.utils.KeyBoardUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.utils.KeyBoardUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java b/app/src/main/java/com/mango/moshen/avroom/widget/FixRoomTitleTextView.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java rename to app/src/main/java/com/mango/moshen/avroom/widget/FixRoomTitleTextView.java index 3b9e16ab7..182acf26a 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/FixRoomTitleTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.content.Context; import androidx.appcompat.widget.AppCompatTextView; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/GalleryLayoutManager.java b/app/src/main/java/com/mango/moshen/avroom/widget/GalleryLayoutManager.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/GalleryLayoutManager.java rename to app/src/main/java/com/mango/moshen/avroom/widget/GalleryLayoutManager.java index f81814d70..18a901992 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GalleryLayoutManager.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/GalleryLayoutManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.content.Context; import android.graphics.PointF; @@ -15,7 +15,7 @@ import android.util.SparseArray; import android.view.View; import android.view.ViewGroup; -import com.yizhuan.erban.application.XChatApplication; +import com.mango.moshen.application.XChatApplication; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java b/app/src/main/java/com/mango/moshen/avroom/widget/GiftEffectView.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java rename to app/src/main/java/com/mango/moshen/avroom/widget/GiftEffectView.java index ba8bd76e3..61043af1e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/GiftEffectView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -26,22 +26,22 @@ import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; import com.tencent.qgame.animplayer.AnimView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.utils.ImageLoadKt; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftEffectInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_library.utils.ResolutionUtils; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.utils.ImageLoadKt; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.gift.GiftModel; +import com.mango.core.gift.bean.GiftEffectInfo; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.GiftReceiver; +import com.mango.core.initial.InitialModel; +import com.mango.core.initial.bean.InitInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.xchat_android_library.utils.ResolutionUtils; import java.lang.ref.WeakReference; import java.net.MalformedURLException; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java b/app/src/main/java/com/mango/moshen/avroom/widget/GiftV2View.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java rename to app/src/main/java/com/mango/moshen/avroom/widget/GiftV2View.java index 72a52b469..5736084c5 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/GiftV2View.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -32,34 +32,32 @@ 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.common.svga.SimpleSvgaParseCompletion; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.drawgift.DrawGiftHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.fansteam.FansTeamMsgInfo; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftEffectInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.FansTeamMsgAttachment; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.ObjectPool; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo; -import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterAttackInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_library.utils.ResolutionUtils; +import com.mango.moshen.R; +import com.mango.moshen.common.svga.SimpleSvgaParseCompletion; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.auth.AuthModel; +import com.mango.core.fansteam.FansTeamMsgInfo; +import com.mango.core.gift.GiftModel; +import com.mango.core.gift.bean.GiftEffectInfo; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.GiftMultiReceiverInfo; +import com.mango.core.gift.bean.GiftReceiveInfo; +import com.mango.core.gift.bean.GiftReceiver; +import com.mango.core.gift.bean.LuckyBagGifts; +import com.mango.core.gift.bean.MultiGiftReceiveInfo; +import com.mango.core.im.custom.bean.FansTeamMsgAttachment; +import com.mango.core.magic.MagicModel; +import com.mango.core.magic.ObjectPool; +import com.mango.core.magic.bean.MagicInfo; +import com.mango.core.magic.bean.MagicReceivedInfo; +import com.mango.core.magic.bean.MultiMagicReceivedInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.monsterhunting.bean.MonsterAttackInfo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.xchat_android_library.utils.ResolutionUtils; import java.lang.ref.WeakReference; import java.net.MalformedURLException; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/LollipopFixedWebView.java b/app/src/main/java/com/mango/moshen/avroom/widget/LollipopFixedWebView.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/LollipopFixedWebView.java rename to app/src/main/java/com/mango/moshen/avroom/widget/LollipopFixedWebView.java index b98dc657b..893b7c251 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/LollipopFixedWebView.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/LollipopFixedWebView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.annotation.TargetApi; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MagicTextView.java b/app/src/main/java/com/mango/moshen/avroom/widget/MagicTextView.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/MagicTextView.java rename to app/src/main/java/com/mango/moshen/avroom/widget/MagicTextView.java index b31b7c4ca..b753b2a50 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MagicTextView.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/MagicTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.content.Context; import android.content.res.TypedArray; @@ -21,7 +21,7 @@ import android.util.AttributeSet; import android.util.Pair; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.util.ArrayList; import java.util.WeakHashMap; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java b/app/src/main/java/com/mango/moshen/avroom/widget/MessageView.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java rename to app/src/main/java/com/mango/moshen/avroom/widget/MessageView.java index 6f457d5cc..ab1894dc3 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/MessageView.java @@ -1,14 +1,14 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GIFT_COMPOUND; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ME; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FANS_TEAM_JOIN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_GIFT_COMPOUND; -import static com.yizhuan.xchat_android_core.redpackage.RedPackageTypeKt.ALL_DIAMOND; -import static com.yizhuan.xchat_android_core.redpackage.RedPackageTypeKt.ALL_GIFT; -import static com.yizhuan.xchat_android_core.redpackage.RedPackageTypeKt.ROOM_DIAMOND; -import static com.yizhuan.xchat_android_core.redpackage.RedPackageTypeKt.ROOM_GIFT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GIFT_COMPOUND; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ME; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FANS_TEAM_JOIN; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_GIFT_COMPOUND; +import static com.mango.core.redpackage.RedPackageTypeKt.ALL_DIAMOND; +import static com.mango.core.redpackage.RedPackageTypeKt.ALL_GIFT; +import static com.mango.core.redpackage.RedPackageTypeKt.ROOM_DIAMOND; +import static com.mango.core.redpackage.RedPackageTypeKt.ROOM_GIFT; import android.annotation.SuppressLint; import android.content.Context; @@ -51,114 +51,114 @@ import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.constant.NotificationType; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.tongdaxing.erban.sadmin.utils.SaAttachmentToMsgUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.avroom.dialog.PKResultDialog; -import com.yizhuan.erban.common.widget.CustomAutoWidthImageSpan; -import com.yizhuan.erban.common.widget.CustomImageSpan; -import com.yizhuan.erban.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.DividerItemDecoration; -import com.yizhuan.erban.ui.widget.MyItemAnimator; -import com.yizhuan.erban.ui.widget.RecyclerViewNoViewpagerScroll; -import com.yizhuan.erban.ui.widget.UserInfoDialog; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.attachmsg.RoomQueueMsgAttachment; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.fansteam.FansTeamMsgInfo; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftList; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; -import com.yizhuan.xchat_android_core.helper.ImHelperUtils; -import com.yizhuan.xchat_android_core.home.event.FollowRoomEvent; -import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel; -import com.yizhuan.xchat_android_core.im.custom.bean.AuctionAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarveUpGoldAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CleanScreenAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.DatingAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.FaceAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.FansTeamMsgAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftBatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftCompoundAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftCompoundMsgBean; -import com.yizhuan.xchat_android_core.im.custom.bean.JoinMiniWorldAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.JoinMiniWorldNoticeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicAllMicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicBatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterHuntingResultAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterStatusAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiLuckyGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MusicInfoAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageRoomMsgAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment2; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomNoticeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomReceivedLuckyGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomTipAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.TarotAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.TarotMsgBean; -import com.yizhuan.xchat_android_core.im.custom.bean.VipMessageAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.WelcomeAttachment; -import com.yizhuan.xchat_android_core.level.UserLevelResourceType; -import com.yizhuan.xchat_android_core.magic.MagicModel; -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.MagicReceiver; -import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeRoomMsg; -import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomMessageViewNoticeInfo; -import com.yizhuan.xchat_android_core.room.bean.WelcomeInfo; -import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; -import com.yizhuan.xchat_android_core.room.face.FaceInfo; -import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.pk.attachment.RoomPkAttachment; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -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.room.queuing_mic.attachment.QueuingMicAttachment; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicInfo; -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.ExtensionUtil; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.vip.VipMessageInfo; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -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.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.avroom.dialog.PKResultDialog; +import com.mango.moshen.common.widget.CustomAutoWidthImageSpan; +import com.mango.moshen.common.widget.CustomImageSpan; +import com.mango.moshen.common.widget.OriginalDrawStatusClickSpan; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.DividerItemDecoration; +import com.mango.moshen.ui.widget.MyItemAnimator; +import com.mango.moshen.ui.widget.RecyclerViewNoViewpagerScroll; +import com.mango.moshen.ui.widget.UserInfoDialog; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.moshen.utils.RegexUtil; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.DemoCache; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.core.fansteam.FansTeamMsgInfo; +import com.mango.core.gift.GiftModel; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.GiftList; +import com.mango.core.gift.bean.GiftReceiveInfo; +import com.mango.core.gift.bean.GiftReceiver; +import com.mango.core.gift.bean.LuckyBagGifts; +import com.mango.core.gift.bean.LuckyBagNoticeInfo; +import com.mango.core.helper.ImHelperUtils; +import com.mango.core.home.event.FollowRoomEvent; +import com.mango.core.home.model.CollectionRoomModel; +import com.mango.core.im.custom.bean.AuctionAttachment; +import com.mango.core.im.custom.bean.CarveUpGoldAttachment; +import com.mango.core.im.custom.bean.CleanScreenAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.DatingAttachment; +import com.mango.core.im.custom.bean.FaceAttachment; +import com.mango.core.im.custom.bean.FansTeamMsgAttachment; +import com.mango.core.im.custom.bean.GiftAttachment; +import com.mango.core.im.custom.bean.GiftBatchAttachment; +import com.mango.core.im.custom.bean.GiftCompoundAttachment; +import com.mango.core.im.custom.bean.GiftCompoundMsgBean; +import com.mango.core.im.custom.bean.JoinMiniWorldAttachment; +import com.mango.core.im.custom.bean.JoinMiniWorldNoticeAttachment; +import com.mango.core.im.custom.bean.MagicAllMicAttachment; +import com.mango.core.im.custom.bean.MagicAttachment; +import com.mango.core.im.custom.bean.MagicBatchAttachment; +import com.mango.core.im.custom.bean.MonsterHuntingResultAttachment; +import com.mango.core.im.custom.bean.MonsterStatusAttachment; +import com.mango.core.im.custom.bean.MultiGiftAttachment; +import com.mango.core.im.custom.bean.MultiLuckyGiftAttachment; +import com.mango.core.im.custom.bean.MusicInfoAttachment; +import com.mango.core.im.custom.bean.NobleAttachment; +import com.mango.core.im.custom.bean.RedPackageRoomMsgAttachment; +import com.mango.core.im.custom.bean.RoomBoxPrizeAttachment; +import com.mango.core.im.custom.bean.RoomFollowOwnerAttachment; +import com.mango.core.im.custom.bean.RoomFollowOwnerAttachment2; +import com.mango.core.im.custom.bean.RoomNoticeAttachment; +import com.mango.core.im.custom.bean.RoomReceivedLuckyGiftAttachment; +import com.mango.core.im.custom.bean.RoomTipAttachment; +import com.mango.core.im.custom.bean.TarotAttachment; +import com.mango.core.im.custom.bean.TarotMsgBean; +import com.mango.core.im.custom.bean.VipMessageAttachment; +import com.mango.core.im.custom.bean.WelcomeAttachment; +import com.mango.core.level.UserLevelResourceType; +import com.mango.core.magic.MagicModel; +import com.mango.core.magic.bean.MagicInfo; +import com.mango.core.magic.bean.MagicMultiReceiverInfo; +import com.mango.core.magic.bean.MagicReceivedInfo; +import com.mango.core.magic.bean.MagicReceiver; +import com.mango.core.magic.bean.MultiMagicReceivedInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.miniworld.bean.MiniWorldInWorldInfo; +import com.mango.core.monsterhunting.bean.MonsterHuntingResult; +import com.mango.core.monsterhunting.bean.MonsterProtocol; +import com.mango.core.noble.NobleInfo; +import com.mango.core.noble.NobleUtil; +import com.mango.core.praise.PraiseModel; +import com.mango.core.redpackage.RedEnvelopeRoomMsg; +import com.mango.core.room.bean.DatingNotifyInfo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomMessageViewNoticeInfo; +import com.mango.core.room.bean.WelcomeInfo; +import com.mango.core.room.face.DynamicFaceModel; +import com.mango.core.room.face.FaceInfo; +import com.mango.core.room.face.FaceReceiveInfo; +import com.mango.core.room.ktv.bean.MusicInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.room.pk.attachment.RoomPkAttachment; +import com.mango.core.room.pk.bean.PKTeamInfo; +import com.mango.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.mango.core.room.pk.bean.RoomPkData; +import com.mango.core.room.queuing_mic.attachment.QueuingMicAttachment; +import com.mango.core.room.queuing_mic.bean.QueuingMicInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.ExtensionUtil; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.core.vip.VipMessageInfo; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.SizeUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java b/app/src/main/java/com/mango/moshen/avroom/widget/MicroView.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java rename to app/src/main/java/com/mango/moshen/avroom/widget/MicroView.java index b0589e359..fc2738420 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/MicroView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.annotation.SuppressLint; import android.content.Context; @@ -20,22 +20,22 @@ 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.adapter.BaseMicroViewAdapter; -import com.yizhuan.erban.avroom.adapter.DatingMicroViewAdapter; -import com.yizhuan.erban.avroom.adapter.OnMicroItemClickListener; -import com.yizhuan.erban.ui.anim.AnimFactory; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.DatingItemDecoration; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.room.event.ReceiveFaceEvent; -import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo; -import com.yizhuan.xchat_android_core.utils.LogUtils; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.BaseMicroViewAdapter; +import com.mango.moshen.avroom.adapter.DatingMicroViewAdapter; +import com.mango.moshen.avroom.adapter.OnMicroItemClickListener; +import com.mango.moshen.ui.anim.AnimFactory; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.recyclerview.decoration.DatingItemDecoration; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.noble.NobleResourceType; +import com.mango.core.noble.NobleUtil; +import com.mango.core.room.event.ReceiveFaceEvent; +import com.mango.core.room.face.FaceReceiveInfo; +import com.mango.core.utils.LogUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/OnMsgLongClickListener.java b/app/src/main/java/com/mango/moshen/avroom/widget/OnMsgLongClickListener.java similarity index 75% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/OnMsgLongClickListener.java rename to app/src/main/java/com/mango/moshen/avroom/widget/OnMsgLongClickListener.java index 73809b480..7c9c78e5f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/OnMsgLongClickListener.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/OnMsgLongClickListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/PKBoardView.java b/app/src/main/java/com/mango/moshen/avroom/widget/PKBoardView.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/PKBoardView.java rename to app/src/main/java/com/mango/moshen/avroom/widget/PKBoardView.java index f2bd06e11..88c165321 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/PKBoardView.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/PKBoardView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.content.Context; import android.text.TextUtils; @@ -11,22 +11,22 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.dialog.PKScoreBoardDialog; -import com.yizhuan.erban.avroom.dialog.PKSelectPeopleDialog; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -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.room.pk.event.PKDataUpdateEvent; -import com.yizhuan.xchat_android_core.room.pk.event.PKTimeFinishEvent; -import com.yizhuan.xchat_android_core.room.pk.event.PKTimeTickEvent; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.avroom.dialog.PKScoreBoardDialog; +import com.mango.moshen.avroom.dialog.PKSelectPeopleDialog; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.pk.bean.PKMemberInfo; +import com.mango.core.room.pk.bean.PKTeamInfo; +import com.mango.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.mango.core.room.pk.bean.RoomPkData; +import com.mango.core.room.pk.event.PKDataUpdateEvent; +import com.mango.core.room.pk.event.PKTimeFinishEvent; +import com.mango.core.room.pk.event.PKTimeTickEvent; +import com.mango.core.room.pk.model.PkModel; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/PKProgressBar.kt b/app/src/main/java/com/mango/moshen/avroom/widget/PKProgressBar.kt similarity index 94% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/PKProgressBar.kt rename to app/src/main/java/com/mango/moshen/avroom/widget/PKProgressBar.kt index 2187aa58b..02d4c073d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/PKProgressBar.kt +++ b/app/src/main/java/com/mango/moshen/avroom/widget/PKProgressBar.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget +package com.mango.moshen.avroom.widget import android.content.Context import android.graphics.Bitmap @@ -6,7 +6,7 @@ import android.graphics.BitmapFactory import android.graphics.Canvas import android.util.AttributeSet import android.widget.ProgressBar -import com.yizhuan.erban.R +import com.mango.moshen.R class PKProgressBar(context: Context, attrs: AttributeSet?) : ProgressBar(context, attrs) { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java b/app/src/main/java/com/mango/moshen/avroom/widget/RankNavigatorAdapter.java similarity index 78% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/widget/RankNavigatorAdapter.java index 70276c4b6..c625e2ec4 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/RankNavigatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.content.Context; import android.graphics.Color; @@ -8,14 +8,13 @@ import androidx.core.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -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.manager.AvRoomDataManager; +import com.mango.moshen.R; +import com.mango.moshen.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt b/app/src/main/java/com/mango/moshen/avroom/widget/RoomEffectView.kt similarity index 97% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt rename to app/src/main/java/com/mango/moshen/avroom/widget/RoomEffectView.kt index 36b534ddf..a66ed609a 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt +++ b/app/src/main/java/com/mango/moshen/avroom/widget/RoomEffectView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget +package com.mango.moshen.avroom.widget import android.annotation.SuppressLint import android.app.Activity @@ -25,31 +25,31 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage import com.netease.nimlib.sdk.chatroom.model.ChatRoomNotificationAttachment import com.opensource.svgaplayer.* import com.opensource.svgaplayer.SVGAParser.Companion.shareParser -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.avroom.helper.AnimHelper -import com.yizhuan.erban.common.svga.SimpleSvgaCallback -import com.yizhuan.erban.databinding.LayoutRoomEffectBinding -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.erban.ui.utils.isDestroyed -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.erban.ui.utils.loadAnim -import com.yizhuan.erban.ui.widget.SimpleAnimListener -import com.yizhuan.erban.ui.widget.drawgift.DrawGiftPlayHelper -import com.yizhuan.erban.utils.SpannableBuilder -import com.yizhuan.xchat_android_constants.XChatConstants -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo -import com.yizhuan.xchat_android_core.im.custom.bean.* -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager -import com.yizhuan.xchat_android_core.manager.RoomEvent -import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo -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_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_library.utils.ListUtils +import com.mango.moshen.R +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.avroom.helper.AnimHelper +import com.mango.moshen.common.svga.SimpleSvgaCallback +import com.mango.moshen.databinding.LayoutRoomEffectBinding +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.moshen.ui.utils.isDestroyed +import com.mango.moshen.ui.utils.load +import com.mango.moshen.ui.utils.loadAnim +import com.mango.moshen.ui.widget.SimpleAnimListener +import com.mango.moshen.ui.widget.drawgift.DrawGiftPlayHelper +import com.mango.moshen.utils.SpannableBuilder +import com.mango.xchat_android_constants.XChatConstants +import com.mango.core.auth.AuthModel +import com.mango.core.decoration.car.bean.CarInfo +import com.mango.core.im.custom.bean.* +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.manager.IMNetEaseManager +import com.mango.core.manager.RoomEvent +import com.mango.core.room.bean.DatingNotifyInfo +import com.mango.core.super_admin.util.SuperAdminUtil +import com.mango.core.user.UserModel +import com.mango.core.user.bean.UserInfo +import com.mango.core.utils.subAndReplaceDot +import com.mango.xchat_android_library.utils.ListUtils import io.reactivex.Observable import io.reactivex.ObservableEmitter import io.reactivex.ObservableOnSubscribe diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankNavigatorAdapter.java b/app/src/main/java/com/mango/moshen/avroom/widget/RoomRankNavigatorAdapter.java similarity index 80% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankNavigatorAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/widget/RoomRankNavigatorAdapter.java index d73f2d236..85ddb3fc3 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankNavigatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/RoomRankNavigatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.content.Context; import android.graphics.Color; @@ -6,13 +6,13 @@ import androidx.core.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -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.mango.moshen.R; +import com.mango.moshen.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankWrapViewPager.java b/app/src/main/java/com/mango/moshen/avroom/widget/RoomRankWrapViewPager.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankWrapViewPager.java rename to app/src/main/java/com/mango/moshen/avroom/widget/RoomRankWrapViewPager.java index 70fd61ae8..66a8a3da4 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankWrapViewPager.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/RoomRankWrapViewPager.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.content.Context; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/ScaleTransformer.java b/app/src/main/java/com/mango/moshen/avroom/widget/ScaleTransformer.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/ScaleTransformer.java rename to app/src/main/java/com/mango/moshen/avroom/widget/ScaleTransformer.java index 25112028c..8c26c0f03 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/ScaleTransformer.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/ScaleTransformer.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/ScrollSpeedLinearLayoutManger.java b/app/src/main/java/com/mango/moshen/avroom/widget/ScrollSpeedLinearLayoutManger.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/ScrollSpeedLinearLayoutManger.java rename to app/src/main/java/com/mango/moshen/avroom/widget/ScrollSpeedLinearLayoutManger.java index 9569ac51a..f49306f21 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/ScrollSpeedLinearLayoutManger.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/ScrollSpeedLinearLayoutManger.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.content.Context; import android.graphics.PointF; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/SliddingView.java b/app/src/main/java/com/mango/moshen/avroom/widget/SliddingView.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/SliddingView.java rename to app/src/main/java/com/mango/moshen/avroom/widget/SliddingView.java index ab8412521..5c8e289cf 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/SliddingView.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/SliddingView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.content.Context; import android.util.AttributeSet; @@ -7,7 +7,7 @@ import android.view.View; import android.widget.HorizontalScrollView; import android.widget.LinearLayout; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; /** diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/VerticalViewPagerAdapter.java b/app/src/main/java/com/mango/moshen/avroom/widget/VerticalViewPagerAdapter.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/VerticalViewPagerAdapter.java rename to app/src/main/java/com/mango/moshen/avroom/widget/VerticalViewPagerAdapter.java index fb346120e..667807707 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/VerticalViewPagerAdapter.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/VerticalViewPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; import android.util.SparseArray; @@ -7,9 +7,9 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; -import com.yizhuan.erban.avroom.fragment.FakeSingleRoomBackFragment; -import com.yizhuan.erban.avroom.fragment.FakeSingleRoomFragment; -import com.yizhuan.erban.avroom.fragment.HomePartyFragment; +import com.mango.moshen.avroom.fragment.FakeSingleRoomBackFragment; +import com.mango.moshen.avroom.fragment.FakeSingleRoomFragment; +import com.mango.moshen.avroom.fragment.HomePartyFragment; /** diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/ViewItem.java b/app/src/main/java/com/mango/moshen/avroom/widget/ViewItem.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/ViewItem.java rename to app/src/main/java/com/mango/moshen/avroom/widget/ViewItem.java index 4107b9419..6eeee1231 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/ViewItem.java +++ b/app/src/main/java/com/mango/moshen/avroom/widget/ViewItem.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.avroom.widget; +package com.mango.moshen.avroom.widget; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * 从library拿到client diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/VipProgressBar.kt b/app/src/main/java/com/mango/moshen/avroom/widget/VipProgressBar.kt similarity index 94% rename from app/src/main/java/com/yizhuan/erban/avroom/widget/VipProgressBar.kt rename to app/src/main/java/com/mango/moshen/avroom/widget/VipProgressBar.kt index 721cde49e..2b4922155 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/VipProgressBar.kt +++ b/app/src/main/java/com/mango/moshen/avroom/widget/VipProgressBar.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.avroom.widget +package com.mango.moshen.avroom.widget import android.content.Context import android.graphics.Bitmap @@ -7,7 +7,7 @@ import android.graphics.Canvas import android.util.AttributeSet import android.widget.ProgressBar import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R +import com.mango.moshen.R class VipProgressBar(context: Context, attrs: AttributeSet?) : ProgressBar(context, attrs) { diff --git a/app/src/main/java/com/yizhuan/erban/base/AbstractMvpActivity.java b/app/src/main/java/com/mango/moshen/base/AbstractMvpActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/base/AbstractMvpActivity.java rename to app/src/main/java/com/mango/moshen/base/AbstractMvpActivity.java index 273d74a09..f3e96b864 100644 --- a/app/src/main/java/com/yizhuan/erban/base/AbstractMvpActivity.java +++ b/app/src/main/java/com/mango/moshen/base/AbstractMvpActivity.java @@ -1,16 +1,16 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import android.os.Bundle; import android.util.Log; import androidx.annotation.Nullable; -import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter; -import com.yizhuan.xchat_android_library.base.factory.BaseMvpProxy; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactory; -import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactoryImpl; -import com.yizhuan.xchat_android_library.base.factory.PresenterProxyInterface; +import com.mango.xchat_android_library.base.factory.AbstractMvpPresenter; +import com.mango.xchat_android_library.base.factory.BaseMvpProxy; +import com.mango.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.factory.PresenterMvpFactory; +import com.mango.xchat_android_library.base.factory.PresenterMvpFactoryImpl; +import com.mango.xchat_android_library.base.factory.PresenterProxyInterface; /** *

1. 子类的Presenter必须继承自AbstractMvpPresenter； diff --git a/app/src/main/java/com/yizhuan/erban/base/AbstractMvpFragment.java b/app/src/main/java/com/mango/moshen/base/AbstractMvpFragment.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/base/AbstractMvpFragment.java rename to app/src/main/java/com/mango/moshen/base/AbstractMvpFragment.java index c42b43a99..6ceafeb70 100644 --- a/app/src/main/java/com/yizhuan/erban/base/AbstractMvpFragment.java +++ b/app/src/main/java/com/mango/moshen/base/AbstractMvpFragment.java @@ -1,15 +1,15 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import android.os.Bundle; import androidx.annotation.Nullable; import android.util.Log; -import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter; -import com.yizhuan.xchat_android_library.base.factory.BaseMvpProxy; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactory; -import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactoryImpl; -import com.yizhuan.xchat_android_library.base.factory.PresenterProxyInterface; +import com.mango.xchat_android_library.base.factory.AbstractMvpPresenter; +import com.mango.xchat_android_library.base.factory.BaseMvpProxy; +import com.mango.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.factory.PresenterMvpFactory; +import com.mango.xchat_android_library.base.factory.PresenterMvpFactoryImpl; +import com.mango.xchat_android_library.base.factory.PresenterProxyInterface; /** *

1. 子类的Presenter必须继承自AbstractMvpPresenter； diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java b/app/src/main/java/com/mango/moshen/base/BaseActivity.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/base/BaseActivity.java rename to app/src/main/java/com/mango/moshen/base/BaseActivity.java index f8dc8058d..160dcaf9e 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java +++ b/app/src/main/java/com/mango/moshen/base/BaseActivity.java @@ -1,14 +1,14 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; -import static com.yizhuan.xchat_android_core.Constants.DEBUG_MAX_UID; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_OPENNOBLE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_RENEWNOBLE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_USER_ALL_UPGRADE; -import static com.yizhuan.xchat_android_library.utils.UIUtils.getActivityByContext; +import static com.mango.core.Constants.DEBUG_MAX_UID; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_OPENNOBLE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_RENEWNOBLE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_USER_ALL_UPGRADE; +import static com.mango.xchat_android_library.utils.UIUtils.getActivityByContext; import android.annotation.SuppressLint; import android.app.ActivityManager; @@ -48,58 +48,58 @@ import com.readystatesoftware.systembartint.SystemBarTintManager; import com.tbruyelle.rxpermissions2.RxPermissions; import com.trello.rxlifecycle3.android.ActivityEvent; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.yizhuan.erban.MiddleActivity; -import com.yizhuan.erban.NimMiddleActivity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.application.XChatApplication; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.avroom.firstcharge.FirstChargeDialog; -import com.yizhuan.erban.avroom.redpackage.RedPackageGoRoomDialog; -import com.yizhuan.erban.avroom.redpackage.RedPackageOpenDialog; -import com.yizhuan.erban.common.LoadingFragment; -import com.yizhuan.erban.common.NetworkErrorFragment; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.common.ReloadFragment; -import com.yizhuan.erban.common.permission.PermissionActivity; -import com.yizhuan.erban.common.widget.StatusLayout; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.common.widget.dialog.DialogUiHelper; -import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.erban.ui.login.AddUserInfoActivity; -import com.yizhuan.erban.ui.login.LoginCodeActivity; -import com.yizhuan.erban.ui.login.LoginPhoneActivity; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.erban.ui.setting.ResetPasswordActivity; -import com.yizhuan.erban.ui.widget.DefaultToolBar; -import com.yizhuan.erban.ui.widget.dialog.AllServiceVipLevelUPDialog; -import com.yizhuan.erban.ui.widget.dialog.OpenNobleGlobalNoticeDialog; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.tutu.mentoring_relationship.dialog.GrabApprenticesNoticeDialog; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.GrabApprenticesEvent; -import com.yizhuan.xchat_android_core.newbie.NewbieHelloInfo; -import com.yizhuan.xchat_android_core.newbie.event.NewbieHelloDialogEvent; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleProtocol; -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -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.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.vip.VipMessageInfo; -import com.yizhuan.xchat_android_library.rxbus.RxBus; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.UIUtils; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.moshen.MiddleActivity; +import com.mango.moshen.NimMiddleActivity; +import com.mango.moshen.R; +import com.mango.moshen.application.XChatApplication; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.avroom.firstcharge.FirstChargeDialog; +import com.mango.moshen.avroom.redpackage.RedPackageGoRoomDialog; +import com.mango.moshen.avroom.redpackage.RedPackageOpenDialog; +import com.mango.moshen.common.LoadingFragment; +import com.mango.moshen.common.NetworkErrorFragment; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.common.ReloadFragment; +import com.mango.moshen.common.permission.PermissionActivity; +import com.mango.moshen.common.widget.StatusLayout; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.common.widget.dialog.DialogUiHelper; +import com.mango.moshen.ui.im.avtivity.NimP2PMessageActivity; +import com.mango.moshen.ui.login.AddUserInfoActivity; +import com.mango.moshen.ui.login.LoginCodeActivity; +import com.mango.moshen.ui.login.LoginPhoneActivity; +import com.mango.moshen.ui.pay.ChargeActivity; +import com.mango.moshen.ui.setting.ResetPasswordActivity; +import com.mango.moshen.ui.widget.DefaultToolBar; +import com.mango.moshen.ui.widget.dialog.AllServiceVipLevelUPDialog; +import com.mango.moshen.ui.widget.dialog.OpenNobleGlobalNoticeDialog; +import com.mango.moshen.utils.UserUtils; +import com.mango.moshen.mentoring_relationship.dialog.GrabApprenticesNoticeDialog; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.bean.BaseProtocol; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.mentoring_relationship.event.GrabApprenticesEvent; +import com.mango.core.newbie.NewbieHelloInfo; +import com.mango.core.newbie.event.NewbieHelloDialogEvent; +import com.mango.core.noble.NobleInfo; +import com.mango.core.noble.NobleProtocol; +import com.mango.core.redpackage.RedPackageNotifyInfo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.utils.net.RxHelper; +import com.mango.core.vip.VipMessageInfo; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_library.utils.NetworkUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.UIUtils; +import com.mango.xchat_android_library.utils.codec.DESUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.log.MLog; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseBindingActivity.java b/app/src/main/java/com/mango/moshen/base/BaseBindingActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/base/BaseBindingActivity.java rename to app/src/main/java/com/mango/moshen/base/BaseBindingActivity.java index f31dd78d0..995c54514 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseBindingActivity.java +++ b/app/src/main/java/com/mango/moshen/base/BaseBindingActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import android.content.Intent; import androidx.databinding.DataBindingUtil; @@ -6,8 +6,8 @@ import androidx.databinding.ViewDataBinding; import android.os.Bundle; import android.view.View; -import com.yizhuan.erban.BR; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.BR; +import com.mango.xchat_android_library.annatation.ActLayoutRes; /** * Created by huangmeng1 on 2018/5/7. diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseBindingFragment.java b/app/src/main/java/com/mango/moshen/base/BaseBindingFragment.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/base/BaseBindingFragment.java rename to app/src/main/java/com/mango/moshen/base/BaseBindingFragment.java index 3c4b1b8b6..e70cde0ef 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseBindingFragment.java +++ b/app/src/main/java/com/mango/moshen/base/BaseBindingFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import androidx.databinding.DataBindingUtil; import androidx.databinding.ViewDataBinding; @@ -8,7 +8,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.annatation.ActLayoutRes; /** * Created by huangmeng1 on 2018/5/7. diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseBindingTakePhotoActivity.java b/app/src/main/java/com/mango/moshen/base/BaseBindingTakePhotoActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/base/BaseBindingTakePhotoActivity.java rename to app/src/main/java/com/mango/moshen/base/BaseBindingTakePhotoActivity.java index 9d46bd777..acefb28a3 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseBindingTakePhotoActivity.java +++ b/app/src/main/java/com/mango/moshen/base/BaseBindingTakePhotoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import android.annotation.SuppressLint; import androidx.databinding.DataBindingUtil; @@ -11,11 +11,11 @@ import com.jph.takephoto.app.TakePhotoActivity; import com.jph.takephoto.compress.CompressConfig; import com.jph.takephoto.model.CropOptions; import com.jph.takephoto.model.TResult; -import com.yizhuan.erban.R; -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.utils.file.JXFileUtils; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.core.file.FileModel; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.file.JXFileUtils; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseBsDialog.java b/app/src/main/java/com/mango/moshen/base/BaseBsDialog.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/base/BaseBsDialog.java rename to app/src/main/java/com/mango/moshen/base/BaseBsDialog.java index e06f69010..4a41cc723 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseBsDialog.java +++ b/app/src/main/java/com/mango/moshen/base/BaseBsDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import android.content.Context; import android.os.Bundle; @@ -8,7 +8,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog; import android.view.WindowManager; import android.widget.FrameLayout; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseDialog.kt b/app/src/main/java/com/mango/moshen/base/BaseDialog.kt similarity index 98% rename from app/src/main/java/com/yizhuan/erban/base/BaseDialog.kt rename to app/src/main/java/com/mango/moshen/base/BaseDialog.kt index 86f9720f7..bf4da7f39 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseDialog.kt +++ b/app/src/main/java/com/mango/moshen/base/BaseDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base +package com.mango.moshen.base import android.content.Context import android.content.DialogInterface diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseFragment.java b/app/src/main/java/com/mango/moshen/base/BaseFragment.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/base/BaseFragment.java rename to app/src/main/java/com/mango/moshen/base/BaseFragment.java index 031c9bfe5..c2fcb5142 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseFragment.java +++ b/app/src/main/java/com/mango/moshen/base/BaseFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import android.annotation.SuppressLint; import android.app.Activity; @@ -19,19 +19,19 @@ import androidx.fragment.app.FragmentManager; import com.tbruyelle.rxpermissions2.RxPermissions; import com.trello.rxlifecycle3.components.support.RxFragment; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.AbsStatusFragment; -import com.yizhuan.erban.common.LoadingFragment; -import com.yizhuan.erban.common.NetworkErrorFragment; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.common.ReloadFragment; -import com.yizhuan.erban.common.widget.StatusLayout; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.UIUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.moshen.R; +import com.mango.moshen.common.AbsStatusFragment; +import com.mango.moshen.common.LoadingFragment; +import com.mango.moshen.common.NetworkErrorFragment; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.common.ReloadFragment; +import com.mango.moshen.common.widget.StatusLayout; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.xchat_android_library.utils.NetworkUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.UIUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.log.MLog; import java.util.List; import java.util.Stack; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseLazyFragment.java b/app/src/main/java/com/mango/moshen/base/BaseLazyFragment.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/base/BaseLazyFragment.java rename to app/src/main/java/com/mango/moshen/base/BaseLazyFragment.java index 36129982c..53272e7cc 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseLazyFragment.java +++ b/app/src/main/java/com/mango/moshen/base/BaseLazyFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import android.os.Bundle; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseListViewModel.java b/app/src/main/java/com/mango/moshen/base/BaseListViewModel.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/base/BaseListViewModel.java rename to app/src/main/java/com/mango/moshen/base/BaseListViewModel.java index 1a79226ba..a5ae40687 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseListViewModel.java +++ b/app/src/main/java/com/mango/moshen/base/BaseListViewModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableBoolean; @@ -6,11 +6,11 @@ import androidx.databinding.ObservableField; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.core.Constants; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java b/app/src/main/java/com/mango/moshen/base/BaseLoginAct.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java rename to app/src/main/java/com/mango/moshen/base/BaseLoginAct.java index 8089fb712..d1b639e90 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java +++ b/app/src/main/java/com/mango/moshen/base/BaseLoginAct.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import android.annotation.SuppressLint; import android.graphics.Color; @@ -17,16 +17,16 @@ import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.LoginTipsInfo; -import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.OriginalDrawStatusClickSpan; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.LoginTipsInfo; +import com.mango.core.market_verify.MarketVerifyModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMsListViewModel.java b/app/src/main/java/com/mango/moshen/base/BaseMsListViewModel.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/base/BaseMsListViewModel.java rename to app/src/main/java/com/mango/moshen/base/BaseMsListViewModel.java index 9094bcb3b..720686f27 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseMsListViewModel.java +++ b/app/src/main/java/com/mango/moshen/base/BaseMsListViewModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableBoolean; @@ -6,9 +6,9 @@ import androidx.databinding.ObservableField; import androidx.databinding.ViewDataBinding; import com.trello.rxlifecycle3.LifecycleProvider; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.mango.core.Constants; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.utils.net.RxHelper; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java b/app/src/main/java/com/mango/moshen/base/BaseMvpActivity.java similarity index 57% rename from app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java rename to app/src/main/java/com/mango/moshen/base/BaseMvpActivity.java index 4c1a53086..8638a194b 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java +++ b/app/src/main/java/com/mango/moshen/base/BaseMvpActivity.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter; +import com.mango.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.factory.AbstractMvpPresenter; /** * @author alvin hwang diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMvpFragment.java b/app/src/main/java/com/mango/moshen/base/BaseMvpFragment.java similarity index 67% rename from app/src/main/java/com/yizhuan/erban/base/BaseMvpFragment.java rename to app/src/main/java/com/mango/moshen/base/BaseMvpFragment.java index 6f31d9693..25c8d7483 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseMvpFragment.java +++ b/app/src/main/java/com/mango/moshen/base/BaseMvpFragment.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import android.view.KeyEvent; import androidx.fragment.app.FragmentManager; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter; +import com.mango.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.factory.AbstractMvpPresenter; /** * @author alvin hwang diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMvpPresenter.java b/app/src/main/java/com/mango/moshen/base/BaseMvpPresenter.java similarity index 72% rename from app/src/main/java/com/yizhuan/erban/base/BaseMvpPresenter.java rename to app/src/main/java/com/mango/moshen/base/BaseMvpPresenter.java index 610c1e9b4..61391cd00 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseMvpPresenter.java +++ b/app/src/main/java/com/mango/moshen/base/BaseMvpPresenter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import android.os.Bundle; import androidx.annotation.Nullable; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter; +import com.mango.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.factory.AbstractMvpPresenter; /** diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMvpTakePhotoActivity.java b/app/src/main/java/com/mango/moshen/base/BaseMvpTakePhotoActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/base/BaseMvpTakePhotoActivity.java rename to app/src/main/java/com/mango/moshen/base/BaseMvpTakePhotoActivity.java index 211fdece6..5f6b56777 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseMvpTakePhotoActivity.java +++ b/app/src/main/java/com/mango/moshen/base/BaseMvpTakePhotoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import android.annotation.SuppressLint; import android.content.Intent; @@ -17,13 +17,13 @@ import com.jph.takephoto.model.TResult; import com.jph.takephoto.permission.InvokeListener; import com.jph.takephoto.permission.PermissionManager; import com.jph.takephoto.permission.TakePhotoInvocationHandler; -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.base.IMvpBaseView; -import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter; -import com.yizhuan.xchat_android_library.utils.file.JXFileUtils; +import com.mango.moshen.R; +import com.mango.moshen.common.permission.PermissionActivity; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.core.file.FileModel; +import com.mango.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.factory.AbstractMvpPresenter; +import com.mango.xchat_android_library.utils.file.JXFileUtils; import com.jph.takephoto.permission.PermissionManager.TPermissionType; import java.io.File; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseSdDialog.java b/app/src/main/java/com/mango/moshen/base/BaseSdDialog.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/base/BaseSdDialog.java rename to app/src/main/java/com/mango/moshen/base/BaseSdDialog.java index 5ee84eb71..0b6202ecc 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseSdDialog.java +++ b/app/src/main/java/com/mango/moshen/base/BaseSdDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import android.content.Context; import androidx.appcompat.app.AppCompatDialog; diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseVM.java b/app/src/main/java/com/mango/moshen/base/BaseVM.java similarity index 69% rename from app/src/main/java/com/yizhuan/erban/base/BaseVM.java rename to app/src/main/java/com/mango/moshen/base/BaseVM.java index 31dde55aa..10443208b 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseVM.java +++ b/app/src/main/java/com/mango/moshen/base/BaseVM.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; /** * Created by huangmeng1 on 2018/5/7. diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseViewBindingActivity.kt b/app/src/main/java/com/mango/moshen/base/BaseViewBindingActivity.kt similarity index 96% rename from app/src/main/java/com/yizhuan/erban/base/BaseViewBindingActivity.kt rename to app/src/main/java/com/mango/moshen/base/BaseViewBindingActivity.kt index 68957676f..bd27c68b4 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseViewBindingActivity.kt +++ b/app/src/main/java/com/mango/moshen/base/BaseViewBindingActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base +package com.mango.moshen.base import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseViewBindingFragment.kt b/app/src/main/java/com/mango/moshen/base/BaseViewBindingFragment.kt similarity index 97% rename from app/src/main/java/com/yizhuan/erban/base/BaseViewBindingFragment.kt rename to app/src/main/java/com/mango/moshen/base/BaseViewBindingFragment.kt index 41bf1df8d..9d4fc4f84 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseViewBindingFragment.kt +++ b/app/src/main/java/com/mango/moshen/base/BaseViewBindingFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base +package com.mango.moshen.base import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseViewModel.kt b/app/src/main/java/com/mango/moshen/base/BaseViewModel.kt similarity index 92% rename from app/src/main/java/com/yizhuan/erban/base/BaseViewModel.kt rename to app/src/main/java/com/mango/moshen/base/BaseViewModel.kt index 0ea1aede8..e76af0371 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseViewModel.kt +++ b/app/src/main/java/com/mango/moshen/base/BaseViewModel.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.base +package com.mango.moshen.base import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.core.utils.toast import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/yizhuan/erban/base/DialogManagerInterface.java b/app/src/main/java/com/mango/moshen/base/DialogManagerInterface.java similarity index 57% rename from app/src/main/java/com/yizhuan/erban/base/DialogManagerInterface.java rename to app/src/main/java/com/mango/moshen/base/DialogManagerInterface.java index 2e362409e..e49761ba4 100644 --- a/app/src/main/java/com/yizhuan/erban/base/DialogManagerInterface.java +++ b/app/src/main/java/com/mango/moshen/base/DialogManagerInterface.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; -import com.yizhuan.erban.common.widget.dialog.DialogManager; +import com.mango.moshen.common.widget.dialog.DialogManager; /** * 返回通用的dialogmanager diff --git a/app/src/main/java/com/yizhuan/erban/base/IAcitivityBase.java b/app/src/main/java/com/mango/moshen/base/IAcitivityBase.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/base/IAcitivityBase.java rename to app/src/main/java/com/mango/moshen/base/IAcitivityBase.java index dc07eeda0..c9c26b8b9 100644 --- a/app/src/main/java/com/yizhuan/erban/base/IAcitivityBase.java +++ b/app/src/main/java/com/mango/moshen/base/IAcitivityBase.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; /** * Created by zhouxiangfeng on 17/3/5. diff --git a/app/src/main/java/com/yizhuan/erban/base/IBase.java b/app/src/main/java/com/mango/moshen/base/IBase.java similarity index 70% rename from app/src/main/java/com/yizhuan/erban/base/IBase.java rename to app/src/main/java/com/mango/moshen/base/IBase.java index e763517be..5bf7126b2 100644 --- a/app/src/main/java/com/yizhuan/erban/base/IBase.java +++ b/app/src/main/java/com/mango/moshen/base/IBase.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; /** * Created by zhouxiangfeng on 17/3/5. diff --git a/app/src/main/java/com/yizhuan/erban/base/IDataStatus.java b/app/src/main/java/com/mango/moshen/base/IDataStatus.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/base/IDataStatus.java rename to app/src/main/java/com/mango/moshen/base/IDataStatus.java index 0f12fc946..39db1d313 100644 --- a/app/src/main/java/com/yizhuan/erban/base/IDataStatus.java +++ b/app/src/main/java/com/mango/moshen/base/IDataStatus.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/base/TitleBar.java b/app/src/main/java/com/mango/moshen/base/TitleBar.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/base/TitleBar.java rename to app/src/main/java/com/mango/moshen/base/TitleBar.java index 8bb1dc506..d375cd787 100644 --- a/app/src/main/java/com/yizhuan/erban/base/TitleBar.java +++ b/app/src/main/java/com/mango/moshen/base/TitleBar.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; /** * Created by zhouxiangfeng on 2017/4/9. @@ -21,7 +21,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.util.LinkedList; diff --git a/app/src/main/java/com/yizhuan/erban/base/XchatGlideModule.java b/app/src/main/java/com/mango/moshen/base/XchatGlideModule.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/base/XchatGlideModule.java rename to app/src/main/java/com/mango/moshen/base/XchatGlideModule.java index 15fabd5d0..b828e872f 100644 --- a/app/src/main/java/com/yizhuan/erban/base/XchatGlideModule.java +++ b/app/src/main/java/com/mango/moshen/base/XchatGlideModule.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base; +package com.mango.moshen.base; import android.content.Context; @@ -12,8 +12,8 @@ import com.bumptech.glide.manager.ConnectivityMonitorFactory; import com.bumptech.glide.module.AppGlideModule; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.file.StorageUtils; +import com.mango.xchat_android_library.utils.NetworkUtils; +import com.mango.xchat_android_library.utils.file.StorageUtils; import java.io.File; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/BaseRecyclerView.java b/app/src/main/java/com/mango/moshen/base/list/BaseRecyclerView.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/base/list/BaseRecyclerView.java rename to app/src/main/java/com/mango/moshen/base/list/BaseRecyclerView.java index c59f29dc5..0d6378c1b 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/BaseRecyclerView.java +++ b/app/src/main/java/com/mango/moshen/base/list/BaseRecyclerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; import android.annotation.SuppressLint; import android.content.Context; @@ -16,7 +16,7 @@ import com.trello.rxlifecycle3.android.FragmentEvent; import com.trello.rxlifecycle3.components.RxActivity; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; import com.trello.rxlifecycle3.components.support.RxFragment; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/BaseViewHolder.java b/app/src/main/java/com/mango/moshen/base/list/BaseViewHolder.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/base/list/BaseViewHolder.java rename to app/src/main/java/com/mango/moshen/base/list/BaseViewHolder.java index 43df7c450..85a8bc142 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/BaseViewHolder.java +++ b/app/src/main/java/com/mango/moshen/base/list/BaseViewHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; import android.graphics.Bitmap; import android.graphics.Paint; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/CommonAdapter.java b/app/src/main/java/com/mango/moshen/base/list/CommonAdapter.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/base/list/CommonAdapter.java rename to app/src/main/java/com/mango/moshen/base/list/CommonAdapter.java index bffe78371..90bc0e895 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/CommonAdapter.java +++ b/app/src/main/java/com/mango/moshen/base/list/CommonAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/DefalutStatus.java b/app/src/main/java/com/mango/moshen/base/list/DefalutStatus.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/base/list/DefalutStatus.java rename to app/src/main/java/com/mango/moshen/base/list/DefalutStatus.java index 0429bf86d..e0e92323a 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/DefalutStatus.java +++ b/app/src/main/java/com/mango/moshen/base/list/DefalutStatus.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * 默认列表状态view diff --git a/app/src/main/java/com/yizhuan/erban/base/list/Header.java b/app/src/main/java/com/mango/moshen/base/list/Header.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/base/list/Header.java rename to app/src/main/java/com/mango/moshen/base/list/Header.java index 3f6c253af..d209f6ba0 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/Header.java +++ b/app/src/main/java/com/mango/moshen/base/list/Header.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; /** * Created by lvzebiao on 2018/12/18. diff --git a/app/src/main/java/com/yizhuan/erban/base/list/IHeaderHolderListener.java b/app/src/main/java/com/mango/moshen/base/list/IHeaderHolderListener.java similarity index 78% rename from app/src/main/java/com/yizhuan/erban/base/list/IHeaderHolderListener.java rename to app/src/main/java/com/mango/moshen/base/list/IHeaderHolderListener.java index 27c20a28f..6c2f96947 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/IHeaderHolderListener.java +++ b/app/src/main/java/com/mango/moshen/base/list/IHeaderHolderListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; /** * Created by lvzebiao on 2018/12/18. diff --git a/app/src/main/java/com/yizhuan/erban/base/list/IRecyclerListener.java b/app/src/main/java/com/mango/moshen/base/list/IRecyclerListener.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/base/list/IRecyclerListener.java rename to app/src/main/java/com/mango/moshen/base/list/IRecyclerListener.java index 3fa266c23..f1e0064a7 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/IRecyclerListener.java +++ b/app/src/main/java/com/mango/moshen/base/list/IRecyclerListener.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; import android.content.Context; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/IStatusView.java b/app/src/main/java/com/mango/moshen/base/list/IStatusView.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/base/list/IStatusView.java rename to app/src/main/java/com/mango/moshen/base/list/IStatusView.java index 977cbde89..11b616412 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/IStatusView.java +++ b/app/src/main/java/com/mango/moshen/base/list/IStatusView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; /** * Created by lvzebiao on 2018/12/14. diff --git a/app/src/main/java/com/yizhuan/erban/base/list/LineColorDecoration.java b/app/src/main/java/com/mango/moshen/base/list/LineColorDecoration.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/base/list/LineColorDecoration.java rename to app/src/main/java/com/mango/moshen/base/list/LineColorDecoration.java index 14b7724cb..7343df1d8 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/LineColorDecoration.java +++ b/app/src/main/java/com/mango/moshen/base/list/LineColorDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; import android.content.Context; import android.graphics.Canvas; @@ -8,7 +8,7 @@ import android.graphics.drawable.Drawable; import androidx.recyclerview.widget.RecyclerView; import android.view.View; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.xchat_android_library.utils.SizeUtils; /** diff --git a/app/src/main/java/com/yizhuan/erban/base/list/LoadingViewHolder.java b/app/src/main/java/com/mango/moshen/base/list/LoadingViewHolder.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/base/list/LoadingViewHolder.java rename to app/src/main/java/com/mango/moshen/base/list/LoadingViewHolder.java index 98b7f07ef..63f7c95b7 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/LoadingViewHolder.java +++ b/app/src/main/java/com/mango/moshen/base/list/LoadingViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/MultiCommonAdapter.java b/app/src/main/java/com/mango/moshen/base/list/MultiCommonAdapter.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/base/list/MultiCommonAdapter.java rename to app/src/main/java/com/mango/moshen/base/list/MultiCommonAdapter.java index c6289d837..3150a5e66 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/MultiCommonAdapter.java +++ b/app/src/main/java/com/mango/moshen/base/list/MultiCommonAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; import androidx.annotation.LayoutRes; import android.util.SparseIntArray; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/MultiItemEntity.java b/app/src/main/java/com/mango/moshen/base/list/MultiItemEntity.java similarity index 74% rename from app/src/main/java/com/yizhuan/erban/base/list/MultiItemEntity.java rename to app/src/main/java/com/mango/moshen/base/list/MultiItemEntity.java index bb3970d63..1230d9719 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/MultiItemEntity.java +++ b/app/src/main/java/com/mango/moshen/base/list/MultiItemEntity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; /** * Created by lvzebiao on 2018/12/18. diff --git a/app/src/main/java/com/yizhuan/erban/base/list/OnItemChildClickListener.java b/app/src/main/java/com/mango/moshen/base/list/OnItemChildClickListener.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/base/list/OnItemChildClickListener.java rename to app/src/main/java/com/mango/moshen/base/list/OnItemChildClickListener.java index 49ab74b26..590c75387 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/OnItemChildClickListener.java +++ b/app/src/main/java/com/mango/moshen/base/list/OnItemChildClickListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; /** * Created by lvzebiao on 2018/12/18. diff --git a/app/src/main/java/com/yizhuan/erban/base/list/OnItemClickListener.java b/app/src/main/java/com/mango/moshen/base/list/OnItemClickListener.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/base/list/OnItemClickListener.java rename to app/src/main/java/com/mango/moshen/base/list/OnItemClickListener.java index fa38f0667..eed6883aa 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/OnItemClickListener.java +++ b/app/src/main/java/com/mango/moshen/base/list/OnItemClickListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; /** * Created by lvzebiao on 2018/12/18. diff --git a/app/src/main/java/com/yizhuan/erban/base/list/RefreshRecyclerView.java b/app/src/main/java/com/mango/moshen/base/list/RefreshRecyclerView.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/base/list/RefreshRecyclerView.java rename to app/src/main/java/com/mango/moshen/base/list/RefreshRecyclerView.java index 0ceca4d88..81936e06d 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/RefreshRecyclerView.java +++ b/app/src/main/java/com/mango/moshen/base/list/RefreshRecyclerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; import android.content.Context; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/yizhuan/erban/base/list/WrapperAdapter.java b/app/src/main/java/com/mango/moshen/base/list/WrapperAdapter.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/base/list/WrapperAdapter.java rename to app/src/main/java/com/mango/moshen/base/list/WrapperAdapter.java index cea770e06..49a4d46d8 100644 --- a/app/src/main/java/com/yizhuan/erban/base/list/WrapperAdapter.java +++ b/app/src/main/java/com/mango/moshen/base/list/WrapperAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.base.list; +package com.mango.moshen.base.list; import android.content.Context; import androidx.recyclerview.widget.GridLayoutManager; @@ -9,7 +9,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillBaseActivity.java b/app/src/main/java/com/mango/moshen/bills/activities/BillBaseActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/bills/activities/BillBaseActivity.java rename to app/src/main/java/com/mango/moshen/bills/activities/BillBaseActivity.java index faa5a9c98..33c36c54b 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillBaseActivity.java +++ b/app/src/main/java/com/mango/moshen/bills/activities/BillBaseActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.activities; +package com.mango.moshen.bills.activities; import android.annotation.SuppressLint; import androidx.databinding.ViewDataBinding; @@ -11,13 +11,13 @@ import android.widget.TextView; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.jzxiang.pickerview.listener.OnDateSetListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.bills.adapter.BillBaseAdapter; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.bills.adapter.BillBaseAdapter; +import com.mango.moshen.common.NoDataFragment; +import com.mango.core.Constants; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java b/app/src/main/java/com/mango/moshen/bills/activities/BillGiftExpendActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java rename to app/src/main/java/com/mango/moshen/bills/activities/BillGiftExpendActivity.java index da5bc7731..993552920 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java +++ b/app/src/main/java/com/mango/moshen/bills/activities/BillGiftExpendActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.activities; +package com.mango.moshen.bills.activities; import android.annotation.SuppressLint; import android.content.Intent; @@ -6,21 +6,21 @@ import android.text.TextUtils; import android.view.View; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bills.adapter.GiftExpendAdapter; -import com.yizhuan.erban.databinding.ActivityBillsGiftBinding; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.bills.adapter.GiftExpendAdapter; +import com.mango.moshen.databinding.ActivityBillsGiftBinding; +import com.mango.moshen.ui.pay.ChargeActivity; +import com.mango.moshen.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.mango.core.Constants; +import com.mango.core.bills.BillModel; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.ExpendInfo; +import com.mango.core.bills.bean.ExpendListInfo; +import com.mango.core.pay.PayModel; +import com.mango.core.pay.bean.WalletInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftInComeActivity.java b/app/src/main/java/com/mango/moshen/bills/activities/BillGiftInComeActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftInComeActivity.java rename to app/src/main/java/com/mango/moshen/bills/activities/BillGiftInComeActivity.java index 621a03528..3278574e7 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftInComeActivity.java +++ b/app/src/main/java/com/mango/moshen/bills/activities/BillGiftInComeActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.activities; +package com.mango.moshen.bills.activities; import android.annotation.SuppressLint; import android.content.Intent; @@ -8,21 +8,21 @@ import android.widget.ImageView; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bills.adapter.GiftIncomeAdapter; -import com.yizhuan.erban.databinding.ActivityBillsGiftBinding; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.BillModel; -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.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.bills.adapter.GiftIncomeAdapter; +import com.mango.moshen.databinding.ActivityBillsGiftBinding; +import com.mango.moshen.ui.pay.ChargeActivity; +import com.mango.moshen.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.mango.core.Constants; +import com.mango.core.bills.BillModel; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.IncomeInfo; +import com.mango.core.bills.bean.IncomeListInfo; +import com.mango.core.pay.PayModel; +import com.mango.core.pay.bean.WalletInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftIncomeGroupActivity.java b/app/src/main/java/com/mango/moshen/bills/activities/BillGiftIncomeGroupActivity.java similarity index 77% rename from app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftIncomeGroupActivity.java rename to app/src/main/java/com/mango/moshen/bills/activities/BillGiftIncomeGroupActivity.java index 7e15117f1..c747cc5f5 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftIncomeGroupActivity.java +++ b/app/src/main/java/com/mango/moshen/bills/activities/BillGiftIncomeGroupActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.activities; +package com.mango.moshen.bills.activities; import android.content.Context; import android.content.Intent; @@ -9,27 +9,27 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bills.fragmemt.GiftIncomeFragment; -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.ISmoothToTopView; -import com.yizhuan.erban.bills.widget.BillGiftIncomeGroupNavigatorAdapter; -import com.yizhuan.erban.ui.pay.ChargeActivity; -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_library.base.factory.CreatePresenter; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.RoomContributeListAdapter; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.bills.fragmemt.GiftIncomeFragment; +import com.mango.moshen.bills.fragmemt.GiftOutputFragment; +import com.mango.moshen.bills.fragmemt.RadishGiftFragment; +import com.mango.moshen.bills.presenter.BillGiftIncomeGroupPresenter; +import com.mango.moshen.bills.view.IBillGiftIncomeGroupView; +import com.mango.moshen.bills.view.ISmoothToTopView; +import com.mango.moshen.bills.widget.BillGiftIncomeGroupNavigatorAdapter; +import com.mango.moshen.ui.pay.ChargeActivity; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.xchat_android_library.base.factory.CreatePresenter; import java.util.ArrayList; -import static com.yizhuan.erban.bills.fragmemt.RadishGiftFragment.TYPE_RADISH_EXPAND; -import static com.yizhuan.erban.bills.fragmemt.RadishGiftFragment.TYPE_RADISH_INCOME; +import static com.mango.moshen.bills.fragmemt.RadishGiftFragment.TYPE_RADISH_EXPAND; +import static com.mango.moshen.bills.fragmemt.RadishGiftFragment.TYPE_RADISH_INCOME; @CreatePresenter(BillGiftIncomeGroupPresenter.class) public class BillGiftIncomeGroupActivity extends BaseMvpActivity diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillNobleActivity.java b/app/src/main/java/com/mango/moshen/bills/activities/BillNobleActivity.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/bills/activities/BillNobleActivity.java rename to app/src/main/java/com/mango/moshen/bills/activities/BillNobleActivity.java index 2f17ab9fb..a5cda1715 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillNobleActivity.java +++ b/app/src/main/java/com/mango/moshen/bills/activities/BillNobleActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.activities; +package com.mango.moshen.bills.activities; import android.annotation.SuppressLint; import android.os.Bundle; @@ -6,16 +6,16 @@ import android.text.TextUtils; import android.view.View; import android.widget.ImageView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bills.adapter.NobleBillAdapter; -import com.yizhuan.erban.databinding.ActivityBillsBinding; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.NobleBillListInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.bills.adapter.NobleBillAdapter; +import com.mango.moshen.databinding.ActivityBillsBinding; +import com.mango.moshen.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.mango.core.Constants; +import com.mango.core.bills.BillModel; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.NobleBillListInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/ChargeBillsActivity.java b/app/src/main/java/com/mango/moshen/bills/activities/ChargeBillsActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/bills/activities/ChargeBillsActivity.java rename to app/src/main/java/com/mango/moshen/bills/activities/ChargeBillsActivity.java index 48c355bb0..0addce188 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/ChargeBillsActivity.java +++ b/app/src/main/java/com/mango/moshen/bills/activities/ChargeBillsActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.activities; +package com.mango.moshen.bills.activities; import android.annotation.SuppressLint; import android.content.Intent; @@ -8,20 +8,20 @@ import android.view.View; import android.widget.ImageView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bills.adapter.ChargeBillsAdapter; -import com.yizhuan.erban.databinding.ActivityBillsBinding; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.bills.adapter.ChargeBillsAdapter; +import com.mango.moshen.databinding.ActivityBillsBinding; +import com.mango.moshen.ui.pay.ChargeActivity; +import com.mango.moshen.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.Constants; +import com.mango.core.bills.BillModel; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.ExpendInfo; +import com.mango.core.bills.bean.ExpendListInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/ChatBillsActivity.java b/app/src/main/java/com/mango/moshen/bills/activities/ChatBillsActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/bills/activities/ChatBillsActivity.java rename to app/src/main/java/com/mango/moshen/bills/activities/ChatBillsActivity.java index 849dcbc32..58973fa81 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/ChatBillsActivity.java +++ b/app/src/main/java/com/mango/moshen/bills/activities/ChatBillsActivity.java @@ -1,24 +1,23 @@ -package com.yizhuan.erban.bills.activities; +package com.mango.moshen.bills.activities; import android.annotation.SuppressLint; import android.os.Bundle; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; -import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bills.adapter.ChatBillsAdapter; -import com.yizhuan.erban.databinding.ActivityBillsBinding; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.BillModel; -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_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.bills.adapter.ChatBillsAdapter; +import com.mango.moshen.databinding.ActivityBillsBinding; +import com.mango.moshen.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.mango.core.Constants; +import com.mango.core.bills.BillModel; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.IncomeInfo; +import com.mango.core.bills.bean.IncomeListInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java b/app/src/main/java/com/mango/moshen/bills/activities/RedBagBillsActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java rename to app/src/main/java/com/mango/moshen/bills/activities/RedBagBillsActivity.java index 242433c9b..b8a8c48c7 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java +++ b/app/src/main/java/com/mango/moshen/bills/activities/RedBagBillsActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.activities; +package com.mango.moshen.bills.activities; import android.annotation.SuppressLint; import android.content.Intent; @@ -7,19 +7,19 @@ import android.text.TextUtils; import android.view.View; import android.widget.ImageView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bills.adapter.RedBagBillsAdapter; -import com.yizhuan.erban.databinding.ActivityBillsBinding; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RedBagInfo; -import com.yizhuan.xchat_android_core.bills.bean.RedBagListInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.bills.adapter.RedBagBillsAdapter; +import com.mango.moshen.databinding.ActivityBillsBinding; +import com.mango.moshen.ui.pay.ChargeActivity; +import com.mango.moshen.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.mango.core.Constants; +import com.mango.core.bills.BillModel; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.RedBagInfo; +import com.mango.core.bills.bean.RedBagListInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/TotalBillsActivity.java b/app/src/main/java/com/mango/moshen/bills/activities/TotalBillsActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/bills/activities/TotalBillsActivity.java rename to app/src/main/java/com/mango/moshen/bills/activities/TotalBillsActivity.java index 98854da58..5e487d9cd 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/TotalBillsActivity.java +++ b/app/src/main/java/com/mango/moshen/bills/activities/TotalBillsActivity.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.bills.activities; +package com.mango.moshen.bills.activities; import android.content.Intent; import android.os.Bundle; import android.view.View; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.bills.widget.BillItemView; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.bills.widget.BillItemView; /** * @author Administrator diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java b/app/src/main/java/com/mango/moshen/bills/activities/WithdrawBillsActivity.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java rename to app/src/main/java/com/mango/moshen/bills/activities/WithdrawBillsActivity.java index 2288c804e..1f4858018 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java +++ b/app/src/main/java/com/mango/moshen/bills/activities/WithdrawBillsActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.activities; +package com.mango.moshen.bills.activities; import android.content.Intent; import android.util.SparseLongArray; @@ -10,16 +10,16 @@ import android.widget.TextView; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.jzxiang.pickerview.listener.OnDateSetListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bills.event.DateInfoEvent; -import com.yizhuan.erban.bills.event.TopEvent; -import com.yizhuan.erban.bills.fragmemt.WithdrawBillsFragment; -import com.yizhuan.erban.databinding.ActivityWithdrawBillsBinding; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.bills.event.DateInfoEvent; +import com.mango.moshen.bills.event.TopEvent; +import com.mango.moshen.bills.fragmemt.WithdrawBillsFragment; +import com.mango.moshen.databinding.ActivityWithdrawBillsBinding; +import com.mango.moshen.ui.pay.ChargeActivity; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.TimeUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/BillBaseAdapter.java b/app/src/main/java/com/mango/moshen/bills/adapter/BillBaseAdapter.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/bills/adapter/BillBaseAdapter.java rename to app/src/main/java/com/mango/moshen/bills/adapter/BillBaseAdapter.java index b862349ae..b4187e37e 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/BillBaseAdapter.java +++ b/app/src/main/java/com/mango/moshen/bills/adapter/BillBaseAdapter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.bills.adapter; +package com.mango.moshen.bills.adapter; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/ChargeBillsAdapter.java b/app/src/main/java/com/mango/moshen/bills/adapter/ChargeBillsAdapter.java similarity index 78% rename from app/src/main/java/com/yizhuan/erban/bills/adapter/ChargeBillsAdapter.java rename to app/src/main/java/com/mango/moshen/bills/adapter/ChargeBillsAdapter.java index 00454a375..731b46bb4 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/ChargeBillsAdapter.java +++ b/app/src/main/java/com/mango/moshen/bills/adapter/ChargeBillsAdapter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.bills.adapter; +package com.mango.moshen.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.ExpendInfo; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/ChatBillsAdapter.java b/app/src/main/java/com/mango/moshen/bills/adapter/ChatBillsAdapter.java similarity index 81% rename from app/src/main/java/com/yizhuan/erban/bills/adapter/ChatBillsAdapter.java rename to app/src/main/java/com/mango/moshen/bills/adapter/ChatBillsAdapter.java index e5b8c0b71..0adf848c2 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/ChatBillsAdapter.java +++ b/app/src/main/java/com/mango/moshen/bills/adapter/ChatBillsAdapter.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.bills.adapter; +package com.mango.moshen.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.IncomeInfo; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/GiftExpendAdapter.java b/app/src/main/java/com/mango/moshen/bills/adapter/GiftExpendAdapter.java similarity index 80% rename from app/src/main/java/com/yizhuan/erban/bills/adapter/GiftExpendAdapter.java rename to app/src/main/java/com/mango/moshen/bills/adapter/GiftExpendAdapter.java index 485fc20dc..f6178377f 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/GiftExpendAdapter.java +++ b/app/src/main/java/com/mango/moshen/bills/adapter/GiftExpendAdapter.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.bills.adapter; +package com.mango.moshen.bills.adapter; import android.widget.ImageView; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.ExpendInfo; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/GiftIncomeAdapter.java b/app/src/main/java/com/mango/moshen/bills/adapter/GiftIncomeAdapter.java similarity index 80% rename from app/src/main/java/com/yizhuan/erban/bills/adapter/GiftIncomeAdapter.java rename to app/src/main/java/com/mango/moshen/bills/adapter/GiftIncomeAdapter.java index f0ae06e6d..834e5e7aa 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/GiftIncomeAdapter.java +++ b/app/src/main/java/com/mango/moshen/bills/adapter/GiftIncomeAdapter.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.bills.adapter; +package com.mango.moshen.bills.adapter; import android.widget.ImageView; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.IncomeInfo; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/NobleBillAdapter.java b/app/src/main/java/com/mango/moshen/bills/adapter/NobleBillAdapter.java similarity index 77% rename from app/src/main/java/com/yizhuan/erban/bills/adapter/NobleBillAdapter.java rename to app/src/main/java/com/mango/moshen/bills/adapter/NobleBillAdapter.java index 131058427..6db130e71 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/NobleBillAdapter.java +++ b/app/src/main/java/com/mango/moshen/bills/adapter/NobleBillAdapter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.bills.adapter; +package com.mango.moshen.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.NobleBillListInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.NobleBillListInfo; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/RadishGiftAdapter.java b/app/src/main/java/com/mango/moshen/bills/adapter/RadishGiftAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/bills/adapter/RadishGiftAdapter.java rename to app/src/main/java/com/mango/moshen/bills/adapter/RadishGiftAdapter.java index 72e5a8044..f109949d6 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/RadishGiftAdapter.java +++ b/app/src/main/java/com/mango/moshen/bills/adapter/RadishGiftAdapter.java @@ -1,16 +1,16 @@ -package com.yizhuan.erban.bills.adapter; +package com.mango.moshen.bills.adapter; import androidx.core.content.ContextCompat; import android.widget.ImageView; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bills.fragmemt.RadishGiftFragment; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.moshen.bills.fragmemt.RadishGiftFragment; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.RadishGiftInfo; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/RedBagBillsAdapter.java b/app/src/main/java/com/mango/moshen/bills/adapter/RedBagBillsAdapter.java similarity index 77% rename from app/src/main/java/com/yizhuan/erban/bills/adapter/RedBagBillsAdapter.java rename to app/src/main/java/com/mango/moshen/bills/adapter/RedBagBillsAdapter.java index 7c18be716..945dabc45 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/RedBagBillsAdapter.java +++ b/app/src/main/java/com/mango/moshen/bills/adapter/RedBagBillsAdapter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.bills.adapter; +package com.mango.moshen.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RedBagInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.RedBagInfo; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsAdapter.java b/app/src/main/java/com/mango/moshen/bills/adapter/WithdrawBillsAdapter.java similarity index 78% rename from app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsAdapter.java rename to app/src/main/java/com/mango/moshen/bills/adapter/WithdrawBillsAdapter.java index 414de613f..4ff74a9d4 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsAdapter.java +++ b/app/src/main/java/com/mango/moshen/bills/adapter/WithdrawBillsAdapter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.bills.adapter; +package com.mango.moshen.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.IncomeInfo; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsIndicatorAdapter.java b/app/src/main/java/com/mango/moshen/bills/adapter/WithdrawBillsIndicatorAdapter.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsIndicatorAdapter.java rename to app/src/main/java/com/mango/moshen/bills/adapter/WithdrawBillsIndicatorAdapter.java index 082ae43a4..cb4b933b9 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsIndicatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/bills/adapter/WithdrawBillsIndicatorAdapter.java @@ -1,15 +1,15 @@ -package com.yizhuan.erban.bills.adapter; +package com.mango.moshen.bills.adapter; import android.content.Context; import androidx.appcompat.widget.AppCompatTextView; import android.view.Gravity; import android.view.View; -import com.yizhuan.erban.R; -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.marqueeview.Utils; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.marqueeview.Utils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawRedBillsAdapter.java b/app/src/main/java/com/mango/moshen/bills/adapter/WithdrawRedBillsAdapter.java similarity index 78% rename from app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawRedBillsAdapter.java rename to app/src/main/java/com/mango/moshen/bills/adapter/WithdrawRedBillsAdapter.java index 2f5a85570..db2d3801a 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawRedBillsAdapter.java +++ b/app/src/main/java/com/mango/moshen/bills/adapter/WithdrawRedBillsAdapter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.bills.adapter; +package com.mango.moshen.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RedBagInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.RedBagInfo; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/event/DateInfoEvent.java b/app/src/main/java/com/mango/moshen/bills/event/DateInfoEvent.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/bills/event/DateInfoEvent.java rename to app/src/main/java/com/mango/moshen/bills/event/DateInfoEvent.java index 7328c9dc5..ad42d8f99 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/event/DateInfoEvent.java +++ b/app/src/main/java/com/mango/moshen/bills/event/DateInfoEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.event; +package com.mango.moshen.bills.event; /** *

事件日期

diff --git a/app/src/main/java/com/yizhuan/erban/bills/event/TopEvent.java b/app/src/main/java/com/mango/moshen/bills/event/TopEvent.java similarity index 76% rename from app/src/main/java/com/yizhuan/erban/bills/event/TopEvent.java rename to app/src/main/java/com/mango/moshen/bills/event/TopEvent.java index a51eaeca6..cef2bb15e 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/event/TopEvent.java +++ b/app/src/main/java/com/mango/moshen/bills/event/TopEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.event; +package com.mango.moshen.bills.event; public class TopEvent { diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/BaseBillsFragment.java b/app/src/main/java/com/mango/moshen/bills/fragmemt/BaseBillsFragment.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/bills/fragmemt/BaseBillsFragment.java rename to app/src/main/java/com/mango/moshen/bills/fragmemt/BaseBillsFragment.java index d5493c79c..af982ac70 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/BaseBillsFragment.java +++ b/app/src/main/java/com/mango/moshen/bills/fragmemt/BaseBillsFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.fragmemt; +package com.mango.moshen.bills.fragmemt; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.recyclerview.widget.RecyclerView; @@ -9,14 +9,14 @@ import android.widget.TextView; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.jzxiang.pickerview.listener.OnDateSetListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.radish.RadishModel; -import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.core.Constants; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.radish.RadishModel; +import com.mango.xchat_android_library.base.factory.AbstractMvpPresenter; +import com.mango.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftIncomeFragment.java b/app/src/main/java/com/mango/moshen/bills/fragmemt/GiftIncomeFragment.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftIncomeFragment.java rename to app/src/main/java/com/mango/moshen/bills/fragmemt/GiftIncomeFragment.java index 6e148c64e..dc993c8dd 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftIncomeFragment.java +++ b/app/src/main/java/com/mango/moshen/bills/fragmemt/GiftIncomeFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.fragmemt; +package com.mango.moshen.bills.fragmemt; import android.annotation.SuppressLint; import androidx.fragment.app.Fragment; @@ -6,19 +6,19 @@ import android.text.TextUtils; import android.view.View; 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.GiftIncomeAdapter; -import com.yizhuan.erban.bills.presenter.GiftIncomePresenter; -import com.yizhuan.erban.bills.view.IGiftIncomeView; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_constants.XChatConstants; -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_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.bills.adapter.BillBaseAdapter; +import com.mango.moshen.bills.adapter.GiftIncomeAdapter; +import com.mango.moshen.bills.presenter.GiftIncomePresenter; +import com.mango.moshen.bills.view.IGiftIncomeView; +import com.mango.moshen.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.Constants; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.IncomeInfo; +import com.mango.core.bills.bean.IncomeListInfo; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftOutputFragment.java b/app/src/main/java/com/mango/moshen/bills/fragmemt/GiftOutputFragment.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftOutputFragment.java rename to app/src/main/java/com/mango/moshen/bills/fragmemt/GiftOutputFragment.java index 079c06f0b..5b719cf7a 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftOutputFragment.java +++ b/app/src/main/java/com/mango/moshen/bills/fragmemt/GiftOutputFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.fragmemt; +package com.mango.moshen.bills.fragmemt; import android.annotation.SuppressLint; import androidx.fragment.app.Fragment; @@ -6,19 +6,19 @@ import android.text.TextUtils; import android.view.View; 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.GiftOutputPresenter; -import com.yizhuan.erban.bills.view.IGiftOutputView; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.bills.adapter.BillBaseAdapter; +import com.mango.moshen.bills.adapter.GiftExpendAdapter; +import com.mango.moshen.bills.presenter.GiftOutputPresenter; +import com.mango.moshen.bills.view.IGiftOutputView; +import com.mango.moshen.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.Constants; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.ExpendInfo; +import com.mango.core.bills.bean.ExpendListInfo; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/RadishGiftFragment.java b/app/src/main/java/com/mango/moshen/bills/fragmemt/RadishGiftFragment.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/bills/fragmemt/RadishGiftFragment.java rename to app/src/main/java/com/mango/moshen/bills/fragmemt/RadishGiftFragment.java index 3a2ffb716..4546e6821 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/RadishGiftFragment.java +++ b/app/src/main/java/com/mango/moshen/bills/fragmemt/RadishGiftFragment.java @@ -1,22 +1,22 @@ -package com.yizhuan.erban.bills.fragmemt; +package com.mango.moshen.bills.fragmemt; import android.os.Bundle; import androidx.fragment.app.Fragment; import android.text.TextUtils; 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.RadishGiftAdapter; -import com.yizhuan.erban.bills.presenter.RadishGiftPresenter; -import com.yizhuan.erban.bills.view.IRadishGiftView; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftInfo; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftListInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.bills.adapter.BillBaseAdapter; +import com.mango.moshen.bills.adapter.RadishGiftAdapter; +import com.mango.moshen.bills.presenter.RadishGiftPresenter; +import com.mango.moshen.bills.view.IRadishGiftView; +import com.mango.moshen.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.mango.core.Constants; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.RadishGiftInfo; +import com.mango.core.bills.bean.RadishGiftListInfo; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/WithdrawBillsFragment.java b/app/src/main/java/com/mango/moshen/bills/fragmemt/WithdrawBillsFragment.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/bills/fragmemt/WithdrawBillsFragment.java rename to app/src/main/java/com/mango/moshen/bills/fragmemt/WithdrawBillsFragment.java index 7e13c891f..54c1b4a00 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/WithdrawBillsFragment.java +++ b/app/src/main/java/com/mango/moshen/bills/fragmemt/WithdrawBillsFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.fragmemt; +package com.mango.moshen.bills.fragmemt; import android.annotation.SuppressLint; import android.content.Context; @@ -10,22 +10,22 @@ import android.text.TextUtils; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingFragment; -import com.yizhuan.erban.bills.adapter.WithdrawBillsAdapter; -import com.yizhuan.erban.bills.event.DateInfoEvent; -import com.yizhuan.erban.bills.event.TopEvent; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.databinding.FragmentXrexylerviewBinding; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.BillModel; -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_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingFragment; +import com.mango.moshen.bills.adapter.WithdrawBillsAdapter; +import com.mango.moshen.bills.event.DateInfoEvent; +import com.mango.moshen.bills.event.TopEvent; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.databinding.FragmentXrexylerviewBinding; +import com.mango.moshen.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.Constants; +import com.mango.core.bills.BillModel; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.IncomeInfo; +import com.mango.core.bills.bean.IncomeListInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/mango/moshen/bills/presenter/BillGiftIncomeGroupPresenter.java b/app/src/main/java/com/mango/moshen/bills/presenter/BillGiftIncomeGroupPresenter.java new file mode 100644 index 000000000..74562bdd8 --- /dev/null +++ b/app/src/main/java/com/mango/moshen/bills/presenter/BillGiftIncomeGroupPresenter.java @@ -0,0 +1,7 @@ +package com.mango.moshen.bills.presenter; + +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.bills.view.IBillGiftIncomeGroupView; + +public class BillGiftIncomeGroupPresenter extends BaseMvpPresenter { +} diff --git a/app/src/main/java/com/yizhuan/erban/bills/presenter/GiftIncomePresenter.java b/app/src/main/java/com/mango/moshen/bills/presenter/GiftIncomePresenter.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/bills/presenter/GiftIncomePresenter.java rename to app/src/main/java/com/mango/moshen/bills/presenter/GiftIncomePresenter.java index 92539eb99..fea4e14d0 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/presenter/GiftIncomePresenter.java +++ b/app/src/main/java/com/mango/moshen/bills/presenter/GiftIncomePresenter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.bills.presenter; +package com.mango.moshen.bills.presenter; import android.annotation.SuppressLint; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.bills.view.IGiftIncomeView; -import com.yizhuan.xchat_android_core.bills.BillModel; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.bills.view.IGiftIncomeView; +import com.mango.core.bills.BillModel; public class GiftIncomePresenter extends BaseMvpPresenter { diff --git a/app/src/main/java/com/yizhuan/erban/bills/presenter/GiftOutputPresenter.java b/app/src/main/java/com/mango/moshen/bills/presenter/GiftOutputPresenter.java similarity index 81% rename from app/src/main/java/com/yizhuan/erban/bills/presenter/GiftOutputPresenter.java rename to app/src/main/java/com/mango/moshen/bills/presenter/GiftOutputPresenter.java index 1b237ff8e..6b25b4b46 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/presenter/GiftOutputPresenter.java +++ b/app/src/main/java/com/mango/moshen/bills/presenter/GiftOutputPresenter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.bills.presenter; +package com.mango.moshen.bills.presenter; import android.annotation.SuppressLint; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.bills.view.IGiftOutputView; -import com.yizhuan.xchat_android_core.bills.BillModel; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.bills.view.IGiftOutputView; +import com.mango.core.bills.BillModel; public class GiftOutputPresenter extends BaseMvpPresenter { diff --git a/app/src/main/java/com/yizhuan/erban/bills/presenter/RadishGiftPresenter.java b/app/src/main/java/com/mango/moshen/bills/presenter/RadishGiftPresenter.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/bills/presenter/RadishGiftPresenter.java rename to app/src/main/java/com/mango/moshen/bills/presenter/RadishGiftPresenter.java index 798461aeb..1f97f706f 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/presenter/RadishGiftPresenter.java +++ b/app/src/main/java/com/mango/moshen/bills/presenter/RadishGiftPresenter.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.bills.presenter; +package com.mango.moshen.bills.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.bills.view.IRadishGiftView; -import com.yizhuan.xchat_android_core.bills.RadishGiftModel; -import com.yizhuan.xchat_android_core.bills.result.RadishGiftResult; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.bills.view.IRadishGiftView; +import com.mango.core.bills.RadishGiftModel; +import com.mango.core.bills.result.RadishGiftResult; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/mango/moshen/bills/view/IBillGiftIncomeGroupView.java b/app/src/main/java/com/mango/moshen/bills/view/IBillGiftIncomeGroupView.java new file mode 100644 index 000000000..299296efd --- /dev/null +++ b/app/src/main/java/com/mango/moshen/bills/view/IBillGiftIncomeGroupView.java @@ -0,0 +1,6 @@ +package com.mango.moshen.bills.view; + +import com.mango.xchat_android_library.base.IMvpBaseView; + +public interface IBillGiftIncomeGroupView extends IMvpBaseView { +} diff --git a/app/src/main/java/com/mango/moshen/bills/view/IGiftIncomeView.java b/app/src/main/java/com/mango/moshen/bills/view/IGiftIncomeView.java new file mode 100644 index 000000000..2d0cbea8e --- /dev/null +++ b/app/src/main/java/com/mango/moshen/bills/view/IGiftIncomeView.java @@ -0,0 +1,8 @@ +package com.mango.moshen.bills.view; + +import com.mango.core.bills.bean.IncomeListInfo; + +public interface IGiftIncomeView extends ISmoothToTopView { + void onGetDataError(String message); + void onGetIncomeBills(IncomeListInfo data); +} diff --git a/app/src/main/java/com/yizhuan/erban/bills/view/IGiftOutputView.java b/app/src/main/java/com/mango/moshen/bills/view/IGiftOutputView.java similarity index 52% rename from app/src/main/java/com/yizhuan/erban/bills/view/IGiftOutputView.java rename to app/src/main/java/com/mango/moshen/bills/view/IGiftOutputView.java index 74916330b..de8554a77 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/view/IGiftOutputView.java +++ b/app/src/main/java/com/mango/moshen/bills/view/IGiftOutputView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.bills.view; +package com.mango.moshen.bills.view; -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.bills.bean.ExpendListInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; public interface IGiftOutputView extends IMvpBaseView { void smoothScrollToTop(); diff --git a/app/src/main/java/com/yizhuan/erban/bills/view/IRadishGiftView.java b/app/src/main/java/com/mango/moshen/bills/view/IRadishGiftView.java similarity index 50% rename from app/src/main/java/com/yizhuan/erban/bills/view/IRadishGiftView.java rename to app/src/main/java/com/mango/moshen/bills/view/IRadishGiftView.java index 42edbe5e1..19e752eee 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/view/IRadishGiftView.java +++ b/app/src/main/java/com/mango/moshen/bills/view/IRadishGiftView.java @@ -1,7 +1,6 @@ -package com.yizhuan.erban.bills.view; +package com.mango.moshen.bills.view; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftListInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.bills.bean.RadishGiftListInfo; public interface IRadishGiftView extends ISmoothToTopView { void getRadishRecordSuccess(RadishGiftListInfo list); diff --git a/app/src/main/java/com/mango/moshen/bills/view/ISmoothToTopView.java b/app/src/main/java/com/mango/moshen/bills/view/ISmoothToTopView.java new file mode 100644 index 000000000..b4532ec0a --- /dev/null +++ b/app/src/main/java/com/mango/moshen/bills/view/ISmoothToTopView.java @@ -0,0 +1,7 @@ +package com.mango.moshen.bills.view; + +import com.mango.xchat_android_library.base.IMvpBaseView; + +public interface ISmoothToTopView extends IMvpBaseView { + void smoothScrollToTop(); +} diff --git a/app/src/main/java/com/yizhuan/erban/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java b/app/src/main/java/com/mango/moshen/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java similarity index 77% rename from app/src/main/java/com/yizhuan/erban/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java rename to app/src/main/java/com/mango/moshen/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java index 66a7c7220..05c0789d7 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.widget; +package com.mango.moshen.bills.widget; import android.content.Context; @@ -6,14 +6,14 @@ import androidx.core.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.widget.RankNavigatorAdapter; -import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -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.mango.moshen.R; +import com.mango.moshen.avroom.widget.RankNavigatorAdapter; +import com.mango.moshen.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/bills/widget/BillItemView.java b/app/src/main/java/com/mango/moshen/bills/widget/BillItemView.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/bills/widget/BillItemView.java rename to app/src/main/java/com/mango/moshen/bills/widget/BillItemView.java index 20ac4508d..a0fb20f28 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/widget/BillItemView.java +++ b/app/src/main/java/com/mango/moshen/bills/widget/BillItemView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bills.widget; +package com.mango.moshen.bills.widget; import android.content.Context; import android.content.res.TypedArray; @@ -9,7 +9,7 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** *

账单item

diff --git a/app/src/main/java/com/yizhuan/erban/bindadapter/BaseAdapter.java b/app/src/main/java/com/mango/moshen/bindadapter/BaseAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/bindadapter/BaseAdapter.java rename to app/src/main/java/com/mango/moshen/bindadapter/BaseAdapter.java index ed77488b0..d55e1968b 100644 --- a/app/src/main/java/com/yizhuan/erban/bindadapter/BaseAdapter.java +++ b/app/src/main/java/com/mango/moshen/bindadapter/BaseAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bindadapter; +package com.mango.moshen.bindadapter; import androidx.databinding.DataBindingUtil; import androidx.databinding.ViewDataBinding; @@ -8,7 +8,7 @@ import android.view.View; import android.view.ViewGroup; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** diff --git a/app/src/main/java/com/yizhuan/erban/bindadapter/BindingViewHolder.java b/app/src/main/java/com/mango/moshen/bindadapter/BindingViewHolder.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/bindadapter/BindingViewHolder.java rename to app/src/main/java/com/mango/moshen/bindadapter/BindingViewHolder.java index 84532da32..e7fb9f1fe 100644 --- a/app/src/main/java/com/yizhuan/erban/bindadapter/BindingViewHolder.java +++ b/app/src/main/java/com/mango/moshen/bindadapter/BindingViewHolder.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.bindadapter; +package com.mango.moshen.bindadapter; import androidx.databinding.ViewDataBinding; import android.view.View; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * Created by fwhm on 2017/3/28. diff --git a/app/src/main/java/com/yizhuan/erban/bindadapter/RvAdapter.java b/app/src/main/java/com/mango/moshen/bindadapter/RvAdapter.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/bindadapter/RvAdapter.java rename to app/src/main/java/com/mango/moshen/bindadapter/RvAdapter.java index 67a3a9d4d..873459c1b 100644 --- a/app/src/main/java/com/yizhuan/erban/bindadapter/RvAdapter.java +++ b/app/src/main/java/com/mango/moshen/bindadapter/RvAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bindadapter; +package com.mango.moshen.bindadapter; import androidx.databinding.BindingAdapter; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; diff --git a/app/src/main/java/com/yizhuan/erban/bindadapter/ViewAdapter.java b/app/src/main/java/com/mango/moshen/bindadapter/ViewAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/bindadapter/ViewAdapter.java rename to app/src/main/java/com/mango/moshen/bindadapter/ViewAdapter.java index e232a7ad8..fe24d6cd4 100644 --- a/app/src/main/java/com/yizhuan/erban/bindadapter/ViewAdapter.java +++ b/app/src/main/java/com/mango/moshen/bindadapter/ViewAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.bindadapter; +package com.mango.moshen.bindadapter; import androidx.databinding.BindingAdapter; @@ -19,13 +19,13 @@ 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.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.utils.StarUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.xchat_android_library.widget.IOSSwitchView; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.utils.StarUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.Date; diff --git a/app/src/main/java/com/yizhuan/erban/common/AbsStatusFragment.java b/app/src/main/java/com/mango/moshen/common/AbsStatusFragment.java similarity index 80% rename from app/src/main/java/com/yizhuan/erban/common/AbsStatusFragment.java rename to app/src/main/java/com/mango/moshen/common/AbsStatusFragment.java index 993215b3c..dcd0fb323 100644 --- a/app/src/main/java/com/yizhuan/erban/common/AbsStatusFragment.java +++ b/app/src/main/java/com/mango/moshen/common/AbsStatusFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common; +package com.mango.moshen.common; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -6,9 +6,9 @@ import androidx.fragment.app.Fragment; import android.view.View; import android.widget.Toast; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.erban.R; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.R; /** * Created by xujiexing on 14-7-21. diff --git a/app/src/main/java/com/yizhuan/erban/common/EmptyViewHelper.java b/app/src/main/java/com/mango/moshen/common/EmptyViewHelper.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/common/EmptyViewHelper.java rename to app/src/main/java/com/mango/moshen/common/EmptyViewHelper.java index 88768d946..45c3f4d90 100644 --- a/app/src/main/java/com/yizhuan/erban/common/EmptyViewHelper.java +++ b/app/src/main/java/com/mango/moshen/common/EmptyViewHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common; +package com.mango.moshen.common; import android.content.Context; import android.view.LayoutInflater; @@ -7,8 +7,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.NetworkUtils; public class EmptyViewHelper { diff --git a/app/src/main/java/com/yizhuan/erban/common/IStatusFragment.java b/app/src/main/java/com/mango/moshen/common/IStatusFragment.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/common/IStatusFragment.java rename to app/src/main/java/com/mango/moshen/common/IStatusFragment.java index ccce09253..9ad146c8e 100644 --- a/app/src/main/java/com/yizhuan/erban/common/IStatusFragment.java +++ b/app/src/main/java/com/mango/moshen/common/IStatusFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common; +package com.mango.moshen.common; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/common/LoadingFragment.java b/app/src/main/java/com/mango/moshen/common/LoadingFragment.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/common/LoadingFragment.java rename to app/src/main/java/com/mango/moshen/common/LoadingFragment.java index 027f39de1..032eba24a 100644 --- a/app/src/main/java/com/yizhuan/erban/common/LoadingFragment.java +++ b/app/src/main/java/com/mango/moshen/common/LoadingFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common; +package com.mango.moshen.common; import android.os.Bundle; import android.view.LayoutInflater; @@ -7,7 +7,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** diff --git a/app/src/main/java/com/yizhuan/erban/common/NetworkErrorFragment.java b/app/src/main/java/com/mango/moshen/common/NetworkErrorFragment.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/common/NetworkErrorFragment.java rename to app/src/main/java/com/mango/moshen/common/NetworkErrorFragment.java index 1b2dcea64..acd8b24c1 100644 --- a/app/src/main/java/com/yizhuan/erban/common/NetworkErrorFragment.java +++ b/app/src/main/java/com/mango/moshen/common/NetworkErrorFragment.java @@ -1,15 +1,14 @@ -package com.yizhuan.erban.common; +package com.mango.moshen.common; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.erban.R; +import com.mango.xchat_android_library.utils.NetworkUtils; +import com.mango.moshen.R; -import static com.yizhuan.erban.common.NoDataFragment.LAYOUTID_PARAM; +import static com.mango.moshen.common.NoDataFragment.LAYOUTID_PARAM; /** * Created by xujiexing on 14-4-9. diff --git a/app/src/main/java/com/yizhuan/erban/common/NoDataFragment.java b/app/src/main/java/com/mango/moshen/common/NoDataFragment.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/common/NoDataFragment.java rename to app/src/main/java/com/mango/moshen/common/NoDataFragment.java index d73ca4733..1106c16f7 100644 --- a/app/src/main/java/com/yizhuan/erban/common/NoDataFragment.java +++ b/app/src/main/java/com/mango/moshen/common/NoDataFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common; +package com.mango.moshen.common; import android.os.Bundle; import android.view.LayoutInflater; @@ -7,7 +7,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** diff --git a/app/src/main/java/com/yizhuan/erban/common/ReloadFragment.java b/app/src/main/java/com/mango/moshen/common/ReloadFragment.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/common/ReloadFragment.java rename to app/src/main/java/com/mango/moshen/common/ReloadFragment.java index e45230d38..262181e9b 100644 --- a/app/src/main/java/com/yizhuan/erban/common/ReloadFragment.java +++ b/app/src/main/java/com/mango/moshen/common/ReloadFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common; +package com.mango.moshen.common; import android.annotation.TargetApi; import android.os.Build; @@ -10,9 +10,9 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; -import com.yizhuan.erban.R; +import com.mango.xchat_android_library.utils.NetworkUtils; +import com.mango.xchat_android_library.utils.log.MLog; +import com.mango.moshen.R; /** * Created by xujiexing on 14-4-9. diff --git a/app/src/main/java/com/yizhuan/erban/common/ViewPagerAdapter.java b/app/src/main/java/com/mango/moshen/common/ViewPagerAdapter.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/common/ViewPagerAdapter.java rename to app/src/main/java/com/mango/moshen/common/ViewPagerAdapter.java index ffb349551..6e1db4952 100644 --- a/app/src/main/java/com/yizhuan/erban/common/ViewPagerAdapter.java +++ b/app/src/main/java/com/mango/moshen/common/ViewPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common; +package com.mango.moshen.common; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; diff --git a/app/src/main/java/com/yizhuan/erban/common/permission/EasyPermissions.java b/app/src/main/java/com/mango/moshen/common/permission/EasyPermissions.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/common/permission/EasyPermissions.java rename to app/src/main/java/com/mango/moshen/common/permission/EasyPermissions.java index 893f39f99..9fedfa76b 100644 --- a/app/src/main/java/com/yizhuan/erban/common/permission/EasyPermissions.java +++ b/app/src/main/java/com/mango/moshen/common/permission/EasyPermissions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.erban.common.permission; +package com.mango.moshen.common.permission; import android.annotation.TargetApi; import android.app.Activity; @@ -32,7 +32,7 @@ import androidx.fragment.app.Fragment; import androidx.core.content.ContextCompat; import androidx.appcompat.app.AlertDialog; -import com.yizhuan.erban.common.widget.dialog.BaseAlertDialogBuilder; +import com.mango.moshen.common.widget.dialog.BaseAlertDialogBuilder; 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/mango/moshen/common/permission/PermissionActivity.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/common/permission/PermissionActivity.java rename to app/src/main/java/com/mango/moshen/common/permission/PermissionActivity.java index 2cfcfe31b..c7641e10e 100644 --- a/app/src/main/java/com/yizhuan/erban/common/permission/PermissionActivity.java +++ b/app/src/main/java/com/mango/moshen/common/permission/PermissionActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.permission; +package com.mango.moshen.common.permission; import android.content.Intent; @@ -8,7 +8,7 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/common/permission/StatusBarCompat.java b/app/src/main/java/com/mango/moshen/common/permission/StatusBarCompat.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/common/permission/StatusBarCompat.java rename to app/src/main/java/com/mango/moshen/common/permission/StatusBarCompat.java index 7382df933..759998aea 100644 --- a/app/src/main/java/com/yizhuan/erban/common/permission/StatusBarCompat.java +++ b/app/src/main/java/com/mango/moshen/common/permission/StatusBarCompat.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.permission; +package com.mango.moshen.common.permission; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/common/server/NetworkService.java b/app/src/main/java/com/mango/moshen/common/server/NetworkService.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/common/server/NetworkService.java rename to app/src/main/java/com/mango/moshen/common/server/NetworkService.java index 65f2f4462..bad6d3b65 100644 --- a/app/src/main/java/com/yizhuan/erban/common/server/NetworkService.java +++ b/app/src/main/java/com/mango/moshen/common/server/NetworkService.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.server; +package com.mango.moshen.common.server; import android.app.Service; import android.content.BroadcastReceiver; diff --git a/app/src/main/java/com/yizhuan/erban/common/svga/SimpleSvgaCallback.java b/app/src/main/java/com/mango/moshen/common/svga/SimpleSvgaCallback.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/common/svga/SimpleSvgaCallback.java rename to app/src/main/java/com/mango/moshen/common/svga/SimpleSvgaCallback.java index 22351687c..633eaca13 100644 --- a/app/src/main/java/com/yizhuan/erban/common/svga/SimpleSvgaCallback.java +++ b/app/src/main/java/com/mango/moshen/common/svga/SimpleSvgaCallback.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.svga; +package com.mango.moshen.common.svga; import com.opensource.svgaplayer.SVGACallback; diff --git a/app/src/main/java/com/yizhuan/erban/common/svga/SimpleSvgaParseCompletion.java b/app/src/main/java/com/mango/moshen/common/svga/SimpleSvgaParseCompletion.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/common/svga/SimpleSvgaParseCompletion.java rename to app/src/main/java/com/mango/moshen/common/svga/SimpleSvgaParseCompletion.java index be02abbba..99eeb67b0 100644 --- a/app/src/main/java/com/yizhuan/erban/common/svga/SimpleSvgaParseCompletion.java +++ b/app/src/main/java/com/mango/moshen/common/svga/SimpleSvgaParseCompletion.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.svga; +package com.mango.moshen.common.svga; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/AgeSexView.java b/app/src/main/java/com/mango/moshen/common/widget/AgeSexView.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/common/widget/AgeSexView.java rename to app/src/main/java/com/mango/moshen/common/widget/AgeSexView.java index c2fee132c..66f5da9db 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/AgeSexView.java +++ b/app/src/main/java/com/mango/moshen/common/widget/AgeSexView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import android.util.AttributeSet; @@ -8,7 +8,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * Created by zhouxiangfeng on 17/2/26. diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/BadgeView.java b/app/src/main/java/com/mango/moshen/common/widget/BadgeView.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/common/widget/BadgeView.java rename to app/src/main/java/com/mango/moshen/common/widget/BadgeView.java index 9f38c8fed..ba7b40bef 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/BadgeView.java +++ b/app/src/main/java/com/mango/moshen/common/widget/BadgeView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import android.content.res.Resources; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/ChangeColorIconWithText.java b/app/src/main/java/com/mango/moshen/common/widget/ChangeColorIconWithText.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/common/widget/ChangeColorIconWithText.java rename to app/src/main/java/com/mango/moshen/common/widget/ChangeColorIconWithText.java index 9321dccd7..79660ec99 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/ChangeColorIconWithText.java +++ b/app/src/main/java/com/mango/moshen/common/widget/ChangeColorIconWithText.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.annotation.SuppressLint; import android.content.Context; @@ -19,7 +19,7 @@ import android.util.AttributeSet; import android.util.TypedValue; import android.view.View; -import com.yizhuan.erban.R; +import com.mango.moshen.R; public class ChangeColorIconWithText extends View { diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/CircleGradualImageView.java b/app/src/main/java/com/mango/moshen/common/widget/CircleGradualImageView.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/common/widget/CircleGradualImageView.java rename to app/src/main/java/com/mango/moshen/common/widget/CircleGradualImageView.java index 3cda585c3..47d7b0efa 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/CircleGradualImageView.java +++ b/app/src/main/java/com/mango/moshen/common/widget/CircleGradualImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import android.content.res.TypedArray; @@ -22,8 +22,8 @@ import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; /** * Created by MadisonRong on 23/04/2018. diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/CircleImageSpan.java b/app/src/main/java/com/mango/moshen/common/widget/CircleImageSpan.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/common/widget/CircleImageSpan.java rename to app/src/main/java/com/mango/moshen/common/widget/CircleImageSpan.java index 7a6d7f78a..871b94d50 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/CircleImageSpan.java +++ b/app/src/main/java/com/mango/moshen/common/widget/CircleImageSpan.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.graphics.Canvas; import android.graphics.Paint; @@ -15,9 +15,9 @@ 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.support.glide.GlideApp; -import com.yizhuan.erban.ui.gift.widget.GlideCircleTransform; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.ui.gift.widget.GlideCircleTransform; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.xchat_android_library.utils.config.BasicConfig; public class CircleImageSpan extends ImageSpan { diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/CircleImageView.java b/app/src/main/java/com/mango/moshen/common/widget/CircleImageView.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/common/widget/CircleImageView.java rename to app/src/main/java/com/mango/moshen/common/widget/CircleImageView.java index b742d68ec..629ec62d3 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/CircleImageView.java +++ b/app/src/main/java/com/mango/moshen/common/widget/CircleImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import android.content.res.TypedArray; @@ -17,7 +17,7 @@ import android.net.Uri; import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; -import com.yizhuan.erban.R; +import com.mango.moshen.R; public class CircleImageView extends AppCompatImageView { diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/CustomAutoWidthImageSpan.java b/app/src/main/java/com/mango/moshen/common/widget/CustomAutoWidthImageSpan.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/common/widget/CustomAutoWidthImageSpan.java rename to app/src/main/java/com/mango/moshen/common/widget/CustomAutoWidthImageSpan.java index 40d292893..ded106619 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/CustomAutoWidthImageSpan.java +++ b/app/src/main/java/com/mango/moshen/common/widget/CustomAutoWidthImageSpan.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.graphics.Canvas; import android.graphics.Paint; @@ -16,8 +16,8 @@ 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.support.glide.GlideApp; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/CustomImageSpan.java b/app/src/main/java/com/mango/moshen/common/widget/CustomImageSpan.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/common/widget/CustomImageSpan.java rename to app/src/main/java/com/mango/moshen/common/widget/CustomImageSpan.java index 4d7fe306a..d2b397e00 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/CustomImageSpan.java +++ b/app/src/main/java/com/mango/moshen/common/widget/CustomImageSpan.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.app.Activity; import android.content.Context; @@ -18,10 +18,10 @@ 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.support.glide.GlideApp; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.xchat_android_library.utils.SizeUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.xchat_android_library.utils.SizeUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/DragLayout.java b/app/src/main/java/com/mango/moshen/common/widget/DragLayout.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/common/widget/DragLayout.java rename to app/src/main/java/com/mango/moshen/common/widget/DragLayout.java index f34040a68..951112bbe 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/DragLayout.java +++ b/app/src/main/java/com/mango/moshen/common/widget/DragLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/FloatingLiveMiniView.java b/app/src/main/java/com/mango/moshen/common/widget/FloatingLiveMiniView.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/common/widget/FloatingLiveMiniView.java rename to app/src/main/java/com/mango/moshen/common/widget/FloatingLiveMiniView.java index 88902632d..a7094a291 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/FloatingLiveMiniView.java +++ b/app/src/main/java/com/mango/moshen/common/widget/FloatingLiveMiniView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import androidx.annotation.Nullable; @@ -6,8 +6,8 @@ import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.RelativeLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; /** * 全局悬浮的最小化控件 diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/LimitEditText.java b/app/src/main/java/com/mango/moshen/common/widget/LimitEditText.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/common/widget/LimitEditText.java rename to app/src/main/java/com/mango/moshen/common/widget/LimitEditText.java index 2589f3eb7..433de744c 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/LimitEditText.java +++ b/app/src/main/java/com/mango/moshen/common/widget/LimitEditText.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import android.content.res.TypedArray; @@ -7,8 +7,8 @@ import android.text.InputFilter; import android.util.AttributeSet; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.utils.LimitInputFliter; +import com.mango.moshen.R; +import com.mango.moshen.utils.LimitInputFliter; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/LoadingImageView.java b/app/src/main/java/com/mango/moshen/common/widget/LoadingImageView.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/common/widget/LoadingImageView.java rename to app/src/main/java/com/mango/moshen/common/widget/LoadingImageView.java index d916ad000..0a541a588 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/LoadingImageView.java +++ b/app/src/main/java/com/mango/moshen/common/widget/LoadingImageView.java @@ -1,5 +1,5 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import android.util.AttributeSet; @@ -8,7 +8,7 @@ import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.widget.ImageView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/MaskImageView.java b/app/src/main/java/com/mango/moshen/common/widget/MaskImageView.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/common/widget/MaskImageView.java rename to app/src/main/java/com/mango/moshen/common/widget/MaskImageView.java index 38d1ab41d..f33e85ba2 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/MaskImageView.java +++ b/app/src/main/java/com/mango/moshen/common/widget/MaskImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import android.content.res.TypedArray; @@ -9,7 +9,7 @@ import android.graphics.ColorMatrix; import android.graphics.ColorMatrixColorFilter; import android.util.AttributeSet; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import android.widget.ImageView; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/OriginalDrawStatusClickSpan.java b/app/src/main/java/com/mango/moshen/common/widget/OriginalDrawStatusClickSpan.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/common/widget/OriginalDrawStatusClickSpan.java rename to app/src/main/java/com/mango/moshen/common/widget/OriginalDrawStatusClickSpan.java index ed47d0f0c..64a83ab53 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/OriginalDrawStatusClickSpan.java +++ b/app/src/main/java/com/mango/moshen/common/widget/OriginalDrawStatusClickSpan.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/OvalImageView.java b/app/src/main/java/com/mango/moshen/common/widget/OvalImageView.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/common/widget/OvalImageView.java rename to app/src/main/java/com/mango/moshen/common/widget/OvalImageView.java index 89b346ca4..36b2beb4a 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/OvalImageView.java +++ b/app/src/main/java/com/mango/moshen/common/widget/OvalImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/PlayerView.java b/app/src/main/java/com/mango/moshen/common/widget/PlayerView.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/common/widget/PlayerView.java rename to app/src/main/java/com/mango/moshen/common/widget/PlayerView.java index 5cdfaa90c..f248a04f4 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/PlayerView.java +++ b/app/src/main/java/com/mango/moshen/common/widget/PlayerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import android.util.AttributeSet; @@ -7,7 +7,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * Created by zhouxiangfeng on 17/2/26. diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/RectRoundImageView.java b/app/src/main/java/com/mango/moshen/common/widget/RectRoundImageView.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/common/widget/RectRoundImageView.java rename to app/src/main/java/com/mango/moshen/common/widget/RectRoundImageView.java index dbc777f26..629b0ecf7 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/RectRoundImageView.java +++ b/app/src/main/java/com/mango/moshen/common/widget/RectRoundImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import android.content.res.TypedArray; @@ -18,7 +18,7 @@ import android.util.AttributeSet; import android.util.TypedValue; import android.widget.ImageView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.io.InputStream; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/SlideListViewPager.java b/app/src/main/java/com/mango/moshen/common/widget/SlideListViewPager.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/common/widget/SlideListViewPager.java rename to app/src/main/java/com/mango/moshen/common/widget/SlideListViewPager.java index e72a96c5d..a3709e743 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/SlideListViewPager.java +++ b/app/src/main/java/com/mango/moshen/common/widget/SlideListViewPager.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import androidx.viewpager.widget.ViewPager; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/StatusLayout.java b/app/src/main/java/com/mango/moshen/common/widget/StatusLayout.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/common/widget/StatusLayout.java rename to app/src/main/java/com/mango/moshen/common/widget/StatusLayout.java index b6af68409..dd2e0b58e 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/StatusLayout.java +++ b/app/src/main/java/com/mango/moshen/common/widget/StatusLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import android.content.res.TypedArray; @@ -10,8 +10,8 @@ import android.view.View; import android.widget.RelativeLayout; import android.widget.TextView; -import com.yizhuan.xchat_android_library.utils.log.MLog; -import com.yizhuan.erban.R; +import com.mango.xchat_android_library.utils.log.MLog; +import com.mango.moshen.R; /** diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/TextDrawable.java b/app/src/main/java/com/mango/moshen/common/widget/TextDrawable.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/common/widget/TextDrawable.java rename to app/src/main/java/com/mango/moshen/common/widget/TextDrawable.java index 2cc44688c..654df80ce 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/TextDrawable.java +++ b/app/src/main/java/com/mango/moshen/common/widget/TextDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.graphics.Canvas; import android.graphics.Color; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/TutuSwitchView.java b/app/src/main/java/com/mango/moshen/common/widget/TutuSwitchView.java similarity index 68% rename from app/src/main/java/com/yizhuan/erban/common/widget/TutuSwitchView.java rename to app/src/main/java/com/mango/moshen/common/widget/TutuSwitchView.java index 2169420b7..d8072a26d 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/TutuSwitchView.java +++ b/app/src/main/java/com/mango/moshen/common/widget/TutuSwitchView.java @@ -1,15 +1,15 @@ -package com.yizhuan.erban.common.widget; +package com.mango.moshen.common.widget; import android.content.Context; import android.util.AttributeSet; import androidx.core.content.ContextCompat; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; +import com.mango.moshen.R; +import com.mango.xchat_android_library.widget.IOSSwitchView; /** - * 开关控件，涉及ui，继承library的 {@link com.yizhuan.xchat_android_library.widget.IOSSwitchView} + * 开关控件，涉及ui，继承library的 {@link com.mango.xchat_android_library.widget.IOSSwitchView} * 改写UI * Created by lvzebiao on 2019/1/25. */ diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/BaseAlertDialogBuilder.java b/app/src/main/java/com/mango/moshen/common/widget/dialog/BaseAlertDialogBuilder.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/common/widget/dialog/BaseAlertDialogBuilder.java rename to app/src/main/java/com/mango/moshen/common/widget/dialog/BaseAlertDialogBuilder.java index 126e61942..2fe6e7b4b 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/BaseAlertDialogBuilder.java +++ b/app/src/main/java/com/mango/moshen/common/widget/dialog/BaseAlertDialogBuilder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget.dialog; +package com.mango.moshen.common.widget.dialog; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java b/app/src/main/java/com/mango/moshen/common/widget/dialog/ChooseWorldsDialog.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java rename to app/src/main/java/com/mango/moshen/common/widget/dialog/ChooseWorldsDialog.java index 7c84070af..70a1672a2 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java +++ b/app/src/main/java/com/mango/moshen/common/widget/dialog/ChooseWorldsDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget.dialog; +package com.mango.moshen.common.widget.dialog; import android.app.Activity; import android.app.Dialog; @@ -18,15 +18,15 @@ import android.view.WindowManager; import android.widget.FrameLayout; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.community.publish.view.WorldsChooseFrg; -import com.yizhuan.erban.home.adapter.FragmentViewPagerAdapter; -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.Constants; -import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; +import com.mango.moshen.R; +import com.mango.moshen.community.publish.view.WorldsChooseFrg; +import com.mango.moshen.home.adapter.FragmentViewPagerAdapter; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.core.Constants; +import com.mango.core.community.bean.MiniWorldChooseInfo; +import com.mango.core.home.bean.TabInfo; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsIndicatorAdapter.java b/app/src/main/java/com/mango/moshen/common/widget/dialog/ChooseWorldsIndicatorAdapter.java similarity index 78% rename from app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsIndicatorAdapter.java rename to app/src/main/java/com/mango/moshen/common/widget/dialog/ChooseWorldsIndicatorAdapter.java index a9ba2b9b8..1839a7a0f 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsIndicatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/common/widget/dialog/ChooseWorldsIndicatorAdapter.java @@ -1,18 +1,18 @@ -package com.yizhuan.erban.common.widget.dialog; +package com.mango.moshen.common.widget.dialog; import android.content.Context; import androidx.core.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -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 com.mango.moshen.R; +import com.mango.moshen.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.mango.core.home.bean.TabInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CommonPopupDialog.java b/app/src/main/java/com/mango/moshen/common/widget/dialog/CommonPopupDialog.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/common/widget/dialog/CommonPopupDialog.java rename to app/src/main/java/com/mango/moshen/common/widget/dialog/CommonPopupDialog.java index 55151c00c..a21975a1f 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CommonPopupDialog.java +++ b/app/src/main/java/com/mango/moshen/common/widget/dialog/CommonPopupDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget.dialog; +package com.mango.moshen.common.widget.dialog; import android.content.Context; import android.os.Bundle; @@ -15,9 +15,9 @@ import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.moshen.ui.widget.marqueeview.Utils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CustomPopupDialog.java b/app/src/main/java/com/mango/moshen/common/widget/dialog/CustomPopupDialog.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/common/widget/dialog/CustomPopupDialog.java rename to app/src/main/java/com/mango/moshen/common/widget/dialog/CustomPopupDialog.java index f37886964..7d10881f0 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CustomPopupDialog.java +++ b/app/src/main/java/com/mango/moshen/common/widget/dialog/CustomPopupDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget.dialog; +package com.mango.moshen.common.widget.dialog; import android.app.AlertDialog; import android.content.Context; @@ -13,9 +13,9 @@ import android.view.WindowManager; import android.widget.TextView; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_library.utils.ResolutionUtils; -import com.yizhuan.erban.R; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.xchat_android_library.utils.ResolutionUtils; +import com.mango.moshen.R; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java b/app/src/main/java/com/mango/moshen/common/widget/dialog/DialogManager.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java rename to app/src/main/java/com/mango/moshen/common/widget/dialog/DialogManager.java index 83b5bfe41..6bc208e34 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java +++ b/app/src/main/java/com/mango/moshen/common/widget/dialog/DialogManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget.dialog; +package com.mango.moshen.common.widget.dialog; import android.annotation.TargetApi; import android.app.Activity; @@ -28,12 +28,12 @@ import androidx.appcompat.app.AlertDialog; import com.makeramen.roundedimageview.RoundedImageView; import com.netease.nim.uikit.common.util.string.StringUtil; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -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.log.MLog; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.moshen.utils.SpannableBuilder; +import com.mango.core.utils.ActivityUtil; +import com.mango.xchat_android_library.utils.log.MLog; import java.util.List; @@ -560,7 +560,7 @@ public class DialogManager { * 2、如果UI要求弹框是完全自定义的，再重新写过 * * @param title 标题，空则隐藏 (ui说，有些弹框带标题，有些不带，两种情况共存) - * @param message 内容，不能为空，配合{@link com.yizhuan.erban.utils.SpannableBuilder} 变色使用 + * @param message 内容，不能为空，配合{@link com.mango.moshen.utils.SpannableBuilder} 变色使用 * @param okLabel ok按钮，不能隐藏，默认为 text="确定" * @param cancelLabel 取消按钮，空则隐藏，一般现在都用text="取消" * @param l 点击监听 diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogUiHelper.java b/app/src/main/java/com/mango/moshen/common/widget/dialog/DialogUiHelper.java similarity index 77% rename from app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogUiHelper.java rename to app/src/main/java/com/mango/moshen/common/widget/dialog/DialogUiHelper.java index 93a5367c0..958fbf072 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogUiHelper.java +++ b/app/src/main/java/com/mango/moshen/common/widget/dialog/DialogUiHelper.java @@ -1,16 +1,12 @@ -package com.yizhuan.erban.common.widget.dialog; +package com.mango.moshen.common.widget.dialog; import android.content.Context; -import com.orhanobut.logger.Logger; -import com.yizhuan.erban.radish.task.activity.TaskCenterActivity; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; - -import java.util.HashMap; -import java.util.Map; +import com.mango.moshen.radish.task.activity.TaskCenterActivity; +import com.mango.moshen.ui.pay.ChargeActivity; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.ActivityUtil; /** * 弹框帮助类，减少一些的代码的冗余 diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ListViewMenuItem.java b/app/src/main/java/com/mango/moshen/common/widget/dialog/ListViewMenuItem.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/common/widget/dialog/ListViewMenuItem.java rename to app/src/main/java/com/mango/moshen/common/widget/dialog/ListViewMenuItem.java index 02a2f219f..cb57611ea 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ListViewMenuItem.java +++ b/app/src/main/java/com/mango/moshen/common/widget/dialog/ListViewMenuItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget.dialog; +package com.mango.moshen.common.widget.dialog; /** * Creator： Chanry diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoadingImageView.java b/app/src/main/java/com/mango/moshen/common/widget/dialog/LoadingImageView.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoadingImageView.java rename to app/src/main/java/com/mango/moshen/common/widget/dialog/LoadingImageView.java index 7af012fb6..09cf73785 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoadingImageView.java +++ b/app/src/main/java/com/mango/moshen/common/widget/dialog/LoadingImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget.dialog; +package com.mango.moshen.common.widget.dialog; import android.animation.ObjectAnimator; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoginPopupDialog.java b/app/src/main/java/com/mango/moshen/common/widget/dialog/LoginPopupDialog.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoginPopupDialog.java rename to app/src/main/java/com/mango/moshen/common/widget/dialog/LoginPopupDialog.java index 8d25c80d9..910f4ab13 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoginPopupDialog.java +++ b/app/src/main/java/com/mango/moshen/common/widget/dialog/LoginPopupDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.common.widget.dialog; +package com.mango.moshen.common.widget.dialog; import android.app.Dialog; @@ -10,7 +10,7 @@ import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; -import com.yizhuan.erban.R; +import com.mango.moshen.R; public class LoginPopupDialog extends Dialog implements OnClickListener { diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/TimeOutProgressDialog.java b/app/src/main/java/com/mango/moshen/common/widget/dialog/TimeOutProgressDialog.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/common/widget/dialog/TimeOutProgressDialog.java rename to app/src/main/java/com/mango/moshen/common/widget/dialog/TimeOutProgressDialog.java index 39955575a..bdd094a7d 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/TimeOutProgressDialog.java +++ b/app/src/main/java/com/mango/moshen/common/widget/dialog/TimeOutProgressDialog.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.common.widget.dialog; +package com.mango.moshen.common.widget.dialog; import android.app.Activity; import android.os.Handler; import android.os.Looper; import android.widget.Toast; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.SingleToastUtil; /** * Created by qinbo on 2014/7/2. diff --git a/app/src/main/java/com/yizhuan/erban/constants/BundleKeys.java b/app/src/main/java/com/mango/moshen/constants/BundleKeys.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/constants/BundleKeys.java rename to app/src/main/java/com/mango/moshen/constants/BundleKeys.java index b1e117c51..c7a174215 100644 --- a/app/src/main/java/com/yizhuan/erban/constants/BundleKeys.java +++ b/app/src/main/java/com/mango/moshen/constants/BundleKeys.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.constants; +package com.mango.moshen.constants; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/CarShopAdapter.java b/app/src/main/java/com/mango/moshen/decoration/adapter/CarShopAdapter.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/decoration/adapter/CarShopAdapter.java rename to app/src/main/java/com/mango/moshen/decoration/adapter/CarShopAdapter.java index b78199d3a..a90ceb5d8 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/CarShopAdapter.java +++ b/app/src/main/java/com/mango/moshen/decoration/adapter/CarShopAdapter.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.decoration.adapter; +package com.mango.moshen.decoration.adapter; import android.view.View; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bindadapter.BaseAdapter; -import com.yizhuan.erban.bindadapter.BindingViewHolder; -import com.yizhuan.erban.databinding.ItemCarShopBinding; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.bindadapter.BindingViewHolder; +import com.mango.moshen.databinding.ItemCarShopBinding; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.xchat_android_library.utils.ListUtils; /** * Created by huangmeng1 on 2018/5/9. diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/DecorationCommonAdapter.kt b/app/src/main/java/com/mango/moshen/decoration/adapter/DecorationCommonAdapter.kt similarity index 75% rename from app/src/main/java/com/yizhuan/erban/decoration/adapter/DecorationCommonAdapter.kt rename to app/src/main/java/com/mango/moshen/decoration/adapter/DecorationCommonAdapter.kt index f5d25203b..a73976942 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/DecorationCommonAdapter.kt +++ b/app/src/main/java/com/mango/moshen/decoration/adapter/DecorationCommonAdapter.kt @@ -1,12 +1,11 @@ -package com.yizhuan.erban.decoration.adapter +package com.mango.moshen.decoration.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.decoration.DecorationInfo -import com.yizhuan.xchat_android_core.room.game.GameInfo +import com.mango.moshen.R +import com.mango.moshen.ui.utils.load +import com.mango.core.decoration.DecorationInfo open class DecorationCommonAdapter(layoutResId: Int = R.layout.item_decoration_common) : diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/HeadWearShopAdapter.java b/app/src/main/java/com/mango/moshen/decoration/adapter/HeadWearShopAdapter.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/decoration/adapter/HeadWearShopAdapter.java rename to app/src/main/java/com/mango/moshen/decoration/adapter/HeadWearShopAdapter.java index a08c1cbba..e65df655d 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/HeadWearShopAdapter.java +++ b/app/src/main/java/com/mango/moshen/decoration/adapter/HeadWearShopAdapter.java @@ -1,14 +1,14 @@ -package com.yizhuan.erban.decoration.adapter; +package com.mango.moshen.decoration.adapter; import android.view.View; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bindadapter.BaseAdapter; -import com.yizhuan.erban.bindadapter.BindingViewHolder; -import com.yizhuan.erban.databinding.ItemHeadWearBinding; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.mango.moshen.R; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.bindadapter.BindingViewHolder; +import com.mango.moshen.databinding.ItemHeadWearBinding; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.noble.NobleUtil; /** * Created by huangmeng1 on 2018/5/10. diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java b/app/src/main/java/com/mango/moshen/decoration/adapter/MyCarAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java rename to app/src/main/java/com/mango/moshen/decoration/adapter/MyCarAdapter.java index c9c0c681e..24bb871a9 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java +++ b/app/src/main/java/com/mango/moshen/decoration/adapter/MyCarAdapter.java @@ -1,16 +1,16 @@ -package com.yizhuan.erban.decoration.adapter; +package com.mango.moshen.decoration.adapter; import android.view.View; import android.widget.ImageView; import android.widget.TextView; import com.netease.nim.uikit.support.glide.GlideApp; -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.car.bean.CarInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.bindadapter.BindingViewHolder; +import com.mango.moshen.databinding.ItemCarGarageNormalBinding; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.xchat_android_library.utils.ListUtils; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyChatBubbleAdapter.java b/app/src/main/java/com/mango/moshen/decoration/adapter/MyChatBubbleAdapter.java similarity index 79% rename from app/src/main/java/com/yizhuan/erban/decoration/adapter/MyChatBubbleAdapter.java rename to app/src/main/java/com/mango/moshen/decoration/adapter/MyChatBubbleAdapter.java index 1ed8603c5..b6d75fe9a 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyChatBubbleAdapter.java +++ b/app/src/main/java/com/mango/moshen/decoration/adapter/MyChatBubbleAdapter.java @@ -1,19 +1,17 @@ -package com.yizhuan.erban.decoration.adapter; +package com.mango.moshen.decoration.adapter; import android.view.View; import androidx.annotation.NonNull; -import com.yizhuan.erban.BR; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bindadapter.BaseAdapter; -import com.yizhuan.erban.bindadapter.BindingViewHolder; -import com.yizhuan.erban.databinding.ItemMyChatBubbleBinding; -import com.yizhuan.erban.databinding.ItemMyUserCardWearBinding; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.ChatBubbleInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.bindadapter.BindingViewHolder; +import com.mango.moshen.databinding.ItemMyChatBubbleBinding; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.decoration.headwear.bean.ChatBubbleInfo; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; /** * Created by huangmeng1 on 2018/5/11. diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyHeadWearAdapter.java b/app/src/main/java/com/mango/moshen/decoration/adapter/MyHeadWearAdapter.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/decoration/adapter/MyHeadWearAdapter.java rename to app/src/main/java/com/mango/moshen/decoration/adapter/MyHeadWearAdapter.java index 0a183660c..600320775 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyHeadWearAdapter.java +++ b/app/src/main/java/com/mango/moshen/decoration/adapter/MyHeadWearAdapter.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.decoration.adapter; +package com.mango.moshen.decoration.adapter; import android.view.View; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bindadapter.BaseAdapter; -import com.yizhuan.erban.bindadapter.BindingViewHolder; -import com.yizhuan.erban.databinding.ItemMyHeadWearBinding; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.mango.moshen.R; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.bindadapter.BindingViewHolder; +import com.mango.moshen.databinding.ItemMyHeadWearBinding; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.noble.NobleUtil; /** * Created by huangmeng1 on 2018/5/11. diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java b/app/src/main/java/com/mango/moshen/decoration/adapter/MyNamePlateAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java rename to app/src/main/java/com/mango/moshen/decoration/adapter/MyNamePlateAdapter.java index 1cd3480c1..461b80b2e 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java +++ b/app/src/main/java/com/mango/moshen/decoration/adapter/MyNamePlateAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.decoration.adapter; +package com.mango.moshen.decoration.adapter; import android.view.View; import android.widget.ImageView; @@ -6,11 +6,9 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.mango.moshen.R; +import com.mango.core.decoration.nameplate.bean.NamePlateInfo; /** * Created by yudi diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyUserCardWearAdapter.java b/app/src/main/java/com/mango/moshen/decoration/adapter/MyUserCardWearAdapter.java similarity index 81% rename from app/src/main/java/com/yizhuan/erban/decoration/adapter/MyUserCardWearAdapter.java rename to app/src/main/java/com/mango/moshen/decoration/adapter/MyUserCardWearAdapter.java index e0d6601f6..bcabe918d 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyUserCardWearAdapter.java +++ b/app/src/main/java/com/mango/moshen/decoration/adapter/MyUserCardWearAdapter.java @@ -1,18 +1,16 @@ -package com.yizhuan.erban.decoration.adapter; +package com.mango.moshen.decoration.adapter; import android.view.View; import androidx.annotation.NonNull; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bindadapter.BaseAdapter; -import com.yizhuan.erban.bindadapter.BindingViewHolder; -import com.yizhuan.erban.databinding.ItemMyHeadWearBinding; -import com.yizhuan.erban.databinding.ItemMyUserCardWearBinding; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.mango.moshen.R; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.bindadapter.BindingViewHolder; +import com.mango.moshen.databinding.ItemMyUserCardWearBinding; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.decoration.headwear.bean.UserCardWearInfo; /** * Created by huangmeng1 on 2018/5/11. diff --git a/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationDialogHelper.java b/app/src/main/java/com/mango/moshen/decoration/helper/DecorationDialogHelper.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationDialogHelper.java rename to app/src/main/java/com/mango/moshen/decoration/helper/DecorationDialogHelper.java index c9b9e20f1..2c95bd79c 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationDialogHelper.java +++ b/app/src/main/java/com/mango/moshen/decoration/helper/DecorationDialogHelper.java @@ -1,24 +1,23 @@ -package com.yizhuan.erban.decoration.helper; +package com.mango.moshen.decoration.helper; import android.content.Context; import android.view.View; import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.TextView; -import android.widget.Toast; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.common.widget.dialog.DialogUiHelper; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.decoration.bean.BaseDecoration; -import com.yizhuan.xchat_android_core.decoration.bean.CurrencyType; -import com.yizhuan.xchat_android_core.decoration.car.CarModel; -import com.yizhuan.xchat_android_core.decoration.headwear.HeadwearModel; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.RadishNotEnoughException; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.common.widget.dialog.DialogUiHelper; +import com.mango.core.utils.ActivityUtil; +import com.mango.core.decoration.bean.BaseDecoration; +import com.mango.core.decoration.bean.CurrencyType; +import com.mango.core.decoration.car.CarModel; +import com.mango.core.decoration.headwear.HeadwearModel; +import com.mango.core.utils.net.BalanceNotEnoughExeption; +import com.mango.core.utils.net.RadishNotEnoughException; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.SingleToastUtil; import io.reactivex.functions.BiConsumer; import lombok.Data; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationHelper.java b/app/src/main/java/com/mango/moshen/decoration/helper/DecorationHelper.java similarity index 79% rename from app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationHelper.java rename to app/src/main/java/com/mango/moshen/decoration/helper/DecorationHelper.java index e8e0c251e..d600b31dc 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationHelper.java +++ b/app/src/main/java/com/mango/moshen/decoration/helper/DecorationHelper.java @@ -1,22 +1,19 @@ -package com.yizhuan.erban.decoration.helper; +package com.mango.moshen.decoration.helper; import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.decoration.DecorationInfo; -import com.yizhuan.xchat_android_core.decoration.DecorationInfoEvent; -import com.yizhuan.xchat_android_core.decoration.DecorationModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.core.decoration.DecorationInfo; +import com.mango.core.decoration.DecorationInfoEvent; +import com.mango.core.decoration.DecorationModel; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; -import io.reactivex.functions.Consumer; - /** * create by lvzebiao @2019/3/21 */ diff --git a/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationSaleType.java b/app/src/main/java/com/mango/moshen/decoration/helper/DecorationSaleType.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationSaleType.java rename to app/src/main/java/com/mango/moshen/decoration/helper/DecorationSaleType.java index ad5aa4895..2ed0a7507 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationSaleType.java +++ b/app/src/main/java/com/mango/moshen/decoration/helper/DecorationSaleType.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.decoration.helper; +package com.mango.moshen.decoration.helper; /** * 购买 赠送 头饰 座驾的区分 diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationCommonFragment.kt b/app/src/main/java/com/mango/moshen/decoration/view/DecorationCommonFragment.kt similarity index 84% rename from app/src/main/java/com/yizhuan/erban/decoration/view/DecorationCommonFragment.kt rename to app/src/main/java/com/mango/moshen/decoration/view/DecorationCommonFragment.kt index 6cd20c0d0..0f25705c7 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationCommonFragment.kt +++ b/app/src/main/java/com/mango/moshen/decoration/view/DecorationCommonFragment.kt @@ -1,20 +1,20 @@ -package com.yizhuan.erban.decoration.view +package com.mango.moshen.decoration.view import android.os.Bundle import androidx.fragment.app.viewModels import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseViewBindingFragment -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.FragmentDecorationCommonBinding -import com.yizhuan.erban.decoration.adapter.DecorationCommonAdapter -import com.yizhuan.erban.decoration.viewmodel.DecorationViewModel -import com.yizhuan.erban.ui.relation.FansListActivity -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.decoration.DecorationInfo -import com.yizhuan.xchat_android_core.decoration.DecorationInfoEvent -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.base.BaseViewBindingFragment +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.FragmentDecorationCommonBinding +import com.mango.moshen.decoration.adapter.DecorationCommonAdapter +import com.mango.moshen.decoration.viewmodel.DecorationViewModel +import com.mango.moshen.ui.relation.FansListActivity +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.decoration.DecorationInfo +import com.mango.core.decoration.DecorationInfoEvent +import com.mango.xchat_android_library.annatation.ActLayoutRes import org.greenrobot.eventbus.EventBus /** diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt b/app/src/main/java/com/mango/moshen/decoration/view/DecorationStoreActivity.kt similarity index 78% rename from app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt rename to app/src/main/java/com/mango/moshen/decoration/view/DecorationStoreActivity.kt index bf9e34267..5a598729a 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt +++ b/app/src/main/java/com/mango/moshen/decoration/view/DecorationStoreActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.decoration.view +package com.mango.moshen.decoration.view import android.content.Context import android.content.Intent @@ -7,25 +7,24 @@ import android.view.View import androidx.activity.viewModels import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentPagerAdapter -import androidx.viewpager.widget.ViewPager.SimpleOnPageChangeListener import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.base.TitleBar -import com.yizhuan.erban.databinding.ActivityDecorationStoreBinding -import com.yizhuan.erban.decoration.view.widgets.CarMagicIndicator -import com.yizhuan.erban.decoration.view.widgets.MyDecorationMagicIndicator -import com.yizhuan.erban.decoration.viewmodel.DecorationViewModel -import com.yizhuan.erban.home.helper.BannerHelper -import com.yizhuan.erban.ui.pay.ChargeActivity -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.home.bean.TabInfo -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.FormatUtils +import com.mango.moshen.R +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.base.TitleBar +import com.mango.moshen.databinding.ActivityDecorationStoreBinding +import com.mango.moshen.decoration.view.widgets.CarMagicIndicator +import com.mango.moshen.decoration.view.widgets.MyDecorationMagicIndicator +import com.mango.moshen.decoration.viewmodel.DecorationViewModel +import com.mango.moshen.home.helper.BannerHelper +import com.mango.moshen.ui.pay.ChargeActivity +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.mango.core.Constants +import com.mango.core.home.bean.TabInfo +import com.mango.core.pay.PayModel +import com.mango.core.pay.event.UpdateWalletInfoEvent +import com.mango.xchat_android_library.annatation.ActLayoutRes +import com.mango.xchat_android_library.utils.FormatUtils import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/ICarView.java b/app/src/main/java/com/mango/moshen/decoration/view/ICarView.java similarity index 63% rename from app/src/main/java/com/yizhuan/erban/decoration/view/ICarView.java rename to app/src/main/java/com/mango/moshen/decoration/view/ICarView.java index 36de160d7..0e25e407a 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/ICarView.java +++ b/app/src/main/java/com/mango/moshen/decoration/view/ICarView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.decoration.view; +package com.mango.moshen.decoration.view; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * Created by yudi diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyCarFragment.java b/app/src/main/java/com/mango/moshen/decoration/view/MyCarFragment.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/decoration/view/MyCarFragment.java rename to app/src/main/java/com/mango/moshen/decoration/view/MyCarFragment.java index aa04ba08b..d804e8e66 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyCarFragment.java +++ b/app/src/main/java/com/mango/moshen/decoration/view/MyCarFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.decoration.view; +package com.mango.moshen.decoration.view; import android.annotation.SuppressLint; import android.os.Bundle; @@ -8,20 +8,20 @@ import androidx.recyclerview.widget.LinearLayoutManager; import android.view.View; -import com.yizhuan.erban.BR; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingFragment; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.databinding.FrgMyDecorationCommonBinding; -import com.yizhuan.erban.decoration.adapter.MyCarAdapter; -import com.yizhuan.erban.decoration.viewmodel.MyCarVm; -import com.yizhuan.erban.ui.widget.LoadingDialog; -import com.yizhuan.xchat_android_core.decoration.car.CarModel; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingFragment; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.databinding.FrgMyDecorationCommonBinding; +import com.mango.moshen.decoration.adapter.MyCarAdapter; +import com.mango.moshen.decoration.viewmodel.MyCarVm; +import com.mango.moshen.ui.widget.LoadingDialog; +import com.mango.core.decoration.car.CarModel; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.core.user.UserModel; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyChatBubbleFragment.java b/app/src/main/java/com/mango/moshen/decoration/view/MyChatBubbleFragment.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/decoration/view/MyChatBubbleFragment.java rename to app/src/main/java/com/mango/moshen/decoration/view/MyChatBubbleFragment.java index 8224d59ff..6ce7ec82f 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyChatBubbleFragment.java +++ b/app/src/main/java/com/mango/moshen/decoration/view/MyChatBubbleFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.decoration.view; +package com.mango.moshen.decoration.view; import android.annotation.SuppressLint; import android.app.Activity; @@ -7,16 +7,16 @@ import android.view.View; import androidx.recyclerview.widget.GridLayoutManager; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingFragment; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.databinding.FragmentMyChatBubbleBinding; -import com.yizhuan.erban.decoration.adapter.MyChatBubbleAdapter; -import com.yizhuan.erban.decoration.viewmodel.UserChatBubbleVm; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.ChatBubbleInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingFragment; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.databinding.FragmentMyChatBubbleBinding; +import com.mango.moshen.decoration.adapter.MyChatBubbleAdapter; +import com.mango.moshen.decoration.viewmodel.UserChatBubbleVm; +import com.mango.core.decoration.headwear.bean.ChatBubbleInfo; +import com.mango.core.user.UserModel; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.Objects; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java b/app/src/main/java/com/mango/moshen/decoration/view/MyDecorationActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java rename to app/src/main/java/com/mango/moshen/decoration/view/MyDecorationActivity.java index 02366a475..92606d7d0 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java +++ b/app/src/main/java/com/mango/moshen/decoration/view/MyDecorationActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.decoration.view; +package com.mango.moshen.decoration.view; import android.content.Context; import android.content.Intent; @@ -17,29 +17,29 @@ import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.databinding.ActivityMyDecorationBinding; -import com.yizhuan.erban.decoration.helper.DecorationDialogHelper; -import com.yizhuan.erban.decoration.helper.DecorationSaleType; -import com.yizhuan.erban.decoration.view.widgets.MyDecorationMagicIndicator; -import com.yizhuan.erban.home.adapter.BannerAdapter; -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.erban.ui.widget.rollviewpager.Util; -import com.yizhuan.erban.ui.widget.rollviewpager.hintview.ColorPointHintView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.decoration.car.CarModel; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_core.home.model.GameHomeModel; -import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.databinding.ActivityMyDecorationBinding; +import com.mango.moshen.decoration.helper.DecorationDialogHelper; +import com.mango.moshen.decoration.helper.DecorationSaleType; +import com.mango.moshen.decoration.view.widgets.MyDecorationMagicIndicator; +import com.mango.moshen.home.adapter.BannerAdapter; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.moshen.ui.widget.rollviewpager.Util; +import com.mango.moshen.ui.widget.rollviewpager.hintview.ColorPointHintView; +import com.mango.core.Constants; +import com.mango.core.decoration.car.CarModel; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.core.home.bean.BannerInfo; +import com.mango.core.home.bean.TabInfo; +import com.mango.core.home.model.GameHomeModel; +import com.mango.core.market_verify.MarketVerifyModel; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java b/app/src/main/java/com/mango/moshen/decoration/view/MyHeadWearFragment.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java rename to app/src/main/java/com/mango/moshen/decoration/view/MyHeadWearFragment.java index 778e730ff..5c6be5a45 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java +++ b/app/src/main/java/com/mango/moshen/decoration/view/MyHeadWearFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.decoration.view; +package com.mango.moshen.decoration.view; import android.annotation.SuppressLint; import android.app.Activity; @@ -8,19 +8,19 @@ import android.view.View; import androidx.recyclerview.widget.LinearLayoutManager; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.BR; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingFragment; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.databinding.FrgMyDecorationCommonBinding; -import com.yizhuan.erban.decoration.adapter.MyHeadWearAdapter; -import com.yizhuan.erban.decoration.helper.DecorationDialogHelper; -import com.yizhuan.erban.decoration.helper.DecorationSaleType; -import com.yizhuan.erban.decoration.viewmodel.HeadWearVm; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingFragment; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.databinding.FrgMyDecorationCommonBinding; +import com.mango.moshen.decoration.adapter.MyHeadWearAdapter; +import com.mango.moshen.decoration.helper.DecorationDialogHelper; +import com.mango.moshen.decoration.helper.DecorationSaleType; +import com.mango.moshen.decoration.viewmodel.HeadWearVm; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.user.UserModel; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyNamePlateFragment.java b/app/src/main/java/com/mango/moshen/decoration/view/MyNamePlateFragment.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/decoration/view/MyNamePlateFragment.java rename to app/src/main/java/com/mango/moshen/decoration/view/MyNamePlateFragment.java index 71275f31c..73ca060ab 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyNamePlateFragment.java +++ b/app/src/main/java/com/mango/moshen/decoration/view/MyNamePlateFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.decoration.view; +package com.mango.moshen.decoration.view; import android.annotation.SuppressLint; import android.os.Bundle; @@ -11,15 +11,15 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.decoration.adapter.MyNamePlateAdapter; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.decoration.nameplate.NamePlateModel; -import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.decoration.adapter.MyNamePlateAdapter; +import com.mango.core.auth.AuthModel; +import com.mango.core.decoration.nameplate.NamePlateModel; +import com.mango.core.decoration.nameplate.bean.NamePlateInfo; +import com.mango.core.user.UserModel; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyUserCardWearFragment.java b/app/src/main/java/com/mango/moshen/decoration/view/MyUserCardWearFragment.java similarity index 75% rename from app/src/main/java/com/yizhuan/erban/decoration/view/MyUserCardWearFragment.java rename to app/src/main/java/com/mango/moshen/decoration/view/MyUserCardWearFragment.java index 9c888f9b4..e28d1d384 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyUserCardWearFragment.java +++ b/app/src/main/java/com/mango/moshen/decoration/view/MyUserCardWearFragment.java @@ -1,32 +1,24 @@ -package com.yizhuan.erban.decoration.view; +package com.mango.moshen.decoration.view; import android.annotation.SuppressLint; import android.app.Activity; -import android.util.Log; import android.view.View; import androidx.recyclerview.widget.LinearLayoutManager; -import com.chad.library.adapter.base.BaseQuickAdapter; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.BR; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingFragment; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.databinding.FrgMyDecorationCommonBinding; -import com.yizhuan.erban.decoration.adapter.MyHeadWearAdapter; -import com.yizhuan.erban.decoration.adapter.MyUserCardWearAdapter; -import com.yizhuan.erban.decoration.helper.DecorationDialogHelper; -import com.yizhuan.erban.decoration.helper.DecorationSaleType; -import com.yizhuan.erban.decoration.viewmodel.HeadWearVm; -import com.yizhuan.erban.decoration.viewmodel.UserCardWearVm; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingFragment; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.databinding.FrgMyDecorationCommonBinding; +import com.mango.moshen.decoration.adapter.MyUserCardWearAdapter; +import com.mango.moshen.decoration.viewmodel.UserCardWearVm; +import com.mango.core.decoration.headwear.bean.UserCardWearInfo; +import com.mango.core.user.UserModel; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; -import java.util.List; import java.util.Objects; /** diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/BadgeScaleTransitionPagerTitleView.java b/app/src/main/java/com/mango/moshen/decoration/view/widgets/BadgeScaleTransitionPagerTitleView.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/decoration/view/widgets/BadgeScaleTransitionPagerTitleView.java rename to app/src/main/java/com/mango/moshen/decoration/view/widgets/BadgeScaleTransitionPagerTitleView.java index 67b0a0c6f..5d786971e 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/BadgeScaleTransitionPagerTitleView.java +++ b/app/src/main/java/com/mango/moshen/decoration/view/widgets/BadgeScaleTransitionPagerTitleView.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.decoration.view.widgets; +package com.mango.moshen.decoration.view.widgets; import android.content.Context; import android.util.AttributeSet; import android.view.View; 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.IPagerTitleView; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; /** diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/CarMagicIndicator.java b/app/src/main/java/com/mango/moshen/decoration/view/widgets/CarMagicIndicator.java similarity index 75% rename from app/src/main/java/com/yizhuan/erban/decoration/view/widgets/CarMagicIndicator.java rename to app/src/main/java/com/mango/moshen/decoration/view/widgets/CarMagicIndicator.java index bb663aebf..dfdb58f56 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/CarMagicIndicator.java +++ b/app/src/main/java/com/mango/moshen/decoration/view/widgets/CarMagicIndicator.java @@ -1,18 +1,14 @@ -package com.yizhuan.erban.decoration.view.widgets; +package com.mango.moshen.decoration.view.widgets; import android.content.Context; import androidx.core.content.ContextCompat; -import android.view.ViewGroup; -import android.widget.FrameLayout; -import com.yizhuan.erban.R; -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 com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.core.home.bean.TabInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/MyDecorationMagicIndicator.java b/app/src/main/java/com/mango/moshen/decoration/view/widgets/MyDecorationMagicIndicator.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/decoration/view/widgets/MyDecorationMagicIndicator.java rename to app/src/main/java/com/mango/moshen/decoration/view/widgets/MyDecorationMagicIndicator.java index 7979451de..18b4daeac 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/MyDecorationMagicIndicator.java +++ b/app/src/main/java/com/mango/moshen/decoration/view/widgets/MyDecorationMagicIndicator.java @@ -1,14 +1,14 @@ -package com.yizhuan.erban.decoration.view.widgets; +package com.mango.moshen.decoration.view.widgets; import android.content.Context; import androidx.core.content.ContextCompat; -import com.yizhuan.erban.R; -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.xchat_android_core.home.bean.TabInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.core.home.bean.TabInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/CarShopVm.java b/app/src/main/java/com/mango/moshen/decoration/viewmodel/CarShopVm.java similarity index 57% rename from app/src/main/java/com/yizhuan/erban/decoration/viewmodel/CarShopVm.java rename to app/src/main/java/com/mango/moshen/decoration/viewmodel/CarShopVm.java index 59a3bff6d..8a98e6e9b 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/CarShopVm.java +++ b/app/src/main/java/com/mango/moshen/decoration/viewmodel/CarShopVm.java @@ -1,10 +1,9 @@ -package com.yizhuan.erban.decoration.viewmodel; +package com.mango.moshen.decoration.viewmodel; -import com.yizhuan.erban.base.BaseListViewModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.CarModel; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_library.utils.JavaUtil; +import com.mango.moshen.base.BaseListViewModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.car.CarModel; +import com.mango.core.decoration.car.bean.CarInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/DecorationViewModel.kt b/app/src/main/java/com/mango/moshen/decoration/viewmodel/DecorationViewModel.kt similarity index 76% rename from app/src/main/java/com/yizhuan/erban/decoration/viewmodel/DecorationViewModel.kt rename to app/src/main/java/com/mango/moshen/decoration/viewmodel/DecorationViewModel.kt index af8d18cd5..3f22b4d89 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/DecorationViewModel.kt +++ b/app/src/main/java/com/mango/moshen/decoration/viewmodel/DecorationViewModel.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.decoration.viewmodel +package com.mango.moshen.decoration.viewmodel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.erban.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.decoration.DecorationInfo -import com.yizhuan.xchat_android_core.decoration.DecorationModel -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_core.home.model.HomeModel -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.base.BaseViewModel +import com.mango.core.bean.response.ListResult +import com.mango.core.decoration.DecorationInfo +import com.mango.core.decoration.DecorationModel +import com.mango.core.home.bean.BannerInfo +import com.mango.core.home.model.HomeModel +import com.mango.core.utils.toast class DecorationViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/HeadWearVm.java b/app/src/main/java/com/mango/moshen/decoration/viewmodel/HeadWearVm.java similarity index 70% rename from app/src/main/java/com/yizhuan/erban/decoration/viewmodel/HeadWearVm.java rename to app/src/main/java/com/mango/moshen/decoration/viewmodel/HeadWearVm.java index bedea2efb..dcb89c508 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/HeadWearVm.java +++ b/app/src/main/java/com/mango/moshen/decoration/viewmodel/HeadWearVm.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.decoration.viewmodel; +package com.mango.moshen.decoration.viewmodel; -import com.yizhuan.erban.base.BaseListViewModel; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.HeadwearModel; +import com.mango.moshen.base.BaseListViewModel; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.decoration.headwear.HeadwearModel; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/MyCarVm.java b/app/src/main/java/com/mango/moshen/decoration/viewmodel/MyCarVm.java similarity index 55% rename from app/src/main/java/com/yizhuan/erban/decoration/viewmodel/MyCarVm.java rename to app/src/main/java/com/mango/moshen/decoration/viewmodel/MyCarVm.java index 421cd316b..0b37a8bf1 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/MyCarVm.java +++ b/app/src/main/java/com/mango/moshen/decoration/viewmodel/MyCarVm.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.decoration.viewmodel; +package com.mango.moshen.decoration.viewmodel; -import com.yizhuan.erban.base.BaseListViewModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.CarModel; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; +import com.mango.moshen.base.BaseListViewModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.car.CarModel; +import com.mango.core.decoration.car.bean.CarInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/UserCardWearVm.java b/app/src/main/java/com/mango/moshen/decoration/viewmodel/UserCardWearVm.java similarity index 59% rename from app/src/main/java/com/yizhuan/erban/decoration/viewmodel/UserCardWearVm.java rename to app/src/main/java/com/mango/moshen/decoration/viewmodel/UserCardWearVm.java index 36a1a3c25..28475ba69 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/UserCardWearVm.java +++ b/app/src/main/java/com/mango/moshen/decoration/viewmodel/UserCardWearVm.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.decoration.viewmodel; +package com.mango.moshen.decoration.viewmodel; -import com.yizhuan.erban.base.BaseListViewModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.headwear.HeadwearModel; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo; +import com.mango.moshen.base.BaseListViewModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.headwear.HeadwearModel; +import com.mango.core.decoration.headwear.bean.UserCardWearInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/UserChatBubbleVm.java b/app/src/main/java/com/mango/moshen/decoration/viewmodel/UserChatBubbleVm.java similarity index 54% rename from app/src/main/java/com/yizhuan/erban/decoration/viewmodel/UserChatBubbleVm.java rename to app/src/main/java/com/mango/moshen/decoration/viewmodel/UserChatBubbleVm.java index 2bf95e466..1ecc10cd7 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/UserChatBubbleVm.java +++ b/app/src/main/java/com/mango/moshen/decoration/viewmodel/UserChatBubbleVm.java @@ -1,10 +1,9 @@ -package com.yizhuan.erban.decoration.viewmodel; +package com.mango.moshen.decoration.viewmodel; -import com.yizhuan.erban.base.BaseListViewModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.headwear.HeadwearModel; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.ChatBubbleInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo; +import com.mango.moshen.base.BaseListViewModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.headwear.HeadwearModel; +import com.mango.core.decoration.headwear.bean.ChatBubbleInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/event/OpenRoomIntroEvent.java b/app/src/main/java/com/mango/moshen/event/OpenRoomIntroEvent.java similarity index 52% rename from app/src/main/java/com/yizhuan/erban/event/OpenRoomIntroEvent.java rename to app/src/main/java/com/mango/moshen/event/OpenRoomIntroEvent.java index 06baa9326..d8908cefa 100644 --- a/app/src/main/java/com/yizhuan/erban/event/OpenRoomIntroEvent.java +++ b/app/src/main/java/com/mango/moshen/event/OpenRoomIntroEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.event; +package com.mango.moshen.event; public class OpenRoomIntroEvent { } diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyAttentionFragmentView.java b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyAttentionFragmentView.java similarity index 67% rename from app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyAttentionFragmentView.java rename to app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyAttentionFragmentView.java index 85d603a6c..b0ab61fd4 100644 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyAttentionFragmentView.java +++ b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyAttentionFragmentView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.family.contract.viewinterface; +package com.mango.moshen.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.user.bean.AttentionInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyCurrencySearchView.java b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyCurrencySearchView.java similarity index 52% rename from app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyCurrencySearchView.java rename to app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyCurrencySearchView.java index 2b8b6fe20..a09660438 100644 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyCurrencySearchView.java +++ b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyCurrencySearchView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.family.contract.viewinterface; +package com.mango.moshen.family.contract.viewinterface; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyCurrencyView.java b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyCurrencyView.java similarity index 61% rename from app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyCurrencyView.java rename to app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyCurrencyView.java index f799c9e6a..9c822af21 100644 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyCurrencyView.java +++ b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyCurrencyView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.family.contract.viewinterface; +package com.mango.moshen.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.family.bean.VMBillItemInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyFansListFragmentView.java b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyFansListFragmentView.java similarity index 64% rename from app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyFansListFragmentView.java rename to app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyFansListFragmentView.java index 94bbe5da7..7449e0432 100644 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyFansListFragmentView.java +++ b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyFansListFragmentView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.family.contract.viewinterface; +package com.mango.moshen.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.user.bean.FansListInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyFriendListFragmentView.java b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyFriendListFragmentView.java similarity index 66% rename from app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyFriendListFragmentView.java rename to app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyFriendListFragmentView.java index c57260313..9e1cf107e 100644 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyFriendListFragmentView.java +++ b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyFriendListFragmentView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.family.contract.viewinterface; +package com.mango.moshen.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyGameListActivityView.java b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyGameListActivityView.java similarity index 59% rename from app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyGameListActivityView.java rename to app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyGameListActivityView.java index e1b72c803..8b1fa743e 100644 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyGameListActivityView.java +++ b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyGameListActivityView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.family.contract.viewinterface; +package com.mango.moshen.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.family.bean.FamilyGameInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyInfoView.java b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyInfoView.java similarity index 50% rename from app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyInfoView.java rename to app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyInfoView.java index aee9a426a..9d4845136 100644 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyInfoView.java +++ b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyInfoView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.family.contract.viewinterface; +package com.mango.moshen.family.contract.viewinterface; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyManageActivityView.java b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyManageActivityView.java similarity index 53% rename from app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyManageActivityView.java rename to app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyManageActivityView.java index bc3c6d4dc..08ca99357 100644 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyManageActivityView.java +++ b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyManageActivityView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.family.contract.viewinterface; +package com.mango.moshen.family.contract.viewinterface; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyMemberListView.java b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyMemberListView.java similarity index 56% rename from app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyMemberListView.java rename to app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyMemberListView.java index d3c47f47d..ebf8f4145 100644 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyMemberListView.java +++ b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyMemberListView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.family.contract.viewinterface; +package com.mango.moshen.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.family.bean.FamilyMemberInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyMemberSearchView.java b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyMemberSearchView.java similarity index 52% rename from app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyMemberSearchView.java rename to app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyMemberSearchView.java index 599b218b7..da2857334 100644 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyMemberSearchView.java +++ b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyMemberSearchView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.family.contract.viewinterface; +package com.mango.moshen.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.family.bean.FamilyMemberInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyPlazaActivityView.java b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyPlazaActivityView.java similarity index 52% rename from app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyPlazaActivityView.java rename to app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyPlazaActivityView.java index ad66b3313..94857a089 100644 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyPlazaActivityView.java +++ b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilyPlazaActivityView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.family.contract.viewinterface; +package com.mango.moshen.family.contract.viewinterface; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilySearchView.java b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilySearchView.java similarity index 50% rename from app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilySearchView.java rename to app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilySearchView.java index a92f1e3ca..3305d6163 100644 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilySearchView.java +++ b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilySearchView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.family.contract.viewinterface; +package com.mango.moshen.family.contract.viewinterface; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilySelectFriendActivityView.java b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilySelectFriendActivityView.java similarity index 53% rename from app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilySelectFriendActivityView.java rename to app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilySelectFriendActivityView.java index 987dad727..5effdb563 100644 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilySelectFriendActivityView.java +++ b/app/src/main/java/com/mango/moshen/family/contract/viewinterface/IFamilySelectFriendActivityView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.family.contract.viewinterface; +package com.mango.moshen.family.contract.viewinterface; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyAttentionPresenter.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilyAttentionPresenter.java similarity index 81% rename from app/src/main/java/com/yizhuan/erban/family/presenter/FamilyAttentionPresenter.java rename to app/src/main/java/com/mango/moshen/family/presenter/FamilyAttentionPresenter.java index 76811eef5..0ef8f4a28 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyAttentionPresenter.java +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilyAttentionPresenter.java @@ -1,13 +1,11 @@ -package com.yizhuan.erban.family.presenter; +package com.mango.moshen.family.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyAttentionFragmentView; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.family.contract.viewinterface.IFamilyAttentionFragmentView; +import com.mango.core.user.AttentionModel; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.user.bean.AttentionInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyCurrencyPresenter.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilyCurrencyPresenter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/family/presenter/FamilyCurrencyPresenter.java rename to app/src/main/java/com/mango/moshen/family/presenter/FamilyCurrencyPresenter.java index aa7cc232c..0489d743b 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyCurrencyPresenter.java +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilyCurrencyPresenter.java @@ -1,24 +1,24 @@ -package com.yizhuan.erban.family.presenter; +package com.mango.moshen.family.presenter; import android.os.Bundle; import androidx.annotation.NonNull; import androidx.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.family.bean.BillDateDivInfo; -import com.yizhuan.xchat_android_core.family.bean.TransactionRecordInfo; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.MonthlyRecord; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.TradeMoneyRecord; -import com.yizhuan.xchat_android_core.family.event.FamilyCurrencyUpdateEvent; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -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.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.family.contract.viewinterface.IFamilyCurrencyView; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.family.bean.BillDateDivInfo; +import com.mango.core.family.bean.TransactionRecordInfo; +import com.mango.core.family.bean.VMBillItemInfo; +import com.mango.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.mango.core.family.bean.response.moneyManagement.MonthlyRecord; +import com.mango.core.family.bean.response.moneyManagement.TradeMoneyRecord; +import com.mango.core.family.event.FamilyCurrencyUpdateEvent; +import com.mango.core.family.model.FamilyModel; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.rxbus.RxBusHelper; +import com.mango.xchat_android_library.utils.ListUtils; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyFansListPresenter.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilyFansListPresenter.java similarity index 80% rename from app/src/main/java/com/yizhuan/erban/family/presenter/FamilyFansListPresenter.java rename to app/src/main/java/com/mango/moshen/family/presenter/FamilyFansListPresenter.java index 2bf257e3b..6aa87c262 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyFansListPresenter.java +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilyFansListPresenter.java @@ -1,14 +1,12 @@ -package com.yizhuan.erban.family.presenter; +package com.mango.moshen.family.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyFansListFragmentView; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.family.contract.viewinterface.IFamilyFansListFragmentView; +import com.mango.core.user.AttentionModel; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; +import com.mango.core.user.bean.FansListInfo; import io.reactivex.SingleObserver; diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyFriendListPresenter.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilyFriendListPresenter.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/family/presenter/FamilyFriendListPresenter.java rename to app/src/main/java/com/mango/moshen/family/presenter/FamilyFriendListPresenter.java index bb95a925b..c788061e5 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyFriendListPresenter.java +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilyFriendListPresenter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.family.presenter; +package com.mango.moshen.family.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyFriendListFragmentView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.family.contract.viewinterface.IFamilyFriendListFragmentView; +import com.mango.core.Constants; +import com.mango.core.im.friend.IMFriendModel; +import com.mango.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyGameListPresenter.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilyGameListPresenter.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/family/presenter/FamilyGameListPresenter.java rename to app/src/main/java/com/mango/moshen/family/presenter/FamilyGameListPresenter.java index 559e4e4c3..8b0a423f3 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyGameListPresenter.java +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilyGameListPresenter.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.family.presenter; +package com.mango.moshen.family.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyGameListActivityView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.family.contract.viewinterface.IFamilyGameListActivityView; +import com.mango.core.Constants; +import com.mango.core.family.bean.FamilyGameInfo; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.model.FamilyModel; +import com.mango.xchat_android_library.base.PresenterEvent; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyHomePresenter.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilyHomePresenter.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/family/presenter/FamilyHomePresenter.java rename to app/src/main/java/com/mango/moshen/family/presenter/FamilyHomePresenter.java index e8d81e580..d79b2d934 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyHomePresenter.java +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilyHomePresenter.java @@ -1,17 +1,17 @@ -package com.yizhuan.erban.family.presenter; +package com.mango.moshen.family.presenter; import android.os.Bundle; import androidx.annotation.Nullable; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -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.event.FamilyUpdateEvent; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.erban.home.view.IFamilyHomeActivityView; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.event.FamilyCurrencyUpdateEvent; +import com.mango.core.family.event.FamilyMemberUpdateEvent; +import com.mango.core.family.event.FamilyUpdateEvent; +import com.mango.core.family.model.FamilyModel; +import com.mango.moshen.home.view.IFamilyHomeActivityView; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.rxbus.RxBusHelper; import io.reactivex.Single; import io.reactivex.SingleSource; diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyInfoPresenter.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilyInfoPresenter.java similarity index 77% rename from app/src/main/java/com/yizhuan/erban/family/presenter/FamilyInfoPresenter.java rename to app/src/main/java/com/mango/moshen/family/presenter/FamilyInfoPresenter.java index 323178220..81f2c1dfe 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyInfoPresenter.java +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilyInfoPresenter.java @@ -1,16 +1,12 @@ -package com.yizhuan.erban.family.presenter; +package com.mango.moshen.family.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyInfoView; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -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.model.FamilyModel; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.family.contract.viewinterface.IFamilyInfoView; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.model.FamilyModel; import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.functions.Function; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyListPresenter.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilyListPresenter.java similarity index 65% rename from app/src/main/java/com/yizhuan/erban/family/presenter/FamilyListPresenter.java rename to app/src/main/java/com/mango/moshen/family/presenter/FamilyListPresenter.java index 20ea35051..a605a41d0 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyListPresenter.java +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilyListPresenter.java @@ -1,13 +1,12 @@ -package com.yizhuan.erban.family.presenter; +package com.mango.moshen.family.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilySearchView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.family.bean.response.RankingFamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.family.contract.viewinterface.IFamilySearchView; +import com.mango.core.Constants; +import com.mango.core.family.bean.response.RankingFamilyInfo; +import com.mango.core.family.bean.response.RespFamilyRankList; +import com.mango.core.family.model.FamilyModel; +import com.mango.xchat_android_library.base.PresenterEvent; import java.util.List; diff --git a/app/src/main/java/com/mango/moshen/family/presenter/FamilyManagePresenter.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilyManagePresenter.java new file mode 100644 index 000000000..6f54c8d40 --- /dev/null +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilyManagePresenter.java @@ -0,0 +1,14 @@ +package com.mango.moshen.family.presenter; + +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.family.contract.viewinterface.IFamilyManageActivityView; + +/** + * @author jack + * @Description + * @Date 2018/5/25 + */ + +public class FamilyManagePresenter extends BaseMvpPresenter { + +} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberCurrencyPresenter.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilyMemberCurrencyPresenter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberCurrencyPresenter.java rename to app/src/main/java/com/mango/moshen/family/presenter/FamilyMemberCurrencyPresenter.java index 1f2b23d0c..9b1e4571f 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberCurrencyPresenter.java +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilyMemberCurrencyPresenter.java @@ -1,20 +1,20 @@ -package com.yizhuan.erban.family.presenter; +package com.mango.moshen.family.presenter; import android.os.Bundle; import androidx.annotation.NonNull; import androidx.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.family.bean.BillDateDivInfo; -import com.yizhuan.xchat_android_core.family.bean.TransactionRecordInfo; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.MonthlyRecord; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.TradeMoneyRecord; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.family.contract.viewinterface.IFamilyCurrencyView; +import com.mango.core.Constants; +import com.mango.core.family.bean.BillDateDivInfo; +import com.mango.core.family.bean.TransactionRecordInfo; +import com.mango.core.family.bean.VMBillItemInfo; +import com.mango.core.family.bean.response.moneyManagement.MonthlyRecord; +import com.mango.core.family.bean.response.moneyManagement.TradeMoneyRecord; +import com.mango.core.family.model.FamilyModel; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.utils.ListUtils; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberListPresenter.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilyMemberListPresenter.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberListPresenter.java rename to app/src/main/java/com/mango/moshen/family/presenter/FamilyMemberListPresenter.java index 60fe1daf7..6250066f3 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberListPresenter.java +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilyMemberListPresenter.java @@ -1,18 +1,18 @@ -package com.yizhuan.erban.family.presenter; +package com.mango.moshen.family.presenter; import android.os.Bundle; import androidx.annotation.Nullable; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyMemberListView; -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.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.FamilyMemberUpdateEvent; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.family.contract.viewinterface.IFamilyMemberListView; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.rxbus.RxBusHelper; +import com.mango.core.Constants; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.bean.FamilyMemberInfo; +import com.mango.core.family.bean.response.memberList.RespFamilymember; +import com.mango.core.family.event.FamilyMemberUpdateEvent; +import com.mango.core.family.model.FamilyModel; import io.reactivex.Single; import io.reactivex.SingleSource; diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberSearchPresenter.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilyMemberSearchPresenter.java similarity index 73% rename from app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberSearchPresenter.java rename to app/src/main/java/com/mango/moshen/family/presenter/FamilyMemberSearchPresenter.java index 243df0bca..1988cc5ce 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberSearchPresenter.java +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilyMemberSearchPresenter.java @@ -1,18 +1,13 @@ -package com.yizhuan.erban.family.presenter; +package com.mango.moshen.family.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyMemberSearchView; -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.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; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.family.contract.viewinterface.IFamilyMemberSearchView; +import com.mango.core.Constants; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.bean.FamilyMemberInfo; +import com.mango.core.family.bean.response.memberList.RespFamilymember; +import com.mango.core.family.model.FamilyModel; +import com.mango.xchat_android_library.base.PresenterEvent; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyPlazaPresenter.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilyPlazaPresenter.java similarity index 57% rename from app/src/main/java/com/yizhuan/erban/family/presenter/FamilyPlazaPresenter.java rename to app/src/main/java/com/mango/moshen/family/presenter/FamilyPlazaPresenter.java index e348782b8..7eba7ba77 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyPlazaPresenter.java +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilyPlazaPresenter.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.family.presenter; +package com.mango.moshen.family.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyPlazaActivityView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.family.contract.viewinterface.IFamilyPlazaActivityView; +import com.mango.core.Constants; +import com.mango.core.family.bean.response.RespFamilyRankList; +import com.mango.core.family.model.FamilyModel; +import com.mango.xchat_android_library.base.PresenterEvent; import io.reactivex.Single; diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySearchPresent.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilySearchPresent.java similarity index 74% rename from app/src/main/java/com/yizhuan/erban/family/presenter/FamilySearchPresent.java rename to app/src/main/java/com/mango/moshen/family/presenter/FamilySearchPresent.java index 444363022..ed8aa59a7 100644 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySearchPresent.java +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilySearchPresent.java @@ -1,14 +1,12 @@ -package com.yizhuan.erban.family.presenter; +package com.mango.moshen.family.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilySearchView; -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.FamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.response.familyPlaza.RespFamily; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.family.contract.viewinterface.IFamilySearchView; +import com.mango.core.Constants; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.bean.response.familyPlaza.RespFamily; +import com.mango.core.family.model.FamilyModel; +import com.mango.xchat_android_library.base.PresenterEvent; import java.util.List; diff --git a/app/src/main/java/com/mango/moshen/family/presenter/FamilySelectFriendPresenter.java b/app/src/main/java/com/mango/moshen/family/presenter/FamilySelectFriendPresenter.java new file mode 100644 index 000000000..17ff33b5a --- /dev/null +++ b/app/src/main/java/com/mango/moshen/family/presenter/FamilySelectFriendPresenter.java @@ -0,0 +1,14 @@ +package com.mango.moshen.family.presenter; + + +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.family.contract.viewinterface.IFamilySelectFriendActivityView; + +/** + * @author jack + * @Description + * @Date 2018/7/4 + */ + +public class FamilySelectFriendPresenter extends BaseMvpPresenter { +} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyCurrencyActivity.java b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyCurrencyActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyCurrencyActivity.java rename to app/src/main/java/com/mango/moshen/family/view/activity/FamilyCurrencyActivity.java index 45626a6c2..45dda3eee 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyCurrencyActivity.java +++ b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyCurrencyActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.activity; +package com.mango.moshen.family.view.activity; import android.content.Context; import android.content.DialogInterface; @@ -22,21 +22,21 @@ import com.jay.widget.StickyHeadersLinearLayoutManager; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.jzxiang.pickerview.listener.OnDateSetListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyCurrencyView; -import com.yizhuan.erban.family.view.adapter.FamilyCurrencyBillAdapter; -import com.yizhuan.erban.family.view.dialog.FamilyContributionDialog; -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.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; -import com.yizhuan.erban.family.presenter.FamilyCurrencyPresenter; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.family.contract.viewinterface.IFamilyCurrencyView; +import com.mango.moshen.family.view.adapter.FamilyCurrencyBillAdapter; +import com.mango.moshen.family.view.dialog.FamilyContributionDialog; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.core.Constants; +import com.mango.core.UriProvider; +import com.mango.core.family.bean.FamilyMemberInfo; +import com.mango.core.family.bean.VMBillItemInfo; +import com.mango.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.mango.moshen.family.presenter.FamilyCurrencyPresenter; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyGameListActivity.java b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyGameListActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyGameListActivity.java rename to app/src/main/java/com/mango/moshen/family/view/activity/FamilyGameListActivity.java index 5ab2782ad..4b7919728 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyGameListActivity.java +++ b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyGameListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.activity; +package com.mango.moshen.family.view.activity; import android.app.Activity; import android.content.Intent; @@ -14,18 +14,18 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyGameListActivityView; -import com.yizhuan.erban.family.presenter.FamilyGameListPresenter; -import com.yizhuan.erban.family.view.adapter.FamilyGameListAdapter; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.family.contract.viewinterface.IFamilyGameListActivityView; +import com.mango.moshen.family.presenter.FamilyGameListPresenter; +import com.mango.moshen.family.view.adapter.FamilyGameListAdapter; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.core.Constants; +import com.mango.core.family.bean.FamilyGameInfo; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.model.FamilyModel; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyHomeActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java rename to app/src/main/java/com/mango/moshen/family/view/activity/FamilyHomeActivity.java index f7a5c95ba..9bec8be0a 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java +++ b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyHomeActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.activity; +package com.mango.moshen.family.view.activity; import android.content.Context; import android.content.DialogInterface; @@ -20,48 +20,48 @@ import android.widget.TextView; import com.makeramen.roundedimageview.RoundedImageView; import com.netease.nim.uikit.support.glide.GlideApp; import com.trello.rxlifecycle3.android.ActivityEvent; -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.constants.BundleKeys; -import com.yizhuan.erban.family.presenter.FamilyHomePresenter; -import com.yizhuan.erban.family.view.adapter.FamilyGamesAdapter; -import com.yizhuan.erban.family.view.adapter.FamilyGroupAdapter; -import com.yizhuan.erban.family.view.adapter.FamilyMemberAdapter; -import com.yizhuan.erban.family.view.dialog.FamilyDisbandDialog; -import com.yizhuan.erban.family.view.dialog.FamilyGuideDialog; -import com.yizhuan.erban.family.view.dialog.FamilyJoinDialog; -import com.yizhuan.erban.family.view.dialog.FamilyMenuDialog; -import com.yizhuan.erban.family.view.fragment.FamilyEmptyFragment; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.home.view.IFamilyHomeActivityView; -import com.yizhuan.erban.team.view.CreateTeamMessageActivity; -import com.yizhuan.erban.team.view.NimTeamMessageActivity; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.ShareDialog; -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.FullyLinearLayoutManager; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyGroupInfo; -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.model.FamilyModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.share.ShareModel; -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.utils.SharedPreferenceUtils; -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.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.log.MLog; -import com.yizhuan.xchat_android_library.widget.DrawableCenterTextView; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.constants.BundleKeys; +import com.mango.moshen.family.presenter.FamilyHomePresenter; +import com.mango.moshen.family.view.adapter.FamilyGamesAdapter; +import com.mango.moshen.family.view.adapter.FamilyGroupAdapter; +import com.mango.moshen.family.view.adapter.FamilyMemberAdapter; +import com.mango.moshen.family.view.dialog.FamilyDisbandDialog; +import com.mango.moshen.family.view.dialog.FamilyGuideDialog; +import com.mango.moshen.family.view.dialog.FamilyJoinDialog; +import com.mango.moshen.family.view.dialog.FamilyMenuDialog; +import com.mango.moshen.family.view.fragment.FamilyEmptyFragment; +import com.mango.moshen.friend.view.SelectFriendActivity; +import com.mango.moshen.home.view.IFamilyHomeActivityView; +import com.mango.moshen.team.view.CreateTeamMessageActivity; +import com.mango.moshen.team.view.NimTeamMessageActivity; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.ui.widget.ShareDialog; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.moshen.ui.widget.recyclerview.decoration.ColorDecoration; +import com.mango.moshen.ui.widget.recyclerview.layoutmanager.FullyLinearLayoutManager; +import com.mango.core.family.bean.FamilyGameInfo; +import com.mango.core.family.bean.FamilyGroupInfo; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.bean.FamilyMemberInfo; +import com.mango.core.family.model.FamilyModel; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.share.ShareModel; +import com.mango.core.share.bean.SessionType; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.widget.DrawableCenterTextView; import cn.sharesdk.framework.Platform; import io.reactivex.SingleObserver; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyInfoActivity.java b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyInfoActivity.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyInfoActivity.java rename to app/src/main/java/com/mango/moshen/family/view/activity/FamilyInfoActivity.java index a7b06e4b1..90308cfbf 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyInfoActivity.java +++ b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyInfoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.activity; +package com.mango.moshen.family.view.activity; import android.annotation.SuppressLint; import android.app.Activity; @@ -11,18 +11,18 @@ import android.widget.TextView; import com.jph.takephoto.model.TResult; import com.makeramen.roundedimageview.RoundedImageView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.ErbanTakePhotoActivity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyInfoView; -import com.yizhuan.erban.family.presenter.FamilyInfoPresenter; -import com.yizhuan.erban.family.view.dialog.FamilyDisbandDialog; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.file.FileModel; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; +import com.mango.moshen.ErbanTakePhotoActivity; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.family.contract.viewinterface.IFamilyInfoView; +import com.mango.moshen.family.presenter.FamilyInfoPresenter; +import com.mango.moshen.family.view.dialog.FamilyDisbandDialog; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.model.FamilyModel; +import com.mango.core.file.FileModel; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.widget.IOSSwitchView; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyListActivity.java b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyListActivity.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyListActivity.java rename to app/src/main/java/com/mango/moshen/family/view/activity/FamilyListActivity.java index d8275c577..3f7b198c2 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyListActivity.java +++ b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.activity; +package com.mango.moshen.family.view.activity; import android.content.Context; import android.content.Intent; @@ -8,17 +8,17 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import android.view.View; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.family.contract.viewinterface.IFamilySearchView; -import com.yizhuan.erban.family.presenter.FamilyListPresenter; -import com.yizhuan.erban.family.view.adapter.FamilyWeeklyRankBoardAdapter; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.family.bean.response.RankingFamilyInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.family.contract.viewinterface.IFamilySearchView; +import com.mango.moshen.family.presenter.FamilyListPresenter; +import com.mango.moshen.family.view.adapter.FamilyWeeklyRankBoardAdapter; +import com.mango.moshen.ui.widget.recyclerview.decoration.ColorDecoration; +import com.mango.core.family.bean.response.RankingFamilyInfo; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SizeUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyManageActivity.java b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyManageActivity.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyManageActivity.java rename to app/src/main/java/com/mango/moshen/family/view/activity/FamilyManageActivity.java index 1e54df036..8fe901c39 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyManageActivity.java +++ b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyManageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.activity; +package com.mango.moshen.family.view.activity; import android.content.Context; import android.content.Intent; @@ -9,14 +9,14 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -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.xchat_android_core.family.bean.FamilyManageItemInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.erban.family.presenter.FamilyManagePresenter; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.family.contract.viewinterface.IFamilyManageActivityView; +import com.mango.moshen.family.view.adapter.FamilyManageAdapter; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.core.family.bean.FamilyManageItemInfo; +import com.mango.core.family.model.FamilyModel; +import com.mango.moshen.family.presenter.FamilyManagePresenter; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberCurrencyActivity.java b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyMemberCurrencyActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberCurrencyActivity.java rename to app/src/main/java/com/mango/moshen/family/view/activity/FamilyMemberCurrencyActivity.java index 9f881f209..c8473c225 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberCurrencyActivity.java +++ b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyMemberCurrencyActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.activity; +package com.mango.moshen.family.view.activity; import android.content.Context; import android.content.Intent; @@ -12,16 +12,16 @@ import com.jay.widget.StickyHeadersLinearLayoutManager; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.jzxiang.pickerview.listener.OnDateSetListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.constants.BundleKeys; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyCurrencyView; -import com.yizhuan.erban.family.view.adapter.FamilyCurrencyBillAdapter; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.erban.family.presenter.FamilyMemberCurrencyPresenter; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.constants.BundleKeys; +import com.mango.moshen.family.contract.viewinterface.IFamilyCurrencyView; +import com.mango.moshen.family.view.adapter.FamilyCurrencyBillAdapter; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.core.Constants; +import com.mango.core.family.bean.VMBillItemInfo; +import com.mango.moshen.family.presenter.FamilyMemberCurrencyPresenter; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberListActivity.java b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyMemberListActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberListActivity.java rename to app/src/main/java/com/mango/moshen/family/view/activity/FamilyMemberListActivity.java index 6f7f3345f..378e259c3 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberListActivity.java +++ b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyMemberListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.activity; +package com.mango.moshen.family.view.activity; import android.app.Activity; import android.content.DialogInterface; @@ -12,19 +12,19 @@ import android.widget.LinearLayout; import android.widget.TextView; 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.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.FamilyTransferDialog; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; -import com.yizhuan.erban.family.presenter.FamilyMemberListPresenter; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.constants.BundleKeys; +import com.mango.moshen.family.contract.viewinterface.IFamilyMemberListView; +import com.mango.moshen.family.view.adapter.FamilyMemberListAdapter; +import com.mango.moshen.family.view.dialog.FamilyTransferDialog; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.core.family.bean.FamilyMemberInfo; +import com.mango.core.family.bean.response.memberList.RespFamilymember; +import com.mango.moshen.family.presenter.FamilyMemberListPresenter; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberSearchActivity.java b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyMemberSearchActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberSearchActivity.java rename to app/src/main/java/com/mango/moshen/family/view/activity/FamilyMemberSearchActivity.java index adb506970..94dfa7f92 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberSearchActivity.java +++ b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyMemberSearchActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.activity; +package com.mango.moshen.family.view.activity; import android.content.Context; import android.content.DialogInterface; @@ -18,19 +18,19 @@ import android.widget.ImageView; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.constants.BundleKeys; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyMemberSearchView; -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.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.erban.family.presenter.FamilyMemberSearchPresenter; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.constants.BundleKeys; +import com.mango.moshen.family.contract.viewinterface.IFamilyMemberSearchView; +import com.mango.moshen.family.view.adapter.FamilyMemberListAdapter; +import com.mango.moshen.family.view.dialog.FamilyRemoveMemberDialog; +import com.mango.moshen.family.view.dialog.FamilyTransferDialog; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.moshen.ui.widget.recyclerview.decoration.ColorDecoration; +import com.mango.core.family.bean.FamilyMemberInfo; +import com.mango.moshen.family.presenter.FamilyMemberSearchPresenter; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyPlazaActivity.java b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyPlazaActivity.java similarity index 81% rename from app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyPlazaActivity.java rename to app/src/main/java/com/mango/moshen/family/view/activity/FamilyPlazaActivity.java index 7dc230ecb..e3022743b 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyPlazaActivity.java +++ b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyPlazaActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.activity; +package com.mango.moshen.family.view.activity; import android.content.Context; import android.content.Intent; @@ -10,22 +10,22 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyPlazaActivityView; -import com.yizhuan.erban.family.view.adapter.FamilyWeeklyRankBoardAdapter; -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; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.erban.ui.widget.recyclerview.layoutmanager.FullyLinearLayoutManager; -import com.yizhuan.xchat_android_core.family.bean.response.RankingFamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList; -import com.yizhuan.erban.family.presenter.FamilyPlazaPresenter; -import com.yizhuan.xchat_android_library.utils.SizeUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.family.contract.viewinterface.IFamilyPlazaActivityView; +import com.mango.moshen.family.view.adapter.FamilyWeeklyRankBoardAdapter; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.ui.widget.recyclerview.decoration.ColorDecoration; +import com.mango.moshen.ui.widget.recyclerview.layoutmanager.FullyLinearLayoutManager; +import com.mango.core.family.bean.response.RankingFamilyInfo; +import com.mango.core.family.bean.response.RespFamilyRankList; +import com.mango.moshen.family.presenter.FamilyPlazaPresenter; +import com.mango.xchat_android_library.utils.SizeUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySearchActivity.java b/app/src/main/java/com/mango/moshen/family/view/activity/FamilySearchActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySearchActivity.java rename to app/src/main/java/com/mango/moshen/family/view/activity/FamilySearchActivity.java index 558411c0d..743d0463b 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySearchActivity.java +++ b/app/src/main/java/com/mango/moshen/family/view/activity/FamilySearchActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.activity; +package com.mango.moshen.family.view.activity; import android.content.Context; import android.content.Intent; @@ -17,16 +17,16 @@ import android.widget.ImageView; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.family.contract.viewinterface.IFamilySearchView; -import com.yizhuan.erban.family.view.adapter.FamilyAdapter; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.erban.family.presenter.FamilySearchPresent; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.family.contract.viewinterface.IFamilySearchView; +import com.mango.moshen.family.view.adapter.FamilyAdapter; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.ui.widget.recyclerview.decoration.ColorDecoration; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.moshen.family.presenter.FamilySearchPresent; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySelectFriendActivity.java b/app/src/main/java/com/mango/moshen/family/view/activity/FamilySelectFriendActivity.java similarity index 79% rename from app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySelectFriendActivity.java rename to app/src/main/java/com/mango/moshen/family/view/activity/FamilySelectFriendActivity.java index 6ae005d23..8a15b6f1d 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySelectFriendActivity.java +++ b/app/src/main/java/com/mango/moshen/family/view/activity/FamilySelectFriendActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.activity; +package com.mango.moshen.family.view.activity; import android.app.Activity; import android.content.Context; @@ -8,23 +8,23 @@ import android.os.Bundle; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.decoration.view.widgets.CarMagicIndicator; -import com.yizhuan.erban.common.ViewPagerAdapter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilySelectFriendActivityView; -import com.yizhuan.erban.family.view.dialog.FamilyInviteConfirmDialog; -import com.yizhuan.erban.family.view.fragment.FamilyAttentionFragment; -import com.yizhuan.erban.family.view.fragment.FamilyFansListFragment; -import com.yizhuan.erban.family.view.fragment.FamilyFriendListFragment; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -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.erban.family.presenter.FamilySelectFriendPresenter; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.decoration.view.widgets.CarMagicIndicator; +import com.mango.moshen.common.ViewPagerAdapter; +import com.mango.moshen.family.contract.viewinterface.IFamilySelectFriendActivityView; +import com.mango.moshen.family.view.dialog.FamilyInviteConfirmDialog; +import com.mango.moshen.family.view.fragment.FamilyAttentionFragment; +import com.mango.moshen.family.view.fragment.FamilyFansListFragment; +import com.mango.moshen.family.view.fragment.FamilyFriendListFragment; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.moshen.family.presenter.FamilySelectFriendPresenter; +import com.mango.core.home.bean.TabInfo; +import com.mango.core.user.bean.UserInfo; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyTextInputActivity.java b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyTextInputActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyTextInputActivity.java rename to app/src/main/java/com/mango/moshen/family/view/activity/FamilyTextInputActivity.java index e9888fc88..d2a605bb2 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyTextInputActivity.java +++ b/app/src/main/java/com/mango/moshen/family/view/activity/FamilyTextInputActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.activity; +package com.mango.moshen.family.view.activity; import android.content.Context; import android.content.Intent; @@ -6,11 +6,11 @@ import android.os.Bundle; import android.view.View; import android.widget.EditText; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.constants.BundleKeys; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.constants.BundleKeys; +import com.mango.xchat_android_library.base.IMvpBaseView; public class FamilyTextInputActivity extends BaseMvpActivity implements IMvpBaseView{ diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAdapter.java b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAdapter.java rename to app/src/main/java/com/mango/moshen/family/view/adapter/FamilyAdapter.java index 8ba51ce0e..54aaa5f41 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAdapter.java +++ b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.adapter; +package com.mango.moshen.family.view.adapter; import android.content.Context; import androidx.annotation.Nullable; @@ -9,9 +9,9 @@ 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.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.SquareImageView; +import com.mango.core.family.bean.FamilyInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAttentionListAdapter.java b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyAttentionListAdapter.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAttentionListAdapter.java rename to app/src/main/java/com/mango/moshen/family/view/adapter/FamilyAttentionListAdapter.java index 9d3d8959a..15a189fd8 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAttentionListAdapter.java +++ b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyAttentionListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.adapter; +package com.mango.moshen.family.view.adapter; import androidx.appcompat.widget.AppCompatImageView; import android.text.TextUtils; @@ -6,11 +6,11 @@ import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.NobleAvatarView; +import com.mango.core.noble.NobleUtil; +import com.mango.core.user.bean.AttentionInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyBannerAdapter.java b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyBannerAdapter.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyBannerAdapter.java rename to app/src/main/java/com/mango/moshen/family/view/adapter/FamilyBannerAdapter.java index 38b444250..a262437fc 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyBannerAdapter.java +++ b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyBannerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.adapter; +package com.mango.moshen.family.view.adapter; import android.content.Context; import android.text.TextUtils; @@ -7,13 +7,13 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapter; +import com.mango.moshen.ui.widget.rollviewpager.adapter.StaticPagerAdapter; 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.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.family.bean.FindBannerInfo; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.core.family.bean.FindBannerInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyCurrencyBillAdapter.java b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyCurrencyBillAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyCurrencyBillAdapter.java rename to app/src/main/java/com/mango/moshen/family/view/adapter/FamilyCurrencyBillAdapter.java index 0744f228b..d0302b027 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyCurrencyBillAdapter.java +++ b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyCurrencyBillAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.adapter; +package com.mango.moshen.family.view.adapter; import android.content.Context; import androidx.annotation.Nullable; @@ -9,13 +9,13 @@ import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.jay.widget.StickyHeaders; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.erban.ui.widget.UserInfoDialog; -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; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.moshen.ui.widget.UserInfoDialog; +import com.mango.core.family.bean.BillDateDivInfo; +import com.mango.core.family.bean.TransactionRecordInfo; +import com.mango.core.family.bean.VMBillItemInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFansViewAdapter.java b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyFansViewAdapter.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFansViewAdapter.java rename to app/src/main/java/com/mango/moshen/family/view/adapter/FamilyFansViewAdapter.java index d8fd433e6..b3926e246 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFansViewAdapter.java +++ b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyFansViewAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.adapter; +package com.mango.moshen.family.view.adapter; import androidx.appcompat.widget.AppCompatImageView; import android.text.TextUtils; @@ -6,11 +6,11 @@ import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.NobleAvatarView; +import com.mango.core.noble.NobleUtil; +import com.mango.core.user.bean.FansInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFriendListAdapter.java b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyFriendListAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFriendListAdapter.java rename to app/src/main/java/com/mango/moshen/family/view/adapter/FamilyFriendListAdapter.java index 4b3223296..537106e36 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFriendListAdapter.java +++ b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyFriendListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.adapter; +package com.mango.moshen.family.view.adapter; import android.content.Context; import androidx.annotation.Nullable; @@ -8,11 +8,11 @@ import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.NobleAvatarView; +import com.mango.core.noble.NobleUtil; +import com.mango.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGameListAdapter.java b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyGameListAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGameListAdapter.java rename to app/src/main/java/com/mango/moshen/family/view/adapter/FamilyGameListAdapter.java index 08c3367a8..140c4147d 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGameListAdapter.java +++ b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyGameListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.adapter; +package com.mango.moshen.family.view.adapter; import android.content.Context; import androidx.annotation.Nullable; @@ -9,8 +9,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.makeramen.roundedimageview.RoundedImageView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; +import com.mango.moshen.R; +import com.mango.core.family.bean.FamilyGameInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGamesAdapter.java b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyGamesAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGamesAdapter.java rename to app/src/main/java/com/mango/moshen/family/view/adapter/FamilyGamesAdapter.java index 05ac6d40f..ea99fe440 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGamesAdapter.java +++ b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyGamesAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.adapter; +package com.mango.moshen.family.view.adapter; import android.content.Context; import androidx.annotation.Nullable; @@ -9,8 +9,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.makeramen.roundedimageview.RoundedImageView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; +import com.mango.moshen.R; +import com.mango.core.family.bean.FamilyGameInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGroupAdapter.java b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyGroupAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGroupAdapter.java rename to app/src/main/java/com/mango/moshen/family/view/adapter/FamilyGroupAdapter.java index 274dc68b3..de6f1229d 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGroupAdapter.java +++ b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyGroupAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.adapter; +package com.mango.moshen.family.view.adapter; import android.content.Context; import androidx.annotation.Nullable; @@ -12,9 +12,9 @@ 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.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.FamilyGroupInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.SquareImageView; +import com.mango.core.family.bean.FamilyGroupInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyManageAdapter.java b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyManageAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyManageAdapter.java rename to app/src/main/java/com/mango/moshen/family/view/adapter/FamilyManageAdapter.java index 37c9264e7..9dd722f38 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyManageAdapter.java +++ b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyManageAdapter.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.family.view.adapter; +package com.mango.moshen.family.view.adapter; import androidx.annotation.Nullable; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.FamilyManageItemInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.SquareImageView; +import com.mango.core.family.bean.FamilyManageItemInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberAdapter.java b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyMemberAdapter.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberAdapter.java rename to app/src/main/java/com/mango/moshen/family/view/adapter/FamilyMemberAdapter.java index 60e47f17d..0bb2ce99f 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberAdapter.java +++ b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyMemberAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.adapter; +package com.mango.moshen.family.view.adapter; import android.content.Context; import androidx.annotation.Nullable; @@ -11,10 +11,10 @@ import android.widget.TextView; 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.common.widget.CircleImageView; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.core.family.bean.FamilyMemberInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberListAdapter.java b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyMemberListAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberListAdapter.java rename to app/src/main/java/com/mango/moshen/family/view/adapter/FamilyMemberListAdapter.java index 34cbe9f11..1cfd74113 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberListAdapter.java +++ b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyMemberListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.adapter; +package com.mango.moshen.family.view.adapter; import android.content.Context; import androidx.annotation.Nullable; @@ -11,12 +11,12 @@ import android.widget.TextView; 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.common.widget.CircleImageView; -import com.yizhuan.erban.family.view.activity.FamilyMemberListActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.family.view.activity.FamilyMemberListActivity; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.family.bean.FamilyMemberInfo; +import com.mango.core.level.UserLevelVo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyWeeklyRankBoardAdapter.java b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyWeeklyRankBoardAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyWeeklyRankBoardAdapter.java rename to app/src/main/java/com/mango/moshen/family/view/adapter/FamilyWeeklyRankBoardAdapter.java index ebe5e282d..211be7522 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyWeeklyRankBoardAdapter.java +++ b/app/src/main/java/com/mango/moshen/family/view/adapter/FamilyWeeklyRankBoardAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.adapter; +package com.mango.moshen.family.view.adapter; import android.content.Context; import androidx.annotation.Nullable; @@ -10,10 +10,10 @@ 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.xchat_android_library.utils.FormatUtils; -import com.yizhuan.erban.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.response.RankingFamilyInfo; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.moshen.ui.widget.SquareImageView; +import com.mango.core.family.bean.response.RankingFamilyInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyContributionDialog.java b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyContributionDialog.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyContributionDialog.java rename to app/src/main/java/com/mango/moshen/family/view/dialog/FamilyContributionDialog.java index b86940be1..d5a8a6e60 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyContributionDialog.java +++ b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyContributionDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.dialog; +package com.mango.moshen.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -12,11 +12,11 @@ import android.view.View; import android.widget.EditText; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; -import com.yizhuan.xchat_android_library.utils.ImeUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.mango.xchat_android_library.utils.ImeUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyDisbandDialog.java b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyDisbandDialog.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyDisbandDialog.java rename to app/src/main/java/com/mango/moshen/family/view/dialog/FamilyDisbandDialog.java index e8163d4be..cbe91345b 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyDisbandDialog.java +++ b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyDisbandDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.dialog; +package com.mango.moshen.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -6,12 +6,12 @@ import android.os.Bundle; import androidx.annotation.NonNull; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.xchat_android_core.family.bean.CustomServiceInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyCustomServiceInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.im.avtivity.NimP2PMessageActivity; +import com.mango.core.family.bean.CustomServiceInfo; +import com.mango.core.family.bean.FamilyCustomServiceInfo; +import com.mango.core.family.model.FamilyModel; +import com.mango.xchat_android_library.utils.SingleToastUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyExitTipDialog.java b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyExitTipDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyExitTipDialog.java rename to app/src/main/java/com/mango/moshen/family/view/dialog/FamilyExitTipDialog.java index e0007ddfd..f5d41cb64 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyExitTipDialog.java +++ b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyExitTipDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.dialog; +package com.mango.moshen.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -7,8 +7,8 @@ import androidx.annotation.NonNull; import android.view.View; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.mango.moshen.R; +import com.mango.core.family.bean.FamilyInfo; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyGuideDialog.java b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyGuideDialog.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyGuideDialog.java rename to app/src/main/java/com/mango/moshen/family/view/dialog/FamilyGuideDialog.java index d9b8277c8..ac09b9b51 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyGuideDialog.java +++ b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyGuideDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.dialog; +package com.mango.moshen.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -11,7 +11,7 @@ import android.view.WindowManager; import android.widget.ImageView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyInviteConfirmDialog.java b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyInviteConfirmDialog.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyInviteConfirmDialog.java rename to app/src/main/java/com/mango/moshen/family/view/dialog/FamilyInviteConfirmDialog.java index e4d02cc97..ecba4969b 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyInviteConfirmDialog.java +++ b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyInviteConfirmDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.dialog; +package com.mango.moshen.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -9,8 +9,8 @@ import android.view.View; import android.widget.TextView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyJoinDialog.java b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyJoinDialog.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyJoinDialog.java rename to app/src/main/java/com/mango/moshen/family/view/dialog/FamilyJoinDialog.java index 17524318b..7fd4ce723 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyJoinDialog.java +++ b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyJoinDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.dialog; +package com.mango.moshen.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -9,8 +9,8 @@ import android.view.View; import android.widget.EditText; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.ImeUtil; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.ImeUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyMenuDialog.java b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyMenuDialog.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyMenuDialog.java rename to app/src/main/java/com/mango/moshen/family/view/dialog/FamilyMenuDialog.java index 3e6e0c2a3..72aa8843d 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyMenuDialog.java +++ b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyMenuDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.dialog; +package com.mango.moshen.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -11,10 +11,10 @@ import android.view.View; import android.view.Window; import android.view.WindowManager; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_library.utils.SizeUtils; -import com.yizhuan.xchat_android_library.widget.DrawableCenterTextView; +import com.mango.moshen.R; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.xchat_android_library.utils.SizeUtils; +import com.mango.xchat_android_library.widget.DrawableCenterTextView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyRemoveMemberDialog.java b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyRemoveMemberDialog.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyRemoveMemberDialog.java rename to app/src/main/java/com/mango/moshen/family/view/dialog/FamilyRemoveMemberDialog.java index 40116c062..c6aa36ce5 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyRemoveMemberDialog.java +++ b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyRemoveMemberDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.dialog; +package com.mango.moshen.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -8,8 +8,8 @@ import androidx.annotation.NonNull; import android.view.View; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.mango.moshen.R; +import com.mango.core.family.bean.FamilyMemberInfo; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyTransferDialog.java b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyTransferDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyTransferDialog.java rename to app/src/main/java/com/mango/moshen/family/view/dialog/FamilyTransferDialog.java index cb8137879..6c92b0183 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyTransferDialog.java +++ b/app/src/main/java/com/mango/moshen/family/view/dialog/FamilyTransferDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.dialog; +package com.mango.moshen.family.view.dialog; import android.app.Dialog; import android.content.Context; @@ -11,13 +11,13 @@ import android.view.View; import android.widget.EditText; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_library.utils.ImeUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.core.auth.AuthModel; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.bean.FamilyMemberInfo; +import com.mango.xchat_android_library.utils.ImeUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyAttentionFragment.java b/app/src/main/java/com/mango/moshen/family/view/fragment/FamilyAttentionFragment.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyAttentionFragment.java rename to app/src/main/java/com/mango/moshen/family/view/fragment/FamilyAttentionFragment.java index 32d14e134..0d33a1a80 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyAttentionFragment.java +++ b/app/src/main/java/com/mango/moshen/family/view/fragment/FamilyAttentionFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.fragment; +package com.mango.moshen.family.view.fragment; import android.app.Activity; import androidx.fragment.app.Fragment; @@ -8,16 +8,16 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyAttentionFragmentView; -import com.yizhuan.erban.family.view.activity.FamilySelectFriendActivity; -import com.yizhuan.erban.family.view.adapter.FamilyAttentionListAdapter; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.family.presenter.FamilyAttentionPresenter; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.family.contract.viewinterface.IFamilyAttentionFragmentView; +import com.mango.moshen.family.view.activity.FamilySelectFriendActivity; +import com.mango.moshen.family.view.adapter.FamilyAttentionListAdapter; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.family.presenter.FamilyAttentionPresenter; +import com.mango.core.user.bean.AttentionInfo; +import com.mango.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyEmptyFragment.java b/app/src/main/java/com/mango/moshen/family/view/fragment/FamilyEmptyFragment.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyEmptyFragment.java rename to app/src/main/java/com/mango/moshen/family/view/fragment/FamilyEmptyFragment.java index 86a976825..e84b44445 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyEmptyFragment.java +++ b/app/src/main/java/com/mango/moshen/family/view/fragment/FamilyEmptyFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.fragment; +package com.mango.moshen.family.view.fragment; import android.os.Bundle; import android.view.LayoutInflater; @@ -7,8 +7,8 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.AbsStatusFragment; +import com.mango.moshen.R; +import com.mango.moshen.common.AbsStatusFragment; /** * Created by xujiexing on 14-4-9. diff --git a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFansListFragment.java b/app/src/main/java/com/mango/moshen/family/view/fragment/FamilyFansListFragment.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFansListFragment.java rename to app/src/main/java/com/mango/moshen/family/view/fragment/FamilyFansListFragment.java index ae4a960b6..7ee7a382c 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFansListFragment.java +++ b/app/src/main/java/com/mango/moshen/family/view/fragment/FamilyFansListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.fragment; +package com.mango.moshen.family.view.fragment; import android.app.Activity; import androidx.fragment.app.Fragment; @@ -8,17 +8,17 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyFansListFragmentView; -import com.yizhuan.erban.family.view.activity.FamilySelectFriendActivity; -import com.yizhuan.erban.family.view.adapter.FamilyFansViewAdapter; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.family.presenter.FamilyFansListPresenter; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.family.contract.viewinterface.IFamilyFansListFragmentView; +import com.mango.moshen.family.view.activity.FamilySelectFriendActivity; +import com.mango.moshen.family.view.adapter.FamilyFansViewAdapter; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.family.presenter.FamilyFansListPresenter; +import com.mango.core.user.bean.FansInfo; +import com.mango.core.user.bean.FansListInfo; +import com.mango.core.user.bean.UserInfo; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFriendListFragment.java b/app/src/main/java/com/mango/moshen/family/view/fragment/FamilyFriendListFragment.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFriendListFragment.java rename to app/src/main/java/com/mango/moshen/family/view/fragment/FamilyFriendListFragment.java index c09f6799f..d68fa1275 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFriendListFragment.java +++ b/app/src/main/java/com/mango/moshen/family/view/fragment/FamilyFriendListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.family.view.fragment; +package com.mango.moshen.family.view.fragment; import android.content.Context; import androidx.fragment.app.Fragment; @@ -8,15 +8,15 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyFriendListFragmentView; -import com.yizhuan.erban.family.view.activity.FamilySelectFriendActivity; -import com.yizhuan.erban.family.view.adapter.FamilyFriendListAdapter; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.family.presenter.FamilyFriendListPresenter; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.family.contract.viewinterface.IFamilyFriendListFragmentView; +import com.mango.moshen.family.view.activity.FamilySelectFriendActivity; +import com.mango.moshen.family.view.adapter.FamilyFriendListAdapter; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.family.presenter.FamilyFriendListPresenter; +import com.mango.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinActivity.kt b/app/src/main/java/com/mango/moshen/fansteam/FansTeamJoinActivity.kt similarity index 86% rename from app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinActivity.kt rename to app/src/main/java/com/mango/moshen/fansteam/FansTeamJoinActivity.kt index cecc77dbe..9312804dc 100644 --- a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinActivity.kt +++ b/app/src/main/java/com/mango/moshen/fansteam/FansTeamJoinActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.fansteam +package com.mango.moshen.fansteam import android.annotation.SuppressLint import android.content.Context @@ -7,16 +7,16 @@ import android.view.Gravity import android.view.WindowManager import androidx.activity.viewModels -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.databinding.ActivityFansTeamJoinBinding -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.erban.ui.webview.DialogWebViewActivity -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.gift.GiftModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.net.handleBeanData -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.databinding.ActivityFansTeamJoinBinding +import com.mango.moshen.ui.utils.load +import com.mango.moshen.ui.webview.DialogWebViewActivity +import com.mango.core.UriProvider +import com.mango.core.gift.GiftModel +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.utils.net.handleBeanData +import com.mango.core.utils.subAndReplaceDot +import com.mango.core.utils.toast class FansTeamJoinActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinedActivity.kt b/app/src/main/java/com/mango/moshen/fansteam/FansTeamJoinedActivity.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinedActivity.kt rename to app/src/main/java/com/mango/moshen/fansteam/FansTeamJoinedActivity.kt index ca779786d..c0aaf6c15 100644 --- a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinedActivity.kt +++ b/app/src/main/java/com/mango/moshen/fansteam/FansTeamJoinedActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.fansteam +package com.mango.moshen.fansteam import android.annotation.SuppressLint import android.content.Context @@ -13,25 +13,19 @@ import android.widget.PopupWindow import androidx.activity.viewModels import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R +import com.mango.moshen.R -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.ActivityFansTeamJoinedBinding -import com.yizhuan.erban.home.adapter.VisitorListAdapter -import com.yizhuan.erban.module_hall.hall.activity.SuperAdminRoomSetActivity -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.erban.ui.webview.CommonWebViewActivity -import com.yizhuan.erban.ui.webview.DialogWebViewActivity -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.fansteam.FansTeamTaskInfo -import com.yizhuan.xchat_android_core.home.bean.VisitorInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.ActivityFansTeamJoinedBinding +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.moshen.ui.utils.load +import com.mango.moshen.ui.webview.DialogWebViewActivity +import com.mango.core.UriProvider +import com.mango.core.fansteam.FansTeamTaskInfo +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.utils.subAndReplaceDot +import com.mango.core.utils.toast class FansTeamJoinedActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamListActivity.kt b/app/src/main/java/com/mango/moshen/fansteam/FansTeamListActivity.kt similarity index 76% rename from app/src/main/java/com/yizhuan/erban/fansteam/FansTeamListActivity.kt rename to app/src/main/java/com/mango/moshen/fansteam/FansTeamListActivity.kt index 098b0cc0f..5a0ee27ac 100644 --- a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamListActivity.kt +++ b/app/src/main/java/com/mango/moshen/fansteam/FansTeamListActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.fansteam +package com.mango.moshen.fansteam import android.annotation.SuppressLint import android.content.Context @@ -6,17 +6,13 @@ import android.content.Intent import androidx.activity.viewModels import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.ActivityFansTeamListBinding -import com.yizhuan.erban.databinding.ActivityVisitorListBinding -import com.yizhuan.erban.home.adapter.VisitorListAdapter -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.fansteam.FansTeamInfo -import com.yizhuan.xchat_android_core.home.bean.VisitorInfo -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.ActivityFansTeamListBinding +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.fansteam.FansTeamInfo +import com.mango.xchat_android_library.annatation.ActLayoutRes @ActLayoutRes(R.layout.activity_fans_team_list) class FansTeamListActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamListAdapter.kt b/app/src/main/java/com/mango/moshen/fansteam/FansTeamListAdapter.kt similarity index 78% rename from app/src/main/java/com/yizhuan/erban/fansteam/FansTeamListAdapter.kt rename to app/src/main/java/com/mango/moshen/fansteam/FansTeamListAdapter.kt index 25ea7a867..5275ff31f 100644 --- a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamListAdapter.kt +++ b/app/src/main/java/com/mango/moshen/fansteam/FansTeamListAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.erban.fansteam +package com.mango.moshen.fansteam import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.user.UserInfoActivity -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.fansteam.FansTeamInfo +import com.mango.moshen.R +import com.mango.moshen.ui.user.UserInfoActivity +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.fansteam.FansTeamInfo class FansTeamListAdapter : diff --git a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamTaskAdapter.kt b/app/src/main/java/com/mango/moshen/fansteam/FansTeamTaskAdapter.kt similarity index 88% rename from app/src/main/java/com/yizhuan/erban/fansteam/FansTeamTaskAdapter.kt rename to app/src/main/java/com/mango/moshen/fansteam/FansTeamTaskAdapter.kt index eef93a689..59b90264f 100644 --- a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamTaskAdapter.kt +++ b/app/src/main/java/com/mango/moshen/fansteam/FansTeamTaskAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.fansteam +package com.mango.moshen.fansteam import android.graphics.Color import android.widget.ImageView @@ -6,9 +6,9 @@ import android.widget.TextView import androidx.core.graphics.toColorInt import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.fansteam.FansTeamTaskInfo +import com.mango.moshen.R +import com.mango.moshen.ui.utils.load +import com.mango.core.fansteam.FansTeamTaskInfo class FansTeamTaskAdapter : BaseQuickAdapter(R.layout.item_fans_team_task) { diff --git a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamViewModel.kt b/app/src/main/java/com/mango/moshen/fansteam/FansTeamViewModel.kt similarity index 91% rename from app/src/main/java/com/yizhuan/erban/fansteam/FansTeamViewModel.kt rename to app/src/main/java/com/mango/moshen/fansteam/FansTeamViewModel.kt index e9bd7ea38..e79bf17c6 100644 --- a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamViewModel.kt +++ b/app/src/main/java/com/mango/moshen/fansteam/FansTeamViewModel.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.fansteam +package com.mango.moshen.fansteam import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.erban.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.fansteam.* +import com.mango.moshen.base.BaseViewModel +import com.mango.core.bean.response.ListResult +import com.mango.core.fansteam.* class FansTeamViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/erban/friend/Holder.java b/app/src/main/java/com/mango/moshen/friend/Holder.java similarity index 68% rename from app/src/main/java/com/yizhuan/erban/friend/Holder.java rename to app/src/main/java/com/mango/moshen/friend/Holder.java index a99fcea7a..5ea1f06ae 100644 --- a/app/src/main/java/com/yizhuan/erban/friend/Holder.java +++ b/app/src/main/java/com/mango/moshen/friend/Holder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.friend; +package com.mango.moshen.friend; /** * Created by MadisonRong on 06/06/2018. diff --git a/app/src/main/java/com/yizhuan/erban/friend/action/AbstractSelectFriendAction.java b/app/src/main/java/com/mango/moshen/friend/action/AbstractSelectFriendAction.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/friend/action/AbstractSelectFriendAction.java rename to app/src/main/java/com/mango/moshen/friend/action/AbstractSelectFriendAction.java index 4e91d3158..a08b5d8fa 100644 --- a/app/src/main/java/com/yizhuan/erban/friend/action/AbstractSelectFriendAction.java +++ b/app/src/main/java/com/mango/moshen/friend/action/AbstractSelectFriendAction.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.friend.action; +package com.mango.moshen.friend.action; import android.content.Context; -import com.yizhuan.erban.common.widget.dialog.DialogManager; +import com.mango.moshen.common.widget.dialog.DialogManager; /** * Created by MadisonRong on 06/06/2018. diff --git a/app/src/main/java/com/yizhuan/erban/friend/action/DefaultSelectFriendAction.java b/app/src/main/java/com/mango/moshen/friend/action/DefaultSelectFriendAction.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/friend/action/DefaultSelectFriendAction.java rename to app/src/main/java/com/mango/moshen/friend/action/DefaultSelectFriendAction.java index d41d6d03a..46f576481 100644 --- a/app/src/main/java/com/yizhuan/erban/friend/action/DefaultSelectFriendAction.java +++ b/app/src/main/java/com/mango/moshen/friend/action/DefaultSelectFriendAction.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.friend.action; +package com.mango.moshen.friend.action; /** * Created by MadisonRong on 06/06/2018. diff --git a/app/src/main/java/com/yizhuan/erban/friend/action/SelectFriendManager.java b/app/src/main/java/com/mango/moshen/friend/action/SelectFriendManager.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/friend/action/SelectFriendManager.java rename to app/src/main/java/com/mango/moshen/friend/action/SelectFriendManager.java index 1124c6b61..5691d2886 100644 --- a/app/src/main/java/com/yizhuan/erban/friend/action/SelectFriendManager.java +++ b/app/src/main/java/com/mango/moshen/friend/action/SelectFriendManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.friend.action; +package com.mango.moshen.friend.action; /** * Created by MadisonRong on 07/06/2018. diff --git a/app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java b/app/src/main/java/com/mango/moshen/friend/view/SelectFriendActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java rename to app/src/main/java/com/mango/moshen/friend/view/SelectFriendActivity.java index 3459692c7..e6e971ce0 100644 --- a/app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java +++ b/app/src/main/java/com/mango/moshen/friend/view/SelectFriendActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.friend.view; +package com.mango.moshen.friend.view; import android.app.Activity; import android.content.Context; @@ -9,31 +9,31 @@ import androidx.fragment.app.Fragment; import android.view.View; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.common.ViewPagerAdapter; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.databinding.ActivitySelectFriendBinding; -import com.yizhuan.erban.decoration.view.widgets.CarMagicIndicator; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.home.fragment.AttentionFragment; -import com.yizhuan.erban.team.view.TeamListFragment; -import com.yizhuan.erban.ui.im.friend.FriendListFragment; -import com.yizhuan.erban.ui.relation.FansListFragment; -import com.yizhuan.erban.ui.search.SearchActivity; -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.community.im.DynamicImMsg; -import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -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.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.common.ViewPagerAdapter; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.databinding.ActivitySelectFriendBinding; +import com.mango.moshen.decoration.view.widgets.CarMagicIndicator; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.home.fragment.AttentionFragment; +import com.mango.moshen.team.view.TeamListFragment; +import com.mango.moshen.ui.im.friend.FriendListFragment; +import com.mango.moshen.ui.relation.FansListFragment; +import com.mango.moshen.ui.search.SearchActivity; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.core.community.dynamic.DynamicModel; +import com.mango.core.community.im.DynamicImMsg; +import com.mango.core.community.im.WorldDynamicAttachment; +import com.mango.core.family.model.FamilyModel; +import com.mango.core.home.bean.TabInfo; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.share.bean.SessionType; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/guide/GuideActivity.java b/app/src/main/java/com/mango/moshen/guide/GuideActivity.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/guide/GuideActivity.java rename to app/src/main/java/com/mango/moshen/guide/GuideActivity.java index 9922d4026..911c6d219 100644 --- a/app/src/main/java/com/yizhuan/erban/guide/GuideActivity.java +++ b/app/src/main/java/com/mango/moshen/guide/GuideActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.guide; +package com.mango.moshen.guide; import android.content.Context; import android.content.Intent; @@ -10,9 +10,9 @@ 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.xchat_android_core.utils.SharedPreferenceUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.core.utils.SharedPreferenceUtils; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/yizhuan/erban/headline/HeadLineFragment.java b/app/src/main/java/com/mango/moshen/headline/HeadLineFragment.java similarity index 60% rename from app/src/main/java/com/yizhuan/erban/headline/HeadLineFragment.java rename to app/src/main/java/com/mango/moshen/headline/HeadLineFragment.java index 6b4708910..2222c9aa2 100644 --- a/app/src/main/java/com/yizhuan/erban/headline/HeadLineFragment.java +++ b/app/src/main/java/com/mango/moshen/headline/HeadLineFragment.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.headline; +package com.mango.moshen.headline; import android.os.Bundle; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.webview.CommonWebViewFragment; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.R; +import com.mango.moshen.ui.webview.CommonWebViewFragment; +import com.mango.core.UriProvider; +import com.mango.xchat_android_library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.fragment_common_web_view) public class HeadLineFragment extends CommonWebViewFragment { diff --git a/app/src/main/java/com/yizhuan/erban/headline/MyHeadLineFragment.java b/app/src/main/java/com/mango/moshen/headline/MyHeadLineFragment.java similarity index 60% rename from app/src/main/java/com/yizhuan/erban/headline/MyHeadLineFragment.java rename to app/src/main/java/com/mango/moshen/headline/MyHeadLineFragment.java index b315c1b01..1517e5e0a 100644 --- a/app/src/main/java/com/yizhuan/erban/headline/MyHeadLineFragment.java +++ b/app/src/main/java/com/mango/moshen/headline/MyHeadLineFragment.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.headline; +package com.mango.moshen.headline; import android.os.Bundle; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.webview.CommonWebViewFragment; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.R; +import com.mango.moshen.ui.webview.CommonWebViewFragment; +import com.mango.core.UriProvider; +import com.mango.xchat_android_library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.fragment_common_web_view) public class MyHeadLineFragment extends CommonWebViewFragment { diff --git a/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt b/app/src/main/java/com/mango/moshen/home/HomeViewModel.kt similarity index 90% rename from app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt rename to app/src/main/java/com/mango/moshen/home/HomeViewModel.kt index d016ca25d..9bf1f705e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt +++ b/app/src/main/java/com/mango/moshen/home/HomeViewModel.kt @@ -1,20 +1,20 @@ -package com.yizhuan.erban.home +package com.mango.moshen.home import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.erban.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo -import com.yizhuan.xchat_android_core.home.bean.ResourceInfo -import com.yizhuan.xchat_android_core.home.model.HomeModel -import com.yizhuan.xchat_android_core.room.bean.AnchorInfo -import com.yizhuan.xchat_android_core.room.bean.HomeLiveTopInfo -import com.yizhuan.xchat_android_core.room.bean.SingleRoomSortInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.base.BaseViewModel +import com.mango.core.bean.response.ListResult +import com.mango.core.home.bean.BannerInfo +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.home.bean.HomeTagInfo +import com.mango.core.home.bean.ResourceInfo +import com.mango.core.home.model.HomeModel +import com.mango.core.room.bean.AnchorInfo +import com.mango.core.room.bean.HomeLiveTopInfo +import com.mango.core.room.bean.SingleRoomSortInfo +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.core.utils.toast import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async diff --git a/app/src/main/java/com/yizhuan/erban/home/MeViewModel.kt b/app/src/main/java/com/mango/moshen/home/MeViewModel.kt similarity index 87% rename from app/src/main/java/com/yizhuan/erban/home/MeViewModel.kt rename to app/src/main/java/com/mango/moshen/home/MeViewModel.kt index f549c83e2..ede55200c 100644 --- a/app/src/main/java/com/yizhuan/erban/home/MeViewModel.kt +++ b/app/src/main/java/com/mango/moshen/home/MeViewModel.kt @@ -1,12 +1,12 @@ -package com.yizhuan.erban.home +package com.mango.moshen.home import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.erban.base.BaseViewModel -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_core.home.model.HomeModel -import com.yizhuan.xchat_android_core.room.bean.MeCenterInfo -import com.yizhuan.xchat_android_core.room.game.GameInfo +import com.mango.moshen.base.BaseViewModel +import com.mango.core.home.bean.BannerInfo +import com.mango.core.home.model.HomeModel +import com.mango.core.room.bean.MeCenterInfo +import com.mango.core.room.game.GameInfo class MeViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/erban/home/RoomCommonViewModel.kt b/app/src/main/java/com/mango/moshen/home/RoomCommonViewModel.kt similarity index 73% rename from app/src/main/java/com/yizhuan/erban/home/RoomCommonViewModel.kt rename to app/src/main/java/com/mango/moshen/home/RoomCommonViewModel.kt index 7e3e1e6e9..d0d89d788 100644 --- a/app/src/main/java/com/yizhuan/erban/home/RoomCommonViewModel.kt +++ b/app/src/main/java/com/mango/moshen/home/RoomCommonViewModel.kt @@ -1,11 +1,11 @@ -package com.yizhuan.erban.home +package com.mango.moshen.home import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.erban.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.model.HomeModel +import com.mango.moshen.base.BaseViewModel +import com.mango.core.bean.response.ListResult +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.home.model.HomeModel class RoomCommonViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/erban/home/RoomSingleViewModel.kt b/app/src/main/java/com/mango/moshen/home/RoomSingleViewModel.kt similarity index 72% rename from app/src/main/java/com/yizhuan/erban/home/RoomSingleViewModel.kt rename to app/src/main/java/com/mango/moshen/home/RoomSingleViewModel.kt index 407a040b3..55bfdeb93 100644 --- a/app/src/main/java/com/yizhuan/erban/home/RoomSingleViewModel.kt +++ b/app/src/main/java/com/mango/moshen/home/RoomSingleViewModel.kt @@ -1,11 +1,11 @@ -package com.yizhuan.erban.home +package com.mango.moshen.home import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.erban.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.model.HomeModel +import com.mango.moshen.base.BaseViewModel +import com.mango.core.bean.response.ListResult +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.home.model.HomeModel class RoomSingleViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java b/app/src/main/java/com/mango/moshen/home/activity/CollectionRoomActivity.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java rename to app/src/main/java/com/mango/moshen/home/activity/CollectionRoomActivity.java index 7a0272fc3..ee5c7e27f 100644 --- a/app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java +++ b/app/src/main/java/com/mango/moshen/home/activity/CollectionRoomActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.activity; +package com.mango.moshen.home.activity; import android.content.Context; import android.content.Intent; @@ -10,17 +10,16 @@ import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.home.adapter.CollectionRoomAdapter; -import com.yizhuan.xchat_android_core.home.bean.CollectionRoomInfo; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.home.adapter.CollectionRoomAdapter; +import com.mango.core.home.bean.HomeRoomInfo; +import com.mango.core.home.model.CollectionRoomModel; +import com.mango.core.auth.AuthModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/CommunityNoticeAct.java b/app/src/main/java/com/mango/moshen/home/activity/CommunityNoticeAct.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/home/activity/CommunityNoticeAct.java rename to app/src/main/java/com/mango/moshen/home/activity/CommunityNoticeAct.java index 17e76199d..9d699c569 100644 --- a/app/src/main/java/com/yizhuan/erban/home/activity/CommunityNoticeAct.java +++ b/app/src/main/java/com/mango/moshen/home/activity/CommunityNoticeAct.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.activity; +package com.mango.moshen.home.activity; import android.content.Context; import android.content.Intent; @@ -12,17 +12,17 @@ import android.text.TextUtils; import android.view.View; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity; -import com.yizhuan.erban.home.adapter.CommunityNoticeAdapter; -import com.yizhuan.erban.home.presenter.CommunityNoticePresenter; -import com.yizhuan.erban.home.view.ICommunityNoticeAct; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.community.dynamic.view.DynamicDetailActivity; +import com.mango.moshen.home.adapter.CommunityNoticeAdapter; +import com.mango.moshen.home.presenter.CommunityNoticePresenter; +import com.mango.moshen.home.view.ICommunityNoticeAct; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.core.auth.AuthModel; +import com.mango.core.community.bean.CommunityNoticeInfo; +import com.mango.xchat_android_library.base.factory.CreatePresenter; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/NewUserListActivity.java b/app/src/main/java/com/mango/moshen/home/activity/NewUserListActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/home/activity/NewUserListActivity.java rename to app/src/main/java/com/mango/moshen/home/activity/NewUserListActivity.java index 0456fa6fa..65ffeee47 100644 --- a/app/src/main/java/com/yizhuan/erban/home/activity/NewUserListActivity.java +++ b/app/src/main/java/com/mango/moshen/home/activity/NewUserListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.activity; +package com.mango.moshen.home.activity; import android.content.Context; import android.content.Intent; @@ -8,16 +8,16 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.home.adapter.FindNewUserListAdapter; -import com.yizhuan.erban.home.presenter.NewUserListPresenter; -import com.yizhuan.erban.home.view.INewUserListActivityView; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.SpacingDecoration; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.home.adapter.FindNewUserListAdapter; +import com.mango.moshen.home.presenter.NewUserListPresenter; +import com.mango.moshen.home.view.INewUserListActivityView; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.moshen.ui.widget.recyclerview.decoration.SpacingDecoration; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/RoomHistoryListActivity.kt b/app/src/main/java/com/mango/moshen/home/activity/RoomHistoryListActivity.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/home/activity/RoomHistoryListActivity.kt rename to app/src/main/java/com/mango/moshen/home/activity/RoomHistoryListActivity.kt index d28591d01..613a0e06e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/activity/RoomHistoryListActivity.kt +++ b/app/src/main/java/com/mango/moshen/home/activity/RoomHistoryListActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.activity +package com.mango.moshen.home.activity import android.annotation.SuppressLint import android.content.Context @@ -7,17 +7,17 @@ import android.graphics.Color import android.view.View import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.base.TitleBar -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.ActivityRoomHistoryListBinding -import com.yizhuan.erban.home.adapter.RoomHistoryListAdapter -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.SingleToastUtil +import com.mango.moshen.R +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.base.TitleBar +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.ActivityRoomHistoryListBinding +import com.mango.moshen.home.adapter.RoomHistoryListAdapter +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.bean.RoomHistoryInfo +import com.mango.core.user.UserModel +import com.mango.xchat_android_library.annatation.ActLayoutRes +import com.mango.xchat_android_library.utils.SingleToastUtil @ActLayoutRes(R.layout.activity_room_history_list) class RoomHistoryListActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/VisitorListActivity.kt b/app/src/main/java/com/mango/moshen/home/activity/VisitorListActivity.kt similarity index 78% rename from app/src/main/java/com/yizhuan/erban/home/activity/VisitorListActivity.kt rename to app/src/main/java/com/mango/moshen/home/activity/VisitorListActivity.kt index 51f5fde32..48231226a 100644 --- a/app/src/main/java/com/yizhuan/erban/home/activity/VisitorListActivity.kt +++ b/app/src/main/java/com/mango/moshen/home/activity/VisitorListActivity.kt @@ -1,20 +1,20 @@ -package com.yizhuan.erban.home.activity +package com.mango.moshen.home.activity import android.annotation.SuppressLint import android.content.Context import android.content.Intent import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.ActivityVisitorListBinding -import com.yizhuan.erban.home.adapter.VisitorListAdapter -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.home.bean.VisitorInfo -import com.yizhuan.xchat_android_core.home.event.VisitorUnreadCountEvent -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.ActivityVisitorListBinding +import com.mango.moshen.home.adapter.VisitorListAdapter +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.home.bean.VisitorInfo +import com.mango.core.home.event.VisitorUnreadCountEvent +import com.mango.core.user.UserModel +import com.mango.xchat_android_library.annatation.ActLayoutRes import org.greenrobot.eventbus.EventBus @ActLayoutRes(R.layout.activity_visitor_list) diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/BannerAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/BannerAdapter.java similarity index 78% rename from app/src/main/java/com/yizhuan/erban/home/adapter/BannerAdapter.java rename to app/src/main/java/com/mango/moshen/home/adapter/BannerAdapter.java index fd336bb85..ca33f4534 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/BannerAdapter.java +++ b/app/src/main/java/com/mango/moshen/home/adapter/BannerAdapter.java @@ -1,22 +1,16 @@ -package com.yizhuan.erban.home.adapter; +package com.mango.moshen.home.adapter; import android.content.Context; -import android.content.Intent; -import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.utils.CommonJumpHelper; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; +import com.mango.moshen.ui.widget.rollviewpager.adapter.StaticPagerAdapter; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.utils.CommonJumpHelper; +import com.mango.core.home.bean.BannerInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/CollectionRoomAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/CollectionRoomAdapter.java similarity index 77% rename from app/src/main/java/com/yizhuan/erban/home/adapter/CollectionRoomAdapter.java rename to app/src/main/java/com/mango/moshen/home/adapter/CollectionRoomAdapter.java index c82eb8469..e919a9811 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/CollectionRoomAdapter.java +++ b/app/src/main/java/com/mango/moshen/home/adapter/CollectionRoomAdapter.java @@ -1,13 +1,12 @@ -package com.yizhuan.erban.home.adapter; +package com.mango.moshen.home.adapter; import android.widget.ImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.home.bean.CollectionRoomInfo; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.core.home.bean.HomeRoomInfo; /** * Created by yudi diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/CommunityNoticeAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/CommunityNoticeAdapter.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/home/adapter/CommunityNoticeAdapter.java rename to app/src/main/java/com/mango/moshen/home/adapter/CommunityNoticeAdapter.java index e6680f046..65c3e9385 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/CommunityNoticeAdapter.java +++ b/app/src/main/java/com/mango/moshen/home/adapter/CommunityNoticeAdapter.java @@ -1,17 +1,17 @@ -package com.yizhuan.erban.home.adapter; +package com.mango.moshen.home.adapter; import android.text.TextUtils; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.common.widget.RectRoundImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.common.widget.RectRoundImageView; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.core.auth.AuthModel; +import com.mango.core.community.bean.CommunityNoticeInfo; +import com.mango.core.community.bean.DynamicMedia; +import com.mango.xchat_android_library.utils.TimeUtils; public class CommunityNoticeAdapter extends BaseQuickAdapter { diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/ContactsIndicatorAdapter.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java rename to app/src/main/java/com/mango/moshen/home/adapter/ContactsIndicatorAdapter.java index d49269ad7..aabe833cc 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/home/adapter/ContactsIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.adapter; +package com.mango.moshen.home.adapter; import android.content.Context; import androidx.appcompat.widget.AppCompatTextView; @@ -7,13 +7,13 @@ import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.yizhuan.erban.R; -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.erban.ui.widget.marqueeview.Utils; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.mango.moshen.ui.widget.marqueeview.Utils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/FindNewUserListAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/FindNewUserListAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/home/adapter/FindNewUserListAdapter.java rename to app/src/main/java/com/mango/moshen/home/adapter/FindNewUserListAdapter.java index 248ce3cc3..1486a7f1e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/FindNewUserListAdapter.java +++ b/app/src/main/java/com/mango/moshen/home/adapter/FindNewUserListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.adapter; +package com.mango.moshen.home.adapter; import android.content.Context; import androidx.annotation.Nullable; @@ -8,9 +8,9 @@ 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.user.UserInfoActivity; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/FragmentViewPagerAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/FragmentViewPagerAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/home/adapter/FragmentViewPagerAdapter.java rename to app/src/main/java/com/mango/moshen/home/adapter/FragmentViewPagerAdapter.java index e12ad3245..c1ad73b9c 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/FragmentViewPagerAdapter.java +++ b/app/src/main/java/com/mango/moshen/home/adapter/FragmentViewPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.adapter; +package com.mango.moshen.home.adapter; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/HomeConcernsAdapter.java similarity index 78% rename from app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java rename to app/src/main/java/com/mango/moshen/home/adapter/HomeConcernsAdapter.java index 3a1d215f3..81b1a02dc 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java +++ b/app/src/main/java/com/mango/moshen/home/adapter/HomeConcernsAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.adapter; +package com.mango.moshen.home.adapter; import android.graphics.drawable.AnimationDrawable; @@ -6,15 +6,15 @@ import androidx.annotation.NonNull; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.core.home.bean.HomeRoomInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.StringExtensionKt; public class HomeConcernsAdapter extends BaseQuickAdapter { diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeLiveTopAdapter.kt b/app/src/main/java/com/mango/moshen/home/adapter/HomeLiveTopAdapter.kt similarity index 74% rename from app/src/main/java/com/yizhuan/erban/home/adapter/HomeLiveTopAdapter.kt rename to app/src/main/java/com/mango/moshen/home/adapter/HomeLiveTopAdapter.kt index 9d6fca8ec..a23a074e7 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeLiveTopAdapter.kt +++ b/app/src/main/java/com/mango/moshen/home/adapter/HomeLiveTopAdapter.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.home.adapter +package com.mango.moshen.home.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.room.bean.HomeLiveTopInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol +import com.mango.moshen.R +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.ui.utils.load +import com.mango.core.room.bean.HomeLiveTopInfo +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol class HomeLiveTopAdapter : diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.kt b/app/src/main/java/com/mango/moshen/home/adapter/HomePlayAdapter.kt similarity index 87% rename from app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.kt rename to app/src/main/java/com/mango/moshen/home/adapter/HomePlayAdapter.kt index e92e7dbf4..90e6ba824 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.kt +++ b/app/src/main/java/com/mango/moshen/home/adapter/HomePlayAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.adapter +package com.mango.moshen.home.adapter import android.graphics.Color import android.graphics.LinearGradient @@ -7,17 +7,15 @@ import android.widget.ImageView import android.widget.TextView import androidx.core.view.isGone import com.chad.library.adapter.base.BaseMultiItemQuickAdapter -import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.makeramen.roundedimageview.RoundedImageView -import com.yizhuan.erban.R -import com.yizhuan.erban.common.widget.RectRoundImageView -import com.yizhuan.erban.home.helper.BannerHelper -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils -import com.yizhuan.xchat_android_core.utils.ifNullOrEmpty +import com.mango.moshen.R +import com.mango.moshen.home.helper.BannerHelper +import com.mango.moshen.ui.utils.ImageLoadUtilsV2 +import com.mango.moshen.ui.utils.load +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.utils.TextUtils +import com.mango.core.utils.ifNullOrEmpty /** * create by lvzebiao @2019/11/13 diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/HomeRoomFragmentAdapter.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java rename to app/src/main/java/com/mango/moshen/home/adapter/HomeRoomFragmentAdapter.java index 83de3013c..6f674b288 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java +++ b/app/src/main/java/com/mango/moshen/home/adapter/HomeRoomFragmentAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.adapter; +package com.mango.moshen.home.adapter; import android.content.Context; import android.text.TextUtils; @@ -10,14 +10,12 @@ import androidx.annotation.NonNull; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; 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.HomeTabMapInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; - -import java.util.List; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.home.bean.HomeTabMapInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; /** *

首页热门adapter

diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeSingleAnchorAdapter.kt b/app/src/main/java/com/mango/moshen/home/adapter/HomeSingleAnchorAdapter.kt similarity index 78% rename from app/src/main/java/com/yizhuan/erban/home/adapter/HomeSingleAnchorAdapter.kt rename to app/src/main/java/com/mango/moshen/home/adapter/HomeSingleAnchorAdapter.kt index e4a941044..5817c0606 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeSingleAnchorAdapter.kt +++ b/app/src/main/java/com/mango/moshen/home/adapter/HomeSingleAnchorAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.adapter +package com.mango.moshen.home.adapter import android.widget.ImageView import androidx.core.view.isGone @@ -6,15 +6,15 @@ import androidx.core.view.isVisible import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.opensource.svgaplayer.SVGAImageView -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.erban.ui.utils.loadFromAssets -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.mango.moshen.R +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.ui.utils.ImageLoadUtilsV2 +import com.mango.moshen.ui.utils.load +import com.mango.moshen.ui.utils.loadFromAssets +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.core.utils.TextUtils /** * create by lvzebiao @2019/11/13 diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/MainMagicIndicatorAdapter.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java rename to app/src/main/java/com/mango/moshen/home/adapter/MainMagicIndicatorAdapter.java index 81fc38100..050f20113 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/home/adapter/MainMagicIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.adapter; +package com.mango.moshen.home.adapter; import android.content.Context; import android.graphics.Color; @@ -9,13 +9,13 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; -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.mango.moshen.R; +import com.mango.moshen.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/MeCenterAdapter.kt b/app/src/main/java/com/mango/moshen/home/adapter/MeCenterAdapter.kt similarity index 73% rename from app/src/main/java/com/yizhuan/erban/home/adapter/MeCenterAdapter.kt rename to app/src/main/java/com/mango/moshen/home/adapter/MeCenterAdapter.kt index b7ea451d2..9ec4ff7c8 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/MeCenterAdapter.kt +++ b/app/src/main/java/com/mango/moshen/home/adapter/MeCenterAdapter.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.home.adapter +package com.mango.moshen.home.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.im.RouterHandler -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.room.bean.MeCenterInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol +import com.mango.moshen.R +import com.mango.moshen.ui.im.RouterHandler +import com.mango.moshen.ui.utils.load +import com.mango.core.room.bean.MeCenterInfo +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol class MeCenterAdapter : diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/MeGameAdapter.kt b/app/src/main/java/com/mango/moshen/home/adapter/MeGameAdapter.kt similarity index 72% rename from app/src/main/java/com/yizhuan/erban/home/adapter/MeGameAdapter.kt rename to app/src/main/java/com/mango/moshen/home/adapter/MeGameAdapter.kt index 9b0b4da2d..bdbe8948a 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/MeGameAdapter.kt +++ b/app/src/main/java/com/mango/moshen/home/adapter/MeGameAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.erban.home.adapter +package com.mango.moshen.home.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.room.game.GameInfo +import com.mango.moshen.R +import com.mango.moshen.ui.utils.load +import com.mango.core.room.game.GameInfo class MeGameAdapter : diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/MoreSingleAnchorAdapter.kt b/app/src/main/java/com/mango/moshen/home/adapter/MoreSingleAnchorAdapter.kt similarity index 74% rename from app/src/main/java/com/yizhuan/erban/home/adapter/MoreSingleAnchorAdapter.kt rename to app/src/main/java/com/mango/moshen/home/adapter/MoreSingleAnchorAdapter.kt index 09828efc8..6445c8a79 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/MoreSingleAnchorAdapter.kt +++ b/app/src/main/java/com/mango/moshen/home/adapter/MoreSingleAnchorAdapter.kt @@ -1,20 +1,18 @@ -package com.yizhuan.erban.home.adapter +package com.mango.moshen.home.adapter import android.widget.ImageView -import androidx.core.view.isGone import androidx.core.view.isVisible import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.opensource.svgaplayer.SVGAImageView -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.erban.ui.utils.loadFromAssets -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.mango.moshen.R +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.moshen.ui.utils.load +import com.mango.moshen.ui.utils.loadFromAssets +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.core.utils.TextUtils /** * create by lvzebiao @2019/11/13 diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/PartyMagicIndicatorAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/PartyMagicIndicatorAdapter.java similarity index 77% rename from app/src/main/java/com/yizhuan/erban/home/adapter/PartyMagicIndicatorAdapter.java rename to app/src/main/java/com/mango/moshen/home/adapter/PartyMagicIndicatorAdapter.java index e98d2eee5..8e8be8cf8 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/PartyMagicIndicatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/home/adapter/PartyMagicIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.adapter; +package com.mango.moshen.home.adapter; import android.content.Context; import android.graphics.Color; @@ -9,14 +9,14 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; -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.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.WrapPagerIndicator; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.WrapPagerIndicator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/RoomActAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java rename to app/src/main/java/com/mango/moshen/home/adapter/RoomActAdapter.java index 052e9b113..b88738f45 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java +++ b/app/src/main/java/com/mango/moshen/home/adapter/RoomActAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.adapter; +package com.mango.moshen.home.adapter; import android.content.Context; import android.text.TextUtils; @@ -8,18 +8,18 @@ import android.view.ViewGroup; import android.widget.ImageView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.firstcharge.FirstChargeDialog; -import com.yizhuan.erban.shipantics.PullRadishActivity; -import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapter; -import com.yizhuan.erban.utils.CommonJumpHelper; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -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 com.mango.moshen.R; +import com.mango.moshen.avroom.firstcharge.FirstChargeDialog; +import com.mango.moshen.shipantics.PullRadishActivity; +import com.mango.moshen.treasure_box.widget.GoldBoxHelper; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.rollviewpager.adapter.StaticPagerAdapter; +import com.mango.moshen.utils.CommonJumpHelper; +import com.mango.core.home.bean.BannerInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomCommonAdapter.kt b/app/src/main/java/com/mango/moshen/home/adapter/RoomCommonAdapter.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/home/adapter/RoomCommonAdapter.kt rename to app/src/main/java/com/mango/moshen/home/adapter/RoomCommonAdapter.kt index 4a3e384d1..b705d8cd8 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomCommonAdapter.kt +++ b/app/src/main/java/com/mango/moshen/home/adapter/RoomCommonAdapter.kt @@ -1,15 +1,14 @@ -package com.yizhuan.erban.home.adapter +package com.mango.moshen.home.adapter import android.widget.ImageView import androidx.core.view.isGone import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.mango.moshen.R +import com.mango.moshen.ui.utils.ImageLoadUtilsV2 +import com.mango.moshen.ui.utils.load +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.utils.TextUtils class RoomCommonAdapter : BaseQuickAdapter(R.layout.item_room_common) { diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomGameAdapter.kt b/app/src/main/java/com/mango/moshen/home/adapter/RoomGameAdapter.kt similarity index 85% rename from app/src/main/java/com/yizhuan/erban/home/adapter/RoomGameAdapter.kt rename to app/src/main/java/com/mango/moshen/home/adapter/RoomGameAdapter.kt index 11e14ba42..ec38fc645 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomGameAdapter.kt +++ b/app/src/main/java/com/mango/moshen/home/adapter/RoomGameAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.adapter +package com.mango.moshen.home.adapter import android.graphics.Color import android.graphics.LinearGradient @@ -8,12 +8,12 @@ import android.widget.TextView import androidx.core.view.isGone import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol +import com.mango.moshen.R +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.ui.utils.load +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol class RoomGameAdapter : BaseQuickAdapter(R.layout.item_room_game) { diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomHistoryListAdapter.kt b/app/src/main/java/com/mango/moshen/home/adapter/RoomHistoryListAdapter.kt similarity index 75% rename from app/src/main/java/com/yizhuan/erban/home/adapter/RoomHistoryListAdapter.kt rename to app/src/main/java/com/mango/moshen/home/adapter/RoomHistoryListAdapter.kt index 203143211..f0b697075 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomHistoryListAdapter.kt +++ b/app/src/main/java/com/mango/moshen/home/adapter/RoomHistoryListAdapter.kt @@ -1,13 +1,13 @@ -package com.yizhuan.erban.home.adapter +package com.mango.moshen.home.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo -import com.yizhuan.xchat_android_library.utils.TimeUtils +import com.mango.moshen.R +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.ui.utils.load +import com.mango.core.bean.RoomHistoryInfo +import com.mango.xchat_android_library.utils.TimeUtils class RoomHistoryListAdapter : diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomHotAdapter.kt b/app/src/main/java/com/mango/moshen/home/adapter/RoomHotAdapter.kt similarity index 79% rename from app/src/main/java/com/yizhuan/erban/home/adapter/RoomHotAdapter.kt rename to app/src/main/java/com/mango/moshen/home/adapter/RoomHotAdapter.kt index 95a22fb1c..1767349af 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomHotAdapter.kt +++ b/app/src/main/java/com/mango/moshen/home/adapter/RoomHotAdapter.kt @@ -1,18 +1,17 @@ -package com.yizhuan.erban.home.adapter +package com.mango.moshen.home.adapter import android.widget.ImageView import androidx.core.view.isGone import com.chad.library.adapter.base.BaseMultiItemQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.home.helper.BannerHelper -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.mango.moshen.R +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.home.helper.BannerHelper +import com.mango.moshen.ui.utils.load +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.core.utils.TextUtils class RoomHotAdapter : BaseMultiItemQuickAdapter(null) { diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomLikeAdapter.kt b/app/src/main/java/com/mango/moshen/home/adapter/RoomLikeAdapter.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/home/adapter/RoomLikeAdapter.kt rename to app/src/main/java/com/mango/moshen/home/adapter/RoomLikeAdapter.kt index 0afb330e6..05ccd6d0c 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomLikeAdapter.kt +++ b/app/src/main/java/com/mango/moshen/home/adapter/RoomLikeAdapter.kt @@ -1,18 +1,17 @@ -package com.yizhuan.erban.home.adapter +package com.mango.moshen.home.adapter import android.widget.ImageView import androidx.core.view.isGone import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.ui.user.UserInfoActivity -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.mango.moshen.R +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.ui.utils.ImageLoadUtilsV2 +import com.mango.moshen.ui.utils.load +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.core.utils.TextUtils class RoomLikeAdapter : BaseQuickAdapter(R.layout.item_room_like) { diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/TopMagicIndicatorAdapter.java similarity index 79% rename from app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java rename to app/src/main/java/com/mango/moshen/home/adapter/TopMagicIndicatorAdapter.java index 96717bcd9..77689f526 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/home/adapter/TopMagicIndicatorAdapter.java @@ -1,15 +1,14 @@ -package com.yizhuan.erban.home.adapter; +package com.mango.moshen.home.adapter; import android.content.Context; -import android.graphics.Color; import androidx.core.content.ContextCompat; -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 com.mango.moshen.R; +import com.mango.moshen.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/VisitorListAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/VisitorListAdapter.java similarity index 81% rename from app/src/main/java/com/yizhuan/erban/home/adapter/VisitorListAdapter.java rename to app/src/main/java/com/mango/moshen/home/adapter/VisitorListAdapter.java index 6e1e3eb7a..40b72bae1 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/VisitorListAdapter.java +++ b/app/src/main/java/com/mango/moshen/home/adapter/VisitorListAdapter.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.home.adapter; +package com.mango.moshen.home.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.home.bean.VisitorInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.im.avtivity.NimP2PMessageActivity; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.home.bean.VisitorInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/yizhuan/erban/home/dialog/HelloMessageDialog.kt b/app/src/main/java/com/mango/moshen/home/dialog/HelloMessageDialog.kt similarity index 73% rename from app/src/main/java/com/yizhuan/erban/home/dialog/HelloMessageDialog.kt rename to app/src/main/java/com/mango/moshen/home/dialog/HelloMessageDialog.kt index ff3b6901b..2776803fb 100644 --- a/app/src/main/java/com/yizhuan/erban/home/dialog/HelloMessageDialog.kt +++ b/app/src/main/java/com/mango/moshen/home/dialog/HelloMessageDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.dialog +package com.mango.moshen.home.dialog import android.annotation.SuppressLint import android.os.Bundle @@ -6,17 +6,11 @@ import android.view.Gravity import android.view.WindowManager import android.widget.ImageView import androidx.core.view.isGone -import androidx.core.view.isVisible -import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogHelloMessageBinding -import com.yizhuan.erban.databinding.DialogNewUserHelloBinding -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity -import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo -import com.yizhuan.xchat_android_core.channel_page.bean.NewUserHelloInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogHelloMessageBinding +import com.mango.moshen.ui.utils.load +import com.mango.moshen.room_chat.activity.RoomMsgActivity +import com.mango.core.channel_page.bean.HelloMessageInfo class HelloMessageDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/home/dialog/NewUserHelloDialog.kt b/app/src/main/java/com/mango/moshen/home/dialog/NewUserHelloDialog.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/home/dialog/NewUserHelloDialog.kt rename to app/src/main/java/com/mango/moshen/home/dialog/NewUserHelloDialog.kt index be17bb047..cc6c232d7 100644 --- a/app/src/main/java/com/yizhuan/erban/home/dialog/NewUserHelloDialog.kt +++ b/app/src/main/java/com/mango/moshen/home/dialog/NewUserHelloDialog.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.home.dialog +package com.mango.moshen.home.dialog import android.annotation.SuppressLint import android.os.Bundle import android.view.WindowManager -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogNewUserHelloBinding -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.channel_page.bean.NewUserHelloInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogNewUserHelloBinding +import com.mango.moshen.ui.utils.load +import com.mango.core.channel_page.bean.NewUserHelloInfo +import com.mango.core.utils.subAndReplaceDot class NewUserHelloDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/home/dialog/ProtocolUpdateDialog.java b/app/src/main/java/com/mango/moshen/home/dialog/ProtocolUpdateDialog.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/home/dialog/ProtocolUpdateDialog.java rename to app/src/main/java/com/mango/moshen/home/dialog/ProtocolUpdateDialog.java index 07e724464..f33b9afe1 100644 --- a/app/src/main/java/com/yizhuan/erban/home/dialog/ProtocolUpdateDialog.java +++ b/app/src/main/java/com/mango/moshen/home/dialog/ProtocolUpdateDialog.java @@ -1,8 +1,7 @@ -package com.yizhuan.erban.home.dialog; +package com.mango.moshen.home.dialog; import android.app.Activity; import android.content.Context; -import android.content.Intent; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; @@ -14,21 +13,18 @@ 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 androidx.annotation.NonNull; import androidx.core.content.ContextCompat; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseSdDialog; -import com.yizhuan.erban.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.erban.ui.patriarch.PatriarchModeActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.user.bean.ProtocolInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseSdDialog; +import com.mango.moshen.common.widget.OriginalDrawStatusClickSpan; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.user.bean.ProtocolInfo; +import com.mango.core.utils.SharedPreferenceUtils; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/yizhuan/erban/home/dialog/RecommendRoomDialog.kt b/app/src/main/java/com/mango/moshen/home/dialog/RecommendRoomDialog.kt similarity index 76% rename from app/src/main/java/com/yizhuan/erban/home/dialog/RecommendRoomDialog.kt rename to app/src/main/java/com/mango/moshen/home/dialog/RecommendRoomDialog.kt index f7addb765..7efabdc54 100644 --- a/app/src/main/java/com/yizhuan/erban/home/dialog/RecommendRoomDialog.kt +++ b/app/src/main/java/com/mango/moshen/home/dialog/RecommendRoomDialog.kt @@ -1,12 +1,12 @@ -package com.yizhuan.erban.home.dialog +package com.mango.moshen.home.dialog import android.annotation.SuppressLint import android.os.Bundle -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogRecommendRoomBinding -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogRecommendRoomBinding +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.home.bean.HomeRoomInfo class RecommendRoomDialog : BaseDialog() { diff --git a/app/src/main/java/com/mango/moshen/home/event/ContactTrashEvent.java b/app/src/main/java/com/mango/moshen/home/event/ContactTrashEvent.java new file mode 100644 index 000000000..d23d1ffc3 --- /dev/null +++ b/app/src/main/java/com/mango/moshen/home/event/ContactTrashEvent.java @@ -0,0 +1,4 @@ +package com.mango.moshen.home.event; + +public class ContactTrashEvent { +} diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/AttentionFragment.java b/app/src/main/java/com/mango/moshen/home/fragment/AttentionFragment.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/home/fragment/AttentionFragment.java rename to app/src/main/java/com/mango/moshen/home/fragment/AttentionFragment.java index 00fa1c583..8a227501a 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/AttentionFragment.java +++ b/app/src/main/java/com/mango/moshen/home/fragment/AttentionFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.fragment; +package com.mango.moshen.home.fragment; import android.annotation.SuppressLint; import android.app.Activity; @@ -10,22 +10,22 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.ui.relation.adapter.AttentionListAdapter; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.friend.view.SelectFriendActivity; +import com.mango.moshen.ui.relation.adapter.AttentionListAdapter; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.moshen.room_chat.activity.NimRoomP2PMessageActivity; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.praise.event.PraiseEvent; +import com.mango.core.user.AttentionModel; +import com.mango.core.user.bean.AttentionInfo; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -37,8 +37,8 @@ import java.util.List; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; -import static com.yizhuan.erban.R.id.swipe_refresh; -import static com.yizhuan.erban.friend.action.AbstractSelectFriendAction.ROOM_MSG; +import static com.mango.moshen.R.id.swipe_refresh; +import static com.mango.moshen.friend.action.AbstractSelectFriendAction.ROOM_MSG; /** *

主页关注界面

diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/ContactsListFragment.kt similarity index 77% rename from app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.kt rename to app/src/main/java/com/mango/moshen/home/fragment/ContactsListFragment.kt index 3b68b75a8..14a3538c0 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/ContactsListFragment.kt @@ -1,17 +1,17 @@ -package com.yizhuan.erban.home.fragment +package com.mango.moshen.home.fragment import androidx.fragment.app.Fragment import com.netease.nimlib.sdk.NIMClient import com.netease.nimlib.sdk.msg.MsgService -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseViewBindingFragment -import com.yizhuan.erban.common.widget.dialog.DialogManager.AbsOkDialogListener -import com.yizhuan.erban.databinding.FragmentContactListBinding -import com.yizhuan.erban.home.event.ContactTrashEvent -import com.yizhuan.erban.relation.cp.activity.CpInviteRecordActivity -import com.yizhuan.erban.ui.im.recent.RecentListFragment -import com.yizhuan.erban.ui.relation.AttentionListActivity -import com.yizhuan.erban.ui.relation.FansListActivity +import com.mango.moshen.R +import com.mango.moshen.base.BaseViewBindingFragment +import com.mango.moshen.common.widget.dialog.DialogManager.AbsOkDialogListener +import com.mango.moshen.databinding.FragmentContactListBinding +import com.mango.moshen.home.event.ContactTrashEvent +import com.mango.moshen.relation.cp.activity.CpInviteRecordActivity +import com.mango.moshen.ui.im.recent.RecentListFragment +import com.mango.moshen.ui.relation.AttentionListActivity +import com.mango.moshen.ui.relation.FansListActivity import org.greenrobot.eventbus.EventBus /** diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/HomeFragment.kt similarity index 78% rename from app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.kt rename to app/src/main/java/com/mango/moshen/home/fragment/HomeFragment.kt index 0edafe9bc..5cdd1f2b5 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/HomeFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.fragment +package com.mango.moshen.home.fragment import android.annotation.SuppressLint import android.view.View @@ -6,20 +6,20 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.adapter.RoomVPAdapter -import com.yizhuan.erban.base.BaseFragment -import com.yizhuan.erban.databinding.FragmentHomeBinding -import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter -import com.yizhuan.erban.home.helper.OpenRoomHelper -import com.yizhuan.erban.ui.search.SearchActivity -import com.yizhuan.erban.ui.webview.CommonWebViewActivity -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.DemoCache -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol +import com.mango.moshen.R +import com.mango.moshen.avroom.adapter.RoomVPAdapter +import com.mango.moshen.base.BaseFragment +import com.mango.moshen.databinding.FragmentHomeBinding +import com.mango.moshen.home.adapter.MainMagicIndicatorAdapter +import com.mango.moshen.home.helper.OpenRoomHelper +import com.mango.moshen.ui.search.SearchActivity +import com.mango.moshen.ui.webview.CommonWebViewActivity +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.mango.core.DemoCache +import com.mango.core.UriProvider +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol import java.util.* /** diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java b/app/src/main/java/com/mango/moshen/home/fragment/HomePlayFragment.java similarity index 79% rename from app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java rename to app/src/main/java/com/mango/moshen/home/fragment/HomePlayFragment.java index 2ec0e5f1e..54e541529 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java +++ b/app/src/main/java/com/mango/moshen/home/fragment/HomePlayFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.fragment; +package com.mango.moshen.home.fragment; import android.annotation.SuppressLint; import android.os.Bundle; @@ -6,18 +6,18 @@ import android.os.Bundle; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.common.EmptyViewHelper; -import com.yizhuan.erban.home.adapter.HomePlayAdapter; -import com.yizhuan.erban.ui.utils.RVDelegate; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent; -import com.yizhuan.xchat_android_core.home.model.GameHomeModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.common.EmptyViewHelper; +import com.mango.moshen.home.adapter.HomePlayAdapter; +import com.mango.moshen.ui.utils.RVDelegate; +import com.mango.core.home.bean.HomeRoomInfo; +import com.mango.core.home.event.RefreshHomeDataEvent; +import com.mango.core.home.model.GameHomeModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.event.LoadLoginUserInfoEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java b/app/src/main/java/com/mango/moshen/home/fragment/HomeTabHomeFragment.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java rename to app/src/main/java/com/mango/moshen/home/fragment/HomeTabHomeFragment.java index 765ac5526..6763af3e1 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java +++ b/app/src/main/java/com/mango/moshen/home/fragment/HomeTabHomeFragment.java @@ -1,8 +1,7 @@ -package com.yizhuan.erban.home.fragment; +package com.mango.moshen.home.fragment; import android.annotation.SuppressLint; import android.os.Bundle; -import android.os.Handler; import android.view.View; import android.view.ViewGroup; @@ -12,17 +11,14 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.home.adapter.HomeRoomFragmentAdapter; -import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent; -import com.yizhuan.xchat_android_core.home.model.GameHomeModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.home.adapter.HomeRoomFragmentAdapter; +import com.mango.core.home.bean.HomeTabMapInfo; +import com.mango.core.home.event.RefreshHomeDataEvent; +import com.mango.core.home.model.GameHomeModel; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -33,7 +29,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Random; -import java.util.concurrent.CancellationException; /** * diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/LiveFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/LiveFragment.kt similarity index 85% rename from app/src/main/java/com/yizhuan/erban/home/fragment/LiveFragment.kt rename to app/src/main/java/com/mango/moshen/home/fragment/LiveFragment.kt index 916f07dd6..f89c209bc 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/LiveFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/LiveFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.fragment +package com.mango.moshen.home.fragment import android.graphics.Color import android.os.Bundle @@ -11,23 +11,23 @@ import androidx.recyclerview.widget.RecyclerView import androidx.viewpager.widget.ViewPager import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.scwang.smartrefresh.layout.internal.ProgressDrawable -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.adapter.RoomVPAdapter -import com.yizhuan.erban.base.BaseViewBindingFragment -import com.yizhuan.erban.databinding.FragmentLiveBinding -import com.yizhuan.erban.home.HomeViewModel -import com.yizhuan.erban.home.adapter.HomeLiveTopAdapter -import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter -import com.yizhuan.erban.home.adapter.PartyMagicIndicatorAdapter -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent -import com.yizhuan.xchat_android_core.room.bean.HomeLiveTopInfo -import com.yizhuan.xchat_android_core.room.bean.SingleRoomSortInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils +import com.mango.moshen.R +import com.mango.moshen.avroom.adapter.RoomVPAdapter +import com.mango.moshen.base.BaseViewBindingFragment +import com.mango.moshen.databinding.FragmentLiveBinding +import com.mango.moshen.home.HomeViewModel +import com.mango.moshen.home.adapter.HomeLiveTopAdapter +import com.mango.moshen.home.adapter.MainMagicIndicatorAdapter +import com.mango.moshen.home.adapter.PartyMagicIndicatorAdapter +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.mango.core.home.event.RefreshHomeDataEvent +import com.mango.core.room.bean.HomeLiveTopInfo +import com.mango.core.room.bean.SingleRoomSortInfo +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.core.utils.CurrentTimeUtils import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt similarity index 87% rename from app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt rename to app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt index 91e51a229..e8904710e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.fragment +package com.mango.moshen.home.fragment import android.annotation.SuppressLint import android.content.Intent @@ -15,51 +15,51 @@ import androidx.recyclerview.widget.RecyclerView import androidx.viewpager.widget.PagerAdapter import com.netease.nim.uikit.common.util.sys.TimeUtil import com.trello.rxlifecycle3.android.FragmentEvent -import com.yizhuan.erban.R -import com.yizhuan.erban.UIHelper -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.avroom.fragment.RoomRankDialogUtils -import com.yizhuan.erban.avroom.newuserchargegift.NewUserChargeGiftDialog -import com.yizhuan.erban.base.BaseActivity -import com.yizhuan.erban.base.BaseFragment -import com.yizhuan.erban.databinding.FragmentMeBinding -import com.yizhuan.erban.home.HomeViewModel -import com.yizhuan.erban.home.MeViewModel -import com.yizhuan.erban.home.activity.RoomHistoryListActivity -import com.yizhuan.erban.home.activity.VisitorListActivity -import com.yizhuan.erban.home.adapter.MeCenterAdapter -import com.yizhuan.erban.home.adapter.MeGameAdapter -import com.yizhuan.erban.home.helper.BannerHelper -import com.yizhuan.erban.home.helper.OpenRoomHelper -import com.yizhuan.erban.skill.activity.SkillHomeActivity -import com.yizhuan.erban.skill.activity.SkillHomeActivity.Companion.start -import com.yizhuan.erban.ui.pay.ChargeActivity -import com.yizhuan.erban.ui.relation.AttentionListActivity -import com.yizhuan.erban.ui.relation.FansListActivity -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.erban.ui.widget.OnPageSelectedListener -import com.yizhuan.erban.vip.VipMainActivity -import com.yizhuan.erban.vip.VipViewModel -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.home.event.VisitorUnreadCountEvent -import com.yizhuan.xchat_android_core.level.UserLevelVo -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager -import com.yizhuan.xchat_android_core.manager.RelationShipEvent -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent -import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent -import com.yizhuan.xchat_android_core.room.bean.MeCenterInfo -import com.yizhuan.xchat_android_core.room.bean.RoomInfo -import com.yizhuan.xchat_android_core.room.game.GameInfo -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.LoginUserInfoUpdateEvent -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils -import com.yizhuan.xchat_android_core.utils.StarUtils -import com.yizhuan.xchat_android_library.utils.FormatUtils +import com.mango.moshen.R +import com.mango.moshen.UIHelper +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.avroom.fragment.RoomRankDialogUtils +import com.mango.moshen.avroom.newuserchargegift.NewUserChargeGiftDialog +import com.mango.moshen.base.BaseActivity +import com.mango.moshen.base.BaseFragment +import com.mango.moshen.databinding.FragmentMeBinding +import com.mango.moshen.home.HomeViewModel +import com.mango.moshen.home.MeViewModel +import com.mango.moshen.home.activity.RoomHistoryListActivity +import com.mango.moshen.home.activity.VisitorListActivity +import com.mango.moshen.home.adapter.MeCenterAdapter +import com.mango.moshen.home.adapter.MeGameAdapter +import com.mango.moshen.home.helper.BannerHelper +import com.mango.moshen.home.helper.OpenRoomHelper +import com.mango.moshen.skill.activity.SkillHomeActivity +import com.mango.moshen.skill.activity.SkillHomeActivity.Companion.start +import com.mango.moshen.ui.pay.ChargeActivity +import com.mango.moshen.ui.relation.AttentionListActivity +import com.mango.moshen.ui.relation.FansListActivity +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.moshen.ui.utils.load +import com.mango.moshen.ui.widget.OnPageSelectedListener +import com.mango.moshen.vip.VipMainActivity +import com.mango.moshen.vip.VipViewModel +import com.mango.core.auth.AuthModel +import com.mango.core.home.event.VisitorUnreadCountEvent +import com.mango.core.level.UserLevelVo +import com.mango.core.manager.IMNetEaseManager +import com.mango.core.manager.RelationShipEvent +import com.mango.core.pay.PayModel +import com.mango.core.pay.event.GetWalletInfoEvent +import com.mango.core.pay.event.UpdateWalletInfoEvent +import com.mango.core.room.bean.MeCenterInfo +import com.mango.core.room.bean.RoomInfo +import com.mango.core.room.game.GameInfo +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.core.user.UserModel +import com.mango.core.user.bean.UserInfo +import com.mango.core.user.event.LoginUserInfoUpdateEvent +import com.mango.core.utils.CurrentTimeUtils +import com.mango.core.utils.StarUtils +import com.mango.xchat_android_library.utils.FormatUtils import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/PartyFragment.kt similarity index 87% rename from app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt rename to app/src/main/java/com/mango/moshen/home/fragment/PartyFragment.kt index bde9e535d..d012e7612 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/PartyFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.fragment +package com.mango.moshen.home.fragment import android.os.Bundle import android.view.Gravity @@ -8,16 +8,16 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import com.coorchice.library.utils.LogUtils import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.adapter.RoomVPAdapter -import com.yizhuan.erban.base.BaseFragment -import com.yizhuan.erban.databinding.FragmentPartyBinding -import com.yizhuan.erban.home.HomeViewModel -import com.yizhuan.erban.home.adapter.PartyMagicIndicatorAdapter -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent +import com.mango.moshen.R +import com.mango.moshen.avroom.adapter.RoomVPAdapter +import com.mango.moshen.base.BaseFragment +import com.mango.moshen.databinding.FragmentPartyBinding +import com.mango.moshen.home.HomeViewModel +import com.mango.moshen.home.adapter.PartyMagicIndicatorAdapter +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.mango.core.home.bean.HomeTagInfo +import com.mango.core.home.event.RefreshHomeDataEvent import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/RecommendFragment.kt similarity index 87% rename from app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt rename to app/src/main/java/com/mango/moshen/home/fragment/RecommendFragment.kt index 1375cbb6e..d6abdb33d 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/RecommendFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.fragment +package com.mango.moshen.home.fragment import android.graphics.Color import android.os.Bundle @@ -11,25 +11,25 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager import com.scwang.smartrefresh.layout.internal.ProgressDrawable -import com.yizhuan.erban.R -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.avroom.adapter.RoomVPAdapter -import com.yizhuan.erban.base.BaseFragment -import com.yizhuan.erban.databinding.FragmentRecommendBinding -import com.yizhuan.erban.home.HomeViewModel -import com.yizhuan.erban.home.adapter.HomeSingleAnchorAdapter -import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter -import com.yizhuan.erban.home.dialog.RecommendRoomDialog -import com.yizhuan.erban.home.helper.BannerHelper -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.erban.ui.webview.CommonWebViewActivity -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent -import com.yizhuan.xchat_android_core.initial.InitialModel -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol +import com.mango.moshen.R +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.avroom.adapter.RoomVPAdapter +import com.mango.moshen.base.BaseFragment +import com.mango.moshen.databinding.FragmentRecommendBinding +import com.mango.moshen.home.HomeViewModel +import com.mango.moshen.home.adapter.HomeSingleAnchorAdapter +import com.mango.moshen.home.adapter.MainMagicIndicatorAdapter +import com.mango.moshen.home.dialog.RecommendRoomDialog +import com.mango.moshen.home.helper.BannerHelper +import com.mango.moshen.ui.utils.load +import com.mango.moshen.ui.webview.CommonWebViewActivity +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.mango.core.auth.AuthModel +import com.mango.core.home.event.RefreshHomeDataEvent +import com.mango.core.initial.InitialModel +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomCommonFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/RoomCommonFragment.kt similarity index 81% rename from app/src/main/java/com/yizhuan/erban/home/fragment/RoomCommonFragment.kt rename to app/src/main/java/com/mango/moshen/home/fragment/RoomCommonFragment.kt index f2c683601..86e659c11 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomCommonFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/RoomCommonFragment.kt @@ -1,20 +1,20 @@ -package com.yizhuan.erban.home.fragment +package com.mango.moshen.home.fragment import android.annotation.SuppressLint import android.os.Bundle import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.base.BaseViewBindingFragment -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.FragmentRoomCommonBinding -import com.yizhuan.erban.home.RoomCommonViewModel -import com.yizhuan.erban.home.adapter.RoomCommonAdapter -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.base.BaseViewBindingFragment +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.FragmentRoomCommonBinding +import com.mango.moshen.home.RoomCommonViewModel +import com.mango.moshen.home.adapter.RoomCommonAdapter +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.home.event.RefreshHomeDataEvent +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomGameFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/RoomGameFragment.kt similarity index 82% rename from app/src/main/java/com/yizhuan/erban/home/fragment/RoomGameFragment.kt rename to app/src/main/java/com/mango/moshen/home/fragment/RoomGameFragment.kt index ccbcad9a9..00bb58550 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomGameFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/RoomGameFragment.kt @@ -1,17 +1,17 @@ -package com.yizhuan.erban.home.fragment +package com.mango.moshen.home.fragment import android.os.Bundle import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.base.BaseViewBindingFragment -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.FragmentRoomGameBinding -import com.yizhuan.erban.home.HomeViewModel -import com.yizhuan.erban.home.adapter.RoomGameAdapter -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.base.BaseViewBindingFragment +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.FragmentRoomGameBinding +import com.mango.moshen.home.HomeViewModel +import com.mango.moshen.home.adapter.RoomGameAdapter +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.home.event.RefreshHomeDataEvent import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomHotFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/RoomHotFragment.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/home/fragment/RoomHotFragment.kt rename to app/src/main/java/com/mango/moshen/home/fragment/RoomHotFragment.kt index a0e35be33..428bf3c6d 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomHotFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/RoomHotFragment.kt @@ -1,16 +1,16 @@ -package com.yizhuan.erban.home.fragment +package com.mango.moshen.home.fragment import android.os.Bundle import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.erban.base.BaseViewBindingFragment -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.FragmentRoomHotBinding -import com.yizhuan.erban.home.HomeViewModel -import com.yizhuan.erban.home.adapter.RoomHotAdapter -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent +import com.mango.moshen.base.BaseViewBindingFragment +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.FragmentRoomHotBinding +import com.mango.moshen.home.HomeViewModel +import com.mango.moshen.home.adapter.RoomHotAdapter +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.home.event.RefreshHomeDataEvent import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomLikeFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/RoomLikeFragment.kt similarity index 86% rename from app/src/main/java/com/yizhuan/erban/home/fragment/RoomLikeFragment.kt rename to app/src/main/java/com/mango/moshen/home/fragment/RoomLikeFragment.kt index 1bcbe1c85..168b49fc9 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomLikeFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/RoomLikeFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.fragment +package com.mango.moshen.home.fragment import android.os.Bundle import androidx.core.view.isGone @@ -7,16 +7,16 @@ import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.appbar.AppBarLayout -import com.yizhuan.erban.base.BaseViewBindingFragment -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.FragmentRoomLikeBinding -import com.yizhuan.erban.home.HomeViewModel -import com.yizhuan.erban.home.adapter.HomeConcernsAdapter -import com.yizhuan.erban.home.adapter.RoomLikeAdapter -import com.yizhuan.erban.ui.relation.AttentionListActivity -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent +import com.mango.moshen.base.BaseViewBindingFragment +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.FragmentRoomLikeBinding +import com.mango.moshen.home.HomeViewModel +import com.mango.moshen.home.adapter.HomeConcernsAdapter +import com.mango.moshen.home.adapter.RoomLikeAdapter +import com.mango.moshen.ui.relation.AttentionListActivity +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.home.event.RefreshHomeDataEvent import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomSingleFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/RoomSingleFragment.kt similarity index 81% rename from app/src/main/java/com/yizhuan/erban/home/fragment/RoomSingleFragment.kt rename to app/src/main/java/com/mango/moshen/home/fragment/RoomSingleFragment.kt index 148535517..f40538bbb 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomSingleFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/RoomSingleFragment.kt @@ -1,17 +1,17 @@ -package com.yizhuan.erban.home.fragment +package com.mango.moshen.home.fragment import android.os.Bundle import androidx.fragment.app.viewModels import androidx.recyclerview.widget.GridLayoutManager -import com.yizhuan.erban.base.BaseViewBindingFragment -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.FragmentRoomSingleBinding -import com.yizhuan.erban.home.RoomSingleViewModel -import com.yizhuan.erban.home.adapter.MoreSingleAnchorAdapter -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils +import com.mango.moshen.base.BaseViewBindingFragment +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.FragmentRoomSingleBinding +import com.mango.moshen.home.RoomSingleViewModel +import com.mango.moshen.home.adapter.MoreSingleAnchorAdapter +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.home.event.RefreshHomeDataEvent +import com.mango.core.utils.CurrentTimeUtils import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/home/helper/BannerHelper.kt b/app/src/main/java/com/mango/moshen/home/helper/BannerHelper.kt similarity index 86% rename from app/src/main/java/com/yizhuan/erban/home/helper/BannerHelper.kt rename to app/src/main/java/com/mango/moshen/home/helper/BannerHelper.kt index c98dd6491..7fb470dda 100644 --- a/app/src/main/java/com/yizhuan/erban/home/helper/BannerHelper.kt +++ b/app/src/main/java/com/mango/moshen/home/helper/BannerHelper.kt @@ -1,17 +1,17 @@ -package com.yizhuan.erban.home.helper +package com.mango.moshen.home.helper import android.graphics.Color import android.graphics.drawable.Drawable import android.graphics.drawable.GradientDrawable import android.view.View import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.home.adapter.BannerAdapter -import com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView -import com.yizhuan.erban.ui.widget.rollviewpager.Util -import com.yizhuan.erban.ui.widget.rollviewpager.hintview.ColorPointHintView -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_library.utils.ListUtils +import com.mango.moshen.R +import com.mango.moshen.home.adapter.BannerAdapter +import com.mango.moshen.ui.widget.rollviewpager.RollPagerView +import com.mango.moshen.ui.widget.rollviewpager.Util +import com.mango.moshen.ui.widget.rollviewpager.hintview.ColorPointHintView +import com.mango.core.home.bean.BannerInfo +import com.mango.xchat_android_library.utils.ListUtils class BannerHelper { companion object { diff --git a/app/src/main/java/com/yizhuan/erban/home/helper/LoadPageDataHelper.java b/app/src/main/java/com/mango/moshen/home/helper/LoadPageDataHelper.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/home/helper/LoadPageDataHelper.java rename to app/src/main/java/com/mango/moshen/home/helper/LoadPageDataHelper.java index 327a9fbbb..2587ba17d 100644 --- a/app/src/main/java/com/yizhuan/erban/home/helper/LoadPageDataHelper.java +++ b/app/src/main/java/com/mango/moshen/home/helper/LoadPageDataHelper.java @@ -1,12 +1,10 @@ -package com.yizhuan.erban.home.helper; +package com.mango.moshen.home.helper; -import com.yizhuan.xchat_android_core.Constants; +import com.mango.core.Constants; import io.reactivex.Single; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; import io.reactivex.functions.Action; -import io.reactivex.functions.Consumer; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/home/helper/OpenRoomHelper.java b/app/src/main/java/com/mango/moshen/home/helper/OpenRoomHelper.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/home/helper/OpenRoomHelper.java rename to app/src/main/java/com/mango/moshen/home/helper/OpenRoomHelper.java index b26c483ef..87c89eb98 100644 --- a/app/src/main/java/com/yizhuan/erban/home/helper/OpenRoomHelper.java +++ b/app/src/main/java/com/mango/moshen/home/helper/OpenRoomHelper.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.home.helper; +package com.mango.moshen.home.helper; -import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_FORCE; -import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_GUIDE; -import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_NONE; +import static com.mango.core.certification.CertificationModel.CER_TYPE_FORCE; +import static com.mango.core.certification.CertificationModel.CER_TYPE_GUIDE; +import static com.mango.core.certification.CertificationModel.CER_TYPE_NONE; import android.annotation.SuppressLint; import android.text.Spannable; @@ -13,26 +13,26 @@ import android.text.style.ForegroundColorSpan; import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; -import com.yizhuan.erban.MainActivity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.avroom.dialog.CreateRoomDialog; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.certification.CertificationModel; -import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; -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.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.utils.SingleToastUtil; +import com.mango.moshen.MainActivity; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.avroom.dialog.CreateRoomDialog; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.certification.CertificationModel; +import com.mango.core.patriarch.exception.PmRoomLimitException; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.room.model.RoomSettingModel; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.SingleToastUtil; public class OpenRoomHelper { diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/CommunityNoticePresenter.java b/app/src/main/java/com/mango/moshen/home/presenter/CommunityNoticePresenter.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/home/presenter/CommunityNoticePresenter.java rename to app/src/main/java/com/mango/moshen/home/presenter/CommunityNoticePresenter.java index 3e7c97a5e..92bb717a8 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/CommunityNoticePresenter.java +++ b/app/src/main/java/com/mango/moshen/home/presenter/CommunityNoticePresenter.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.home.presenter; +package com.mango.moshen.home.presenter; import android.annotation.SuppressLint; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.home.view.ICommunityNoticeAct; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo; -import com.yizhuan.xchat_android_core.home.model.CommunityNoticeModel; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.home.view.ICommunityNoticeAct; +import com.mango.core.Constants; +import com.mango.core.community.bean.CommunityNoticeInfo; +import com.mango.core.home.model.CommunityNoticeModel; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java b/app/src/main/java/com/mango/moshen/home/presenter/MainFragmentPresenter.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java rename to app/src/main/java/com/mango/moshen/home/presenter/MainFragmentPresenter.java index 4605757f4..99c381785 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java +++ b/app/src/main/java/com/mango/moshen/home/presenter/MainFragmentPresenter.java @@ -1,14 +1,14 @@ -package com.yizhuan.erban.home.presenter; +package com.mango.moshen.home.presenter; import android.os.Bundle; import androidx.annotation.Nullable; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.home.view.IMainFragmentView; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.home.view.IMainFragmentView; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/MainPresenter.java b/app/src/main/java/com/mango/moshen/home/presenter/MainPresenter.java similarity index 66% rename from app/src/main/java/com/yizhuan/erban/home/presenter/MainPresenter.java rename to app/src/main/java/com/mango/moshen/home/presenter/MainPresenter.java index 2fe95c235..95babce8f 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/MainPresenter.java +++ b/app/src/main/java/com/mango/moshen/home/presenter/MainPresenter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.home.presenter; +package com.mango.moshen.home.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.home.view.IMainView; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.home.view.IMainView; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; /** *

diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/NewUserListPresenter.java b/app/src/main/java/com/mango/moshen/home/presenter/NewUserListPresenter.java similarity index 60% rename from app/src/main/java/com/yizhuan/erban/home/presenter/NewUserListPresenter.java rename to app/src/main/java/com/mango/moshen/home/presenter/NewUserListPresenter.java index cf3e39d96..ce840faa3 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/NewUserListPresenter.java +++ b/app/src/main/java/com/mango/moshen/home/presenter/NewUserListPresenter.java @@ -1,22 +1,16 @@ -package com.yizhuan.erban.home.presenter; +package com.mango.moshen.home.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.home.helper.LoadPageDataHelper; -import com.yizhuan.erban.home.view.INewUserListActivityView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.home.model.HomeModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.base.PresenterEvent; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.home.helper.LoadPageDataHelper; +import com.mango.moshen.home.view.INewUserListActivityView; +import com.mango.core.Constants; +import com.mango.core.home.model.HomeModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.base.PresenterEvent; -import java.util.ArrayList; import java.util.List; import io.reactivex.Single; -import io.reactivex.SingleEmitter; -import io.reactivex.SingleOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameBase.java b/app/src/main/java/com/mango/moshen/home/refresh/FunGameBase.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/home/refresh/FunGameBase.java rename to app/src/main/java/com/mango/moshen/home/refresh/FunGameBase.java index 830ffd8ca..77f7619ad 100644 --- a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameBase.java +++ b/app/src/main/java/com/mango/moshen/home/refresh/FunGameBase.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.refresh; +package com.mango.moshen.home.refresh; import android.content.Context; import android.os.Build; diff --git a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameHeader.java b/app/src/main/java/com/mango/moshen/home/refresh/FunGameHeader.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/home/refresh/FunGameHeader.java rename to app/src/main/java/com/mango/moshen/home/refresh/FunGameHeader.java index 7c4a2c9f6..f3665c30f 100644 --- a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameHeader.java +++ b/app/src/main/java/com/mango/moshen/home/refresh/FunGameHeader.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.refresh; +package com.mango.moshen.home.refresh; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameHitBlockHeader.java b/app/src/main/java/com/mango/moshen/home/refresh/FunGameHitBlockHeader.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/home/refresh/FunGameHitBlockHeader.java rename to app/src/main/java/com/mango/moshen/home/refresh/FunGameHitBlockHeader.java index 20ba924d0..aabc02265 100644 --- a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameHitBlockHeader.java +++ b/app/src/main/java/com/mango/moshen/home/refresh/FunGameHitBlockHeader.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.refresh; +package com.mango.moshen.home.refresh; import android.content.Context; @@ -13,7 +13,7 @@ import android.util.AttributeSet; import com.scwang.smartrefresh.layout.util.ColorUtils; import com.scwang.smartrefresh.layout.util.DensityUtil; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameView.java b/app/src/main/java/com/mango/moshen/home/refresh/FunGameView.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/home/refresh/FunGameView.java rename to app/src/main/java/com/mango/moshen/home/refresh/FunGameView.java index 465ad7f38..940c4656b 100644 --- a/app/src/main/java/com/yizhuan/erban/home/refresh/FunGameView.java +++ b/app/src/main/java/com/mango/moshen/home/refresh/FunGameView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.refresh; +package com.mango.moshen.home.refresh; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/yizhuan/erban/home/view/ICommunityNoticeAct.java b/app/src/main/java/com/mango/moshen/home/view/ICommunityNoticeAct.java similarity index 59% rename from app/src/main/java/com/yizhuan/erban/home/view/ICommunityNoticeAct.java rename to app/src/main/java/com/mango/moshen/home/view/ICommunityNoticeAct.java index b64a90e18..fb48cda54 100644 --- a/app/src/main/java/com/yizhuan/erban/home/view/ICommunityNoticeAct.java +++ b/app/src/main/java/com/mango/moshen/home/view/ICommunityNoticeAct.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.home.view; +package com.mango.moshen.home.view; -import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.community.bean.CommunityNoticeInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/view/IFamilyHomeActivityView.java b/app/src/main/java/com/mango/moshen/home/view/IFamilyHomeActivityView.java similarity index 63% rename from app/src/main/java/com/yizhuan/erban/home/view/IFamilyHomeActivityView.java rename to app/src/main/java/com/mango/moshen/home/view/IFamilyHomeActivityView.java index 3ac95c3c8..8f3b0e6e3 100644 --- a/app/src/main/java/com/yizhuan/erban/home/view/IFamilyHomeActivityView.java +++ b/app/src/main/java/com/mango/moshen/home/view/IFamilyHomeActivityView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.home.view; +package com.mango.moshen.home.view; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; +import com.mango.core.family.bean.FamilyInfo; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java b/app/src/main/java/com/mango/moshen/home/view/IMainFragmentView.java similarity index 75% rename from app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java rename to app/src/main/java/com/mango/moshen/home/view/IMainFragmentView.java index f745fe915..cf6c915ef 100644 --- a/app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java +++ b/app/src/main/java/com/mango/moshen/home/view/IMainFragmentView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.home.view; +package com.mango.moshen.home.view; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.room.bean.RoomInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * @author jiajie diff --git a/app/src/main/java/com/yizhuan/erban/home/view/IMainView.java b/app/src/main/java/com/mango/moshen/home/view/IMainView.java similarity index 55% rename from app/src/main/java/com/yizhuan/erban/home/view/IMainView.java rename to app/src/main/java/com/mango/moshen/home/view/IMainView.java index 25affdb3d..ea619dab6 100644 --- a/app/src/main/java/com/yizhuan/erban/home/view/IMainView.java +++ b/app/src/main/java/com/mango/moshen/home/view/IMainView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.home.view; +package com.mango.moshen.home.view; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.room.bean.RoomInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; /** *

diff --git a/app/src/main/java/com/yizhuan/erban/home/view/INewUserListActivityView.java b/app/src/main/java/com/mango/moshen/home/view/INewUserListActivityView.java similarity index 56% rename from app/src/main/java/com/yizhuan/erban/home/view/INewUserListActivityView.java rename to app/src/main/java/com/mango/moshen/home/view/INewUserListActivityView.java index 8e428cf9b..35163c138 100644 --- a/app/src/main/java/com/yizhuan/erban/home/view/INewUserListActivityView.java +++ b/app/src/main/java/com/mango/moshen/home/view/INewUserListActivityView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.home.view; +package com.mango.moshen.home.view; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt b/app/src/main/java/com/mango/moshen/home/widget/AnchorCardView.kt similarity index 89% rename from app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt rename to app/src/main/java/com/mango/moshen/home/widget/AnchorCardView.kt index 1a51d5574..c07d23eb8 100644 --- a/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt +++ b/app/src/main/java/com/mango/moshen/home/widget/AnchorCardView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.widget +package com.mango.moshen.home.widget import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -18,23 +18,23 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.audio.helper.AudioPlayerHelper -import com.yizhuan.erban.audio.helper.OnPlayListener -import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.databinding.LayoutAnchorCardViewBinding -import com.yizhuan.erban.ui.user.UserInfoActivity -import com.yizhuan.erban.ui.user.decorationsend.UserInfoSkillDecoration -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.erban.ui.utils.loadAvatar -import com.yizhuan.xchat_android_core.room.bean.AnchorInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_library.utils.ListUtils -import com.yizhuan.xchat_android_library.utils.SingleToastUtil +import com.mango.moshen.R +import com.mango.moshen.audio.helper.AudioPlayerHelper +import com.mango.moshen.audio.helper.OnPlayListener +import com.mango.moshen.avroom.activity.AVRoomActivity +import com.mango.moshen.databinding.LayoutAnchorCardViewBinding +import com.mango.moshen.ui.user.UserInfoActivity +import com.mango.moshen.ui.user.decorationsend.UserInfoSkillDecoration +import com.mango.moshen.ui.utils.load +import com.mango.moshen.ui.utils.loadAvatar +import com.mango.core.room.bean.AnchorInfo +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.core.user.bean.UserInfo +import com.mango.core.user.bean.UserInfoSkillEntity +import com.mango.core.utils.subAndReplaceDot +import com.mango.xchat_android_library.utils.ListUtils +import com.mango.xchat_android_library.utils.SingleToastUtil import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/erban/home/widget/ListViewAdaptWidth.java b/app/src/main/java/com/mango/moshen/home/widget/ListViewAdaptWidth.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/home/widget/ListViewAdaptWidth.java rename to app/src/main/java/com/mango/moshen/home/widget/ListViewAdaptWidth.java index 8cc552833..e84a520b7 100644 --- a/app/src/main/java/com/yizhuan/erban/home/widget/ListViewAdaptWidth.java +++ b/app/src/main/java/com/mango/moshen/home/widget/ListViewAdaptWidth.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.widget; +package com.mango.moshen.home.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/erban/home/widget/MePageIndicatorView.java b/app/src/main/java/com/mango/moshen/home/widget/MePageIndicatorView.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/home/widget/MePageIndicatorView.java rename to app/src/main/java/com/mango/moshen/home/widget/MePageIndicatorView.java index f660c34da..b8a056df1 100644 --- a/app/src/main/java/com/yizhuan/erban/home/widget/MePageIndicatorView.java +++ b/app/src/main/java/com/mango/moshen/home/widget/MePageIndicatorView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.widget; +package com.mango.moshen.home.widget; import android.content.Context; import android.util.AttributeSet; @@ -6,8 +6,8 @@ import android.view.Gravity; import android.view.View; import android.widget.LinearLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/widget/StickyScrollView.java b/app/src/main/java/com/mango/moshen/home/widget/StickyScrollView.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/home/widget/StickyScrollView.java rename to app/src/main/java/com/mango/moshen/home/widget/StickyScrollView.java index 58a44f0db..3bda933fd 100644 --- a/app/src/main/java/com/yizhuan/erban/home/widget/StickyScrollView.java +++ b/app/src/main/java/com/mango/moshen/home/widget/StickyScrollView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.widget; +package com.mango.moshen.home.widget; import java.util.ArrayList; @@ -16,7 +16,7 @@ import android.view.animation.AlphaAnimation; import androidx.core.widget.NestedScrollView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; public class StickyScrollView extends NestedScrollView { diff --git a/app/src/main/java/com/yizhuan/erban/location/LocationManager.java b/app/src/main/java/com/mango/moshen/location/LocationManager.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/location/LocationManager.java rename to app/src/main/java/com/mango/moshen/location/LocationManager.java index b92bdf8d9..6447836e5 100644 --- a/app/src/main/java/com/yizhuan/erban/location/LocationManager.java +++ b/app/src/main/java/com/mango/moshen/location/LocationManager.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.location; +package com.mango.moshen.location; import android.content.Context; -import com.yizhuan.erban.guide.GuideActivity; -import com.yizhuan.erban.other.activity.SplashActivity; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_library.utils.UIUtils; +import com.mango.moshen.guide.GuideActivity; +import com.mango.moshen.other.activity.SplashActivity; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.xchat_android_library.utils.UIUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/erban/location/LocationUploadEvent.java b/app/src/main/java/com/mango/moshen/location/LocationUploadEvent.java similarity index 51% rename from app/src/main/java/com/yizhuan/erban/location/LocationUploadEvent.java rename to app/src/main/java/com/mango/moshen/location/LocationUploadEvent.java index ed724a54e..6b30b051d 100644 --- a/app/src/main/java/com/yizhuan/erban/location/LocationUploadEvent.java +++ b/app/src/main/java/com/mango/moshen/location/LocationUploadEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.location; +package com.mango.moshen.location; public class LocationUploadEvent { } diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/adapter/LuckyMoneyMemberListAdapter.java b/app/src/main/java/com/mango/moshen/luckymoney/adapter/LuckyMoneyMemberListAdapter.java similarity index 81% rename from app/src/main/java/com/yizhuan/erban/luckymoney/adapter/LuckyMoneyMemberListAdapter.java rename to app/src/main/java/com/mango/moshen/luckymoney/adapter/LuckyMoneyMemberListAdapter.java index a75b9dc2d..802a0ee96 100644 --- a/app/src/main/java/com/yizhuan/erban/luckymoney/adapter/LuckyMoneyMemberListAdapter.java +++ b/app/src/main/java/com/mango/moshen/luckymoney/adapter/LuckyMoneyMemberListAdapter.java @@ -1,17 +1,17 @@ -package com.yizhuan.erban.luckymoney.adapter; +package com.mango.moshen.luckymoney.adapter; import android.content.Context; import android.view.View; import android.widget.TextView; import com.netease.nim.uikit.common.ui.imageview.HeadImageView; -import com.yizhuan.erban.BR; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bindadapter.BaseAdapter; -import com.yizhuan.erban.bindadapter.BindingViewHolder; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyUserInfo; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.bindadapter.BindingViewHolder; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.family.model.FamilyModel; +import com.mango.core.luckymoney.LuckyMoneyUserInfo; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java b/app/src/main/java/com/mango/moshen/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java rename to app/src/main/java/com/mango/moshen/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java index 89437f6b2..19b06556d 100644 --- a/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java +++ b/app/src/main/java/com/mango/moshen/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.luckymoney.dialog; +package com.mango.moshen.luckymoney.dialog; import android.content.Context; import androidx.appcompat.app.AppCompatDialog; diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyDialog.java b/app/src/main/java/com/mango/moshen/luckymoney/dialog/LuckyMoneyDialog.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyDialog.java rename to app/src/main/java/com/mango/moshen/luckymoney/dialog/LuckyMoneyDialog.java index fc8659dc1..74d993342 100644 --- a/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyDialog.java +++ b/app/src/main/java/com/mango/moshen/luckymoney/dialog/LuckyMoneyDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.luckymoney.dialog; +package com.mango.moshen.luckymoney.dialog; import android.content.Context; import android.graphics.Color; @@ -14,23 +14,23 @@ import android.view.WindowManager; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_library.rxbus.RxBus; -import com.yizhuan.erban.luckymoney.view.LuckyMoneyDetailActivity; -import com.yizhuan.erban.team.viewmodel.TeamVM; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -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.share.bean.SessionType; -import com.yizhuan.xchat_android_core.team.bean.TeamEvent; -import com.yizhuan.xchat_android_core.team.model.TeamModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.core.auth.AuthModel; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.user.UserModel; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.moshen.luckymoney.view.LuckyMoneyDetailActivity; +import com.mango.moshen.team.viewmodel.TeamVM; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.model.FamilyModel; +import com.mango.core.luckymoney.LuckyMoneyInfo; +import com.mango.core.share.bean.SessionType; +import com.mango.core.team.bean.TeamEvent; +import com.mango.core.team.model.TeamModel; +import com.mango.core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java b/app/src/main/java/com/mango/moshen/luckymoney/view/LuckyMoneyCreationActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java rename to app/src/main/java/com/mango/moshen/luckymoney/view/LuckyMoneyCreationActivity.java index e26fb33ea..838603a6d 100644 --- a/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java +++ b/app/src/main/java/com/mango/moshen/luckymoney/view/LuckyMoneyCreationActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.luckymoney.view; +package com.mango.moshen.luckymoney.view; import android.content.Context; import android.content.Intent; @@ -12,26 +12,26 @@ import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.team.TeamService; import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.team.model.TeamMember; -import com.yizhuan.erban.R; -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.ActivityLuckyMoneyCreationBinding; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.erban.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.share.bean.SessionType; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.databinding.ActivityLuckyMoneyCreationBinding; +import com.mango.moshen.ui.pay.ChargeActivity; +import com.mango.core.auth.AuthModel; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.user.UserModel; +import com.mango.core.utils.net.BalanceNotEnoughExeption; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.team.viewmodel.TeamVM; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.model.FamilyModel; +import com.mango.core.share.bean.SessionType; +import com.mango.core.team.bean.TeamInfo; +import com.mango.core.team.model.TeamModel; +import com.mango.core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.JavaUtil; import com.trello.rxlifecycle3.android.ActivityEvent; import java.util.Objects; diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyDetailActivity.java b/app/src/main/java/com/mango/moshen/luckymoney/view/LuckyMoneyDetailActivity.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyDetailActivity.java rename to app/src/main/java/com/mango/moshen/luckymoney/view/LuckyMoneyDetailActivity.java index ea441a6f7..30d90a75f 100644 --- a/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyDetailActivity.java +++ b/app/src/main/java/com/mango/moshen/luckymoney/view/LuckyMoneyDetailActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.luckymoney.view; +package com.mango.moshen.luckymoney.view; import android.content.Context; import android.content.Intent; @@ -6,22 +6,22 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearLayoutManager; import android.view.View; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.databinding.ActivityLuckyMoneyDetailBinding; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.luckymoney.adapter.LuckyMoneyMemberListAdapter; -import com.yizhuan.erban.team.viewmodel.TeamVM; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -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.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.databinding.ActivityLuckyMoneyDetailBinding; +import com.mango.core.user.UserModel; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.luckymoney.adapter.LuckyMoneyMemberListAdapter; +import com.mango.moshen.team.viewmodel.TeamVM; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.model.FamilyModel; +import com.mango.core.luckymoney.LuckyMoneyInfo; +import com.mango.core.luckymoney.LuckyMoneyUserInfo; +import com.mango.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java b/app/src/main/java/com/mango/moshen/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java rename to app/src/main/java/com/mango/moshen/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java index 0a359bb37..7b4d8454c 100644 --- a/app/src/main/java/com/yizhuan/erban/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java +++ b/app/src/main/java/com/mango/moshen/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.luckymoney.viewholder; +package com.mango.moshen.luckymoney.viewholder; import android.util.Log; import android.view.View; @@ -10,15 +10,15 @@ import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.team.TeamService; import com.netease.nimlib.sdk.team.model.Team; -import com.yizhuan.erban.R; -import com.yizhuan.erban.luckymoney.dialog.LuckyMoneyDialog; -import com.yizhuan.erban.luckymoney.view.LuckyMoneyDetailActivity; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyAttachment; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.luckymoney.dialog.LuckyMoneyDialog; +import com.mango.moshen.luckymoney.view.LuckyMoneyDetailActivity; +import com.mango.core.im.custom.bean.LuckyMoneyAttachment; +import com.mango.core.luckymoney.LuckyMoneyInfo; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.team.bean.TeamInfo; +import com.mango.core.team.model.TeamModel; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.Objects; diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java b/app/src/main/java/com/mango/moshen/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java rename to app/src/main/java/com/mango/moshen/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java index 332b8f88b..ff3a331e7 100644 --- a/app/src/main/java/com/yizhuan/erban/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java +++ b/app/src/main/java/com/mango/moshen/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.luckymoney.viewholder; +package com.mango.moshen.luckymoney.viewholder; import androidx.core.content.ContextCompat; import android.text.SpannableStringBuilder; @@ -9,10 +9,10 @@ import android.widget.TextView; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; +import com.mango.moshen.R; +import com.mango.core.auth.AuthModel; +import com.mango.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.mango.core.luckymoney.LuckyMoneyInfo; import java.util.Objects; diff --git a/app/src/main/java/com/yizhuan/erban/main/helper/NoticationsUiHelper.java b/app/src/main/java/com/mango/moshen/main/helper/NoticationsUiHelper.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/main/helper/NoticationsUiHelper.java rename to app/src/main/java/com/mango/moshen/main/helper/NoticationsUiHelper.java index 4f54bc142..9d649f717 100644 --- a/app/src/main/java/com/yizhuan/erban/main/helper/NoticationsUiHelper.java +++ b/app/src/main/java/com/mango/moshen/main/helper/NoticationsUiHelper.java @@ -1,15 +1,15 @@ -package com.yizhuan.erban.main.helper; +package com.mango.moshen.main.helper; import android.app.Activity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.utils.NotificationsUtils; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.utils.NotificationsUtils; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/yizhuan/erban/module/Extras.java b/app/src/main/java/com/mango/moshen/module/Extras.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/module/Extras.java rename to app/src/main/java/com/mango/moshen/module/Extras.java index b170626f4..d34f2ec11 100644 --- a/app/src/main/java/com/yizhuan/erban/module/Extras.java +++ b/app/src/main/java/com/mango/moshen/module/Extras.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module; +package com.mango.moshen.module; public interface Extras { diff --git a/app/src/main/java/com/yizhuan/erban/module/IRoomNewbieMessageView.java b/app/src/main/java/com/mango/moshen/module/IRoomNewbieMessageView.java similarity index 53% rename from app/src/main/java/com/yizhuan/erban/module/IRoomNewbieMessageView.java rename to app/src/main/java/com/mango/moshen/module/IRoomNewbieMessageView.java index ce6703d50..4ef7f3385 100644 --- a/app/src/main/java/com/yizhuan/erban/module/IRoomNewbieMessageView.java +++ b/app/src/main/java/com/mango/moshen/module/IRoomNewbieMessageView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.module; +package com.mango.moshen.module; -import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.bean.RoomNewbieMessageInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; public interface IRoomNewbieMessageView extends IMvpBaseView { void getRoomNewbieMessageSuccess(RoomNewbieMessageInfo info); diff --git a/app/src/main/java/com/yizhuan/erban/module/IRoomNewbieView.java b/app/src/main/java/com/mango/moshen/module/IRoomNewbieView.java similarity index 66% rename from app/src/main/java/com/yizhuan/erban/module/IRoomNewbieView.java rename to app/src/main/java/com/mango/moshen/module/IRoomNewbieView.java index 0fcd6a2cf..f7f922084 100644 --- a/app/src/main/java/com/yizhuan/erban/module/IRoomNewbieView.java +++ b/app/src/main/java/com/mango/moshen/module/IRoomNewbieView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.module; +package com.mango.moshen.module; -import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.bean.RoomNewbieInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/module/RoomNewbieModel.java b/app/src/main/java/com/mango/moshen/module/RoomNewbieModel.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/module/RoomNewbieModel.java rename to app/src/main/java/com/mango/moshen/module/RoomNewbieModel.java index f7690c6cc..27424ae02 100644 --- a/app/src/main/java/com/yizhuan/erban/module/RoomNewbieModel.java +++ b/app/src/main/java/com/mango/moshen/module/RoomNewbieModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.module; +package com.mango.moshen.module; -import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo; -import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.CommunityConstant; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.bean.RoomNewbieMessageInfo; +import com.mango.core.bean.RoomNewbieInfo; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.community.CommunityConstant; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import org.json.JSONObject; diff --git a/app/src/main/java/com/yizhuan/erban/monsterhunting/ImpactValueLayout.java b/app/src/main/java/com/mango/moshen/monsterhunting/ImpactValueLayout.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/monsterhunting/ImpactValueLayout.java rename to app/src/main/java/com/mango/moshen/monsterhunting/ImpactValueLayout.java index edb32ee46..fb6c6ae39 100644 --- a/app/src/main/java/com/yizhuan/erban/monsterhunting/ImpactValueLayout.java +++ b/app/src/main/java/com/mango/moshen/monsterhunting/ImpactValueLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.monsterhunting; +package com.mango.moshen.monsterhunting; import android.content.Context; import android.content.res.TypedArray; @@ -8,10 +8,10 @@ import android.view.View; import android.view.ViewGroup; import android.widget.RelativeLayout; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.animator.AbstractPathAnimator; -import com.yizhuan.xchat_android_library.animator.PathAnimator; -import com.yizhuan.erban.ui.gift.widget.StrokeTextView; +import com.mango.moshen.R; +import com.mango.xchat_android_library.animator.AbstractPathAnimator; +import com.mango.xchat_android_library.animator.PathAnimator; +import com.mango.moshen.ui.gift.widget.StrokeTextView; public class ImpactValueLayout extends RelativeLayout { diff --git a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterEscapeDialog.java b/app/src/main/java/com/mango/moshen/monsterhunting/MonsterEscapeDialog.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterEscapeDialog.java rename to app/src/main/java/com/mango/moshen/monsterhunting/MonsterEscapeDialog.java index e41ad08a3..1f6e0c0d0 100644 --- a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterEscapeDialog.java +++ b/app/src/main/java/com/mango/moshen/monsterhunting/MonsterEscapeDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.monsterhunting; +package com.mango.moshen.monsterhunting; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -14,10 +14,10 @@ import android.view.Window; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.manager.MonsterDataManager; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.monsterhunting.bean.MonsterInfo; +import com.mango.core.monsterhunting.manager.MonsterDataManager; /** * Created by MadisonRong on 03/04/2018. diff --git a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingAnimationManager.java b/app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingAnimationManager.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingAnimationManager.java rename to app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingAnimationManager.java index afa4d574a..ff846486f 100644 --- a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingAnimationManager.java +++ b/app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingAnimationManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.monsterhunting; +package com.mango.moshen.monsterhunting; import android.content.Context; import android.view.View; @@ -8,10 +8,10 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterEvent; -import com.yizhuan.xchat_android_core.monsterhunting.SimpleAnimationListener; +import com.mango.moshen.R; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.monsterhunting.bean.MonsterEvent; +import com.mango.core.monsterhunting.SimpleAnimationListener; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.processors.PublishProcessor; diff --git a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingIntroductionDialog.java b/app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingIntroductionDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingIntroductionDialog.java rename to app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingIntroductionDialog.java index 3e9788822..b25f00a8a 100644 --- a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingIntroductionDialog.java +++ b/app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingIntroductionDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.monsterhunting; +package com.mango.moshen.monsterhunting; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -13,8 +13,8 @@ import android.view.ViewGroup; import android.view.Window; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; /** * Created by MadisonRong on 02/04/2018. diff --git a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingRewardDialog.java b/app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingRewardDialog.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingRewardDialog.java rename to app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingRewardDialog.java index d7ba78e4f..fffe65939 100644 --- a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingRewardDialog.java +++ b/app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingRewardDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.monsterhunting; +package com.mango.moshen.monsterhunting; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -18,16 +18,16 @@ import android.view.Window; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHunter; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingReward; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.manager.MonsterDataManager; -import com.yizhuan.xchat_android_core.monsterhunting.model.MonsterHuntingModel; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.monsterhunting.bean.MonsterHunter; +import com.mango.core.monsterhunting.bean.MonsterHuntingResult; +import com.mango.core.monsterhunting.bean.MonsterHuntingReward; +import com.mango.core.monsterhunting.bean.MonsterInfo; +import com.mango.core.monsterhunting.manager.MonsterDataManager; +import com.mango.core.monsterhunting.model.MonsterHuntingModel; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.List; import java.util.Locale; diff --git a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingRewardsAdapter.java b/app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingRewardsAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingRewardsAdapter.java rename to app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingRewardsAdapter.java index 3475f7819..0eeeac538 100644 --- a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingRewardsAdapter.java +++ b/app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingRewardsAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.monsterhunting; +package com.mango.moshen.monsterhunting; import android.content.Context; import androidx.recyclerview.widget.RecyclerView; @@ -8,11 +8,11 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.adapters.BaseListRecyclerViewAdapter; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingReward; +import com.mango.moshen.R; +import com.mango.xchat_android_library.adapters.BaseListRecyclerViewAdapter; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.monsterhunting.bean.MonsterHuntingReward; import java.util.Collection; diff --git a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingSvgaManager.java b/app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingSvgaManager.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingSvgaManager.java rename to app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingSvgaManager.java index 334ce3e14..864132bac 100644 --- a/app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingSvgaManager.java +++ b/app/src/main/java/com/mango/moshen/monsterhunting/MonsterHuntingSvgaManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.monsterhunting; +package com.mango.moshen.monsterhunting; import android.content.Context; import android.text.TextUtils; @@ -9,9 +9,9 @@ import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; -import com.yizhuan.erban.common.svga.SimpleSvgaCallback; -import com.yizhuan.erban.common.svga.SimpleSvgaParseCompletion; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterEvent; +import com.mango.moshen.common.svga.SimpleSvgaCallback; +import com.mango.moshen.common.svga.SimpleSvgaParseCompletion; +import com.mango.core.monsterhunting.bean.MonsterEvent; import java.net.MalformedURLException; import java.net.URL; diff --git a/app/src/main/java/com/yizhuan/erban/monsterhunting/QuitConfirmDialog.java b/app/src/main/java/com/mango/moshen/monsterhunting/QuitConfirmDialog.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/monsterhunting/QuitConfirmDialog.java rename to app/src/main/java/com/mango/moshen/monsterhunting/QuitConfirmDialog.java index 322609520..9d820c24b 100644 --- a/app/src/main/java/com/yizhuan/erban/monsterhunting/QuitConfirmDialog.java +++ b/app/src/main/java/com/mango/moshen/monsterhunting/QuitConfirmDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.monsterhunting; +package com.mango.moshen.monsterhunting; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -13,7 +13,7 @@ import android.view.ViewGroup; import android.view.Window; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * Created by MadisonRong on 02/04/2018. diff --git a/app/src/main/java/com/yizhuan/erban/monsterhunting/SimpleCountDownTimer.java b/app/src/main/java/com/mango/moshen/monsterhunting/SimpleCountDownTimer.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/monsterhunting/SimpleCountDownTimer.java rename to app/src/main/java/com/mango/moshen/monsterhunting/SimpleCountDownTimer.java index 940f95b2b..80c7258e4 100644 --- a/app/src/main/java/com/yizhuan/erban/monsterhunting/SimpleCountDownTimer.java +++ b/app/src/main/java/com/mango/moshen/monsterhunting/SimpleCountDownTimer.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.monsterhunting; +package com.mango.moshen.monsterhunting; import android.os.CountDownTimer; diff --git a/app/src/main/java/com/yizhuan/erban/monsterhunting/bean/AttackMonsterResultInfo.java b/app/src/main/java/com/mango/moshen/monsterhunting/bean/AttackMonsterResultInfo.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/monsterhunting/bean/AttackMonsterResultInfo.java rename to app/src/main/java/com/mango/moshen/monsterhunting/bean/AttackMonsterResultInfo.java index 65f7005ff..0501c89af 100644 --- a/app/src/main/java/com/yizhuan/erban/monsterhunting/bean/AttackMonsterResultInfo.java +++ b/app/src/main/java/com/mango/moshen/monsterhunting/bean/AttackMonsterResultInfo.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.monsterhunting.bean; +package com.mango.moshen.monsterhunting.bean; import androidx.databinding.BaseObservable; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterAttackInfo; +import com.mango.core.monsterhunting.bean.MonsterAttackInfo; public class AttackMonsterResultInfo extends BaseObservable{ diff --git a/app/src/main/java/com/yizhuan/erban/monsterhunting/bean/UpdateMyGoldInfo.java b/app/src/main/java/com/mango/moshen/monsterhunting/bean/UpdateMyGoldInfo.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/monsterhunting/bean/UpdateMyGoldInfo.java rename to app/src/main/java/com/mango/moshen/monsterhunting/bean/UpdateMyGoldInfo.java index c75579970..f9c7f1a3f 100644 --- a/app/src/main/java/com/yizhuan/erban/monsterhunting/bean/UpdateMyGoldInfo.java +++ b/app/src/main/java/com/mango/moshen/monsterhunting/bean/UpdateMyGoldInfo.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.monsterhunting.bean; +package com.mango.moshen.monsterhunting.bean; import androidx.databinding.BaseObservable; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; +import com.mango.core.pay.bean.WalletInfo; public class UpdateMyGoldInfo extends BaseObservable { diff --git a/app/src/main/java/com/yizhuan/erban/other/SplashBitmapTransformation.java b/app/src/main/java/com/mango/moshen/other/SplashBitmapTransformation.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/other/SplashBitmapTransformation.java rename to app/src/main/java/com/mango/moshen/other/SplashBitmapTransformation.java index 7170adb77..13708869a 100644 --- a/app/src/main/java/com/yizhuan/erban/other/SplashBitmapTransformation.java +++ b/app/src/main/java/com/mango/moshen/other/SplashBitmapTransformation.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.other; +package com.mango.moshen.other; import android.graphics.Bitmap; import androidx.annotation.NonNull; @@ -12,7 +12,7 @@ import java.security.MessageDigest; * splash 适配图片 */ public class SplashBitmapTransformation extends BitmapTransformation { - private static final String ID = "com.yizhuan.erban.other.SplashBitmapTransformation"; + private static final String ID = "com.mango.moshen.other.SplashBitmapTransformation"; private static final byte[] ID_BYTES = ID.getBytes(CHARSET); public SplashBitmapTransformation() { diff --git a/app/src/main/java/com/yizhuan/erban/other/activity/SplashActivity.java b/app/src/main/java/com/mango/moshen/other/activity/SplashActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/other/activity/SplashActivity.java rename to app/src/main/java/com/mango/moshen/other/activity/SplashActivity.java index 307586faa..62c723808 100644 --- a/app/src/main/java/com/yizhuan/erban/other/activity/SplashActivity.java +++ b/app/src/main/java/com/mango/moshen/other/activity/SplashActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.other.activity; +package com.mango.moshen.other.activity; import android.annotation.SuppressLint; import android.content.Intent; @@ -14,18 +14,18 @@ import com.bumptech.glide.request.RequestOptions; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.support.glide.GlideApp; import com.umeng.commonsdk.UMConfigure; -import com.yizhuan.erban.MainActivity; -import com.yizhuan.erban.NimMiddleActivity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.application.XChatApplication; -import com.yizhuan.erban.databinding.ActivitySplashBinding; -import com.yizhuan.erban.other.SplashBitmapTransformation; -import com.yizhuan.erban.other.dialog.PrivacyAgreementDialog; -import com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.SplashComponent; -import com.yizhuan.xchat_android_core.utils.OaidUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.mango.moshen.MainActivity; +import com.mango.moshen.NimMiddleActivity; +import com.mango.moshen.R; +import com.mango.moshen.application.XChatApplication; +import com.mango.moshen.databinding.ActivitySplashBinding; +import com.mango.moshen.other.SplashBitmapTransformation; +import com.mango.moshen.other.dialog.PrivacyAgreementDialog; +import com.mango.core.channel_page.model.ChannelPageModel; +import com.mango.core.initial.InitialModel; +import com.mango.core.initial.SplashComponent; +import com.mango.core.utils.OaidUtil; +import com.mango.core.utils.SharedPreferenceUtils; /** * @author xiaoyu diff --git a/app/src/main/java/com/yizhuan/erban/other/dialog/PrivacyAgreementDialog.java b/app/src/main/java/com/mango/moshen/other/dialog/PrivacyAgreementDialog.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/other/dialog/PrivacyAgreementDialog.java rename to app/src/main/java/com/mango/moshen/other/dialog/PrivacyAgreementDialog.java index 176286610..82814b76a 100644 --- a/app/src/main/java/com/yizhuan/erban/other/dialog/PrivacyAgreementDialog.java +++ b/app/src/main/java/com/mango/moshen/other/dialog/PrivacyAgreementDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.other.dialog; +package com.mango.moshen.other.dialog; import android.annotation.SuppressLint; import android.app.Dialog; @@ -18,19 +18,18 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.erban.ui.webview.SimpleWebViewActivity; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_library.utils.ScreenUtils; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.OriginalDrawStatusClickSpan; +import com.mango.moshen.ui.webview.SimpleWebViewActivity; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.UriProvider; +import com.mango.xchat_android_library.utils.ScreenUtils; 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; public class PrivacyAgreementDialog extends Dialog implements View.OnClickListener { diff --git a/app/src/main/java/com/mango/moshen/other/present/SplashPresenter.java b/app/src/main/java/com/mango/moshen/other/present/SplashPresenter.java new file mode 100644 index 000000000..dce5b0345 --- /dev/null +++ b/app/src/main/java/com/mango/moshen/other/present/SplashPresenter.java @@ -0,0 +1,15 @@ +package com.mango.moshen.other.present; + +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.other.view.ISplashView; + +/** + *

+ * + * @author jiahui + * @date 2017/12/8 + */ +public class SplashPresenter extends BaseMvpPresenter { + + +} diff --git a/app/src/main/java/com/yizhuan/erban/other/view/ISplashView.java b/app/src/main/java/com/mango/moshen/other/view/ISplashView.java similarity index 61% rename from app/src/main/java/com/yizhuan/erban/other/view/ISplashView.java rename to app/src/main/java/com/mango/moshen/other/view/ISplashView.java index 7d54f9354..76280f957 100644 --- a/app/src/main/java/com/yizhuan/erban/other/view/ISplashView.java +++ b/app/src/main/java/com/mango/moshen/other/view/ISplashView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.other.view; +package com.mango.moshen.other.view; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; +import com.mango.core.home.bean.TabInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldActivity.kt b/app/src/main/java/com/mango/moshen/pay/activity/GiveGoldActivity.kt similarity index 86% rename from app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldActivity.kt rename to app/src/main/java/com/mango/moshen/pay/activity/GiveGoldActivity.kt index d8d846fe1..b30061ad1 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldActivity.kt +++ b/app/src/main/java/com/mango/moshen/pay/activity/GiveGoldActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.pay.activity +package com.mango.moshen.pay.activity import android.annotation.SuppressLint import android.app.Activity @@ -7,12 +7,12 @@ import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager import com.yinyuan.doudou.pay.activity.GiveGoldSearchActivity import com.yinyuan.doudou.pay.adapter.LatelyGiveAdapter -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseActivity -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserInfo +import com.mango.moshen.R +import com.mango.moshen.base.BaseActivity +import com.mango.moshen.common.EmptyViewHelper +import com.mango.core.room.bean.SearchRoomInfo +import com.mango.core.user.UserModel +import com.mango.core.user.bean.UserInfo import kotlinx.android.synthetic.main.activity_give_gold.* diff --git a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSearchActivity.kt b/app/src/main/java/com/mango/moshen/pay/activity/GiveGoldSearchActivity.kt similarity index 88% rename from app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSearchActivity.kt rename to app/src/main/java/com/mango/moshen/pay/activity/GiveGoldSearchActivity.kt index 0d19575e9..2957aacd6 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSearchActivity.kt +++ b/app/src/main/java/com/mango/moshen/pay/activity/GiveGoldSearchActivity.kt @@ -9,13 +9,13 @@ import androidx.recyclerview.widget.LinearLayoutManager import android.text.Editable import android.text.TextWatcher import com.yinyuan.doudou.pay.adapter.GiveSearchAdapter -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseActivity -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo -import com.yizhuan.xchat_android_core.room.model.AvRoomModel -import com.yizhuan.xchat_android_core.utils.net.RxHelper +import com.mango.moshen.R +import com.mango.moshen.base.BaseActivity +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.room.bean.SearchRoomInfo +import com.mango.core.room.model.AvRoomModel +import com.mango.core.utils.net.RxHelper import kotlinx.android.synthetic.main.activity_give_gold_search.* diff --git a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSuccessActivity.kt b/app/src/main/java/com/mango/moshen/pay/activity/GiveGoldSuccessActivity.kt similarity index 89% rename from app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSuccessActivity.kt rename to app/src/main/java/com/mango/moshen/pay/activity/GiveGoldSuccessActivity.kt index ff72bf1f0..474f6b94d 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSuccessActivity.kt +++ b/app/src/main/java/com/mango/moshen/pay/activity/GiveGoldSuccessActivity.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.pay.activity +package com.mango.moshen.pay.activity import android.content.Context import android.content.Intent import android.os.Bundle -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseActivity +import com.mango.moshen.R +import com.mango.moshen.base.BaseActivity import kotlinx.android.synthetic.main.activity_give_gold_success.* diff --git a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldToUserActivity.kt b/app/src/main/java/com/mango/moshen/pay/activity/GiveGoldToUserActivity.kt similarity index 91% rename from app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldToUserActivity.kt rename to app/src/main/java/com/mango/moshen/pay/activity/GiveGoldToUserActivity.kt index 74e480fd6..d41aaecc6 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldToUserActivity.kt +++ b/app/src/main/java/com/mango/moshen/pay/activity/GiveGoldToUserActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.pay.activity +package com.mango.moshen.pay.activity import android.annotation.SuppressLint import android.content.Context @@ -7,13 +7,13 @@ import android.os.Bundle import android.text.Editable import android.text.TextWatcher import com.jungly.gridpasswordview.GridPasswordView -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseActivity -import com.yizhuan.erban.pay.password.GiveGoldPassWordFragment -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.DemoCache -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.user.bean.UserInfo +import com.mango.moshen.R +import com.mango.moshen.base.BaseActivity +import com.mango.moshen.pay.password.GiveGoldPassWordFragment +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.DemoCache +import com.mango.core.pay.PayModel +import com.mango.core.user.bean.UserInfo import kotlinx.android.synthetic.main.activity_give_gold_to_user.* diff --git a/app/src/main/java/com/yizhuan/erban/pay/adapter/ChargeAdapter.java b/app/src/main/java/com/mango/moshen/pay/adapter/ChargeAdapter.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/pay/adapter/ChargeAdapter.java rename to app/src/main/java/com/mango/moshen/pay/adapter/ChargeAdapter.java index e3788e8bc..a113e40fa 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/adapter/ChargeAdapter.java +++ b/app/src/main/java/com/mango/moshen/pay/adapter/ChargeAdapter.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.pay.adapter; +package com.mango.moshen.pay.adapter; import android.text.TextUtils; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; +import com.mango.moshen.R; +import com.mango.core.pay.bean.ChargeBean; /** diff --git a/app/src/main/java/com/yizhuan/erban/pay/adapter/GiveSearchAdapter.kt b/app/src/main/java/com/mango/moshen/pay/adapter/GiveSearchAdapter.kt similarity index 87% rename from app/src/main/java/com/yizhuan/erban/pay/adapter/GiveSearchAdapter.kt rename to app/src/main/java/com/mango/moshen/pay/adapter/GiveSearchAdapter.kt index 112f6f4d9..baa3e515e 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/adapter/GiveSearchAdapter.kt +++ b/app/src/main/java/com/mango/moshen/pay/adapter/GiveSearchAdapter.kt @@ -6,10 +6,10 @@ import android.widget.TextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.coorchice.library.SuperTextView -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils +import com.mango.moshen.R +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.room.bean.SearchRoomInfo +import com.mango.core.utils.CurrentTimeUtils class GiveSearchAdapter : BaseQuickAdapter(R.layout.item_lately_give) { diff --git a/app/src/main/java/com/yizhuan/erban/pay/adapter/LatelyGiveAdapter.kt b/app/src/main/java/com/mango/moshen/pay/adapter/LatelyGiveAdapter.kt similarity index 87% rename from app/src/main/java/com/yizhuan/erban/pay/adapter/LatelyGiveAdapter.kt rename to app/src/main/java/com/mango/moshen/pay/adapter/LatelyGiveAdapter.kt index 3d493eef3..925893103 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/adapter/LatelyGiveAdapter.kt +++ b/app/src/main/java/com/mango/moshen/pay/adapter/LatelyGiveAdapter.kt @@ -6,10 +6,10 @@ import android.widget.TextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.coorchice.library.SuperTextView -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils +import com.mango.moshen.R +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.user.bean.UserInfo +import com.mango.core.utils.CurrentTimeUtils class LatelyGiveAdapter : BaseQuickAdapter(R.layout.item_lately_give) { diff --git a/app/src/main/java/com/yizhuan/erban/pay/password/GiveGoldPassWordFragment.java b/app/src/main/java/com/mango/moshen/pay/password/GiveGoldPassWordFragment.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/pay/password/GiveGoldPassWordFragment.java rename to app/src/main/java/com/mango/moshen/pay/password/GiveGoldPassWordFragment.java index 883b8f0da..1b206191a 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/password/GiveGoldPassWordFragment.java +++ b/app/src/main/java/com/mango/moshen/pay/password/GiveGoldPassWordFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.pay.password; +package com.mango.moshen.pay.password; import android.graphics.drawable.ColorDrawable; @@ -17,8 +17,8 @@ import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; import com.jungly.gridpasswordview.GridPasswordView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.setting.VerifyPhoneActivity; +import com.mango.moshen.R; +import com.mango.moshen.ui.setting.VerifyPhoneActivity; //也可继承design中的BottomSheetDialogFragment diff --git a/app/src/main/java/com/yizhuan/erban/pay/password/GiveGoldPasswordView.java b/app/src/main/java/com/mango/moshen/pay/password/GiveGoldPasswordView.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/pay/password/GiveGoldPasswordView.java rename to app/src/main/java/com/mango/moshen/pay/password/GiveGoldPasswordView.java index 52e5bb86c..c85e5c79c 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/password/GiveGoldPasswordView.java +++ b/app/src/main/java/com/mango/moshen/pay/password/GiveGoldPasswordView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.pay.password; +package com.mango.moshen.pay.password; import android.content.Context; import android.util.AttributeSet; @@ -8,8 +8,8 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.jungly.gridpasswordview.GridPasswordView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.password.PasswordKeyboardView; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.password.PasswordKeyboardView; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/pay/presenter/ChargePresenter.java b/app/src/main/java/com/mango/moshen/pay/presenter/ChargePresenter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/pay/presenter/ChargePresenter.java rename to app/src/main/java/com/mango/moshen/pay/presenter/ChargePresenter.java index 119b817ea..371f17e04 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/presenter/ChargePresenter.java +++ b/app/src/main/java/com/mango/moshen/pay/presenter/ChargePresenter.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.pay.presenter; +package com.mango.moshen.pay.presenter; import android.annotation.SuppressLint; import android.content.Context; -import com.yizhuan.erban.pay.view.IChargeView; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.pay.view.IChargeView; +import com.mango.core.pay.PayModel; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/main/java/com/yizhuan/erban/pay/presenter/PayPresenter.java b/app/src/main/java/com/mango/moshen/pay/presenter/PayPresenter.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/pay/presenter/PayPresenter.java rename to app/src/main/java/com/mango/moshen/pay/presenter/PayPresenter.java index 9d75ae26c..a2cd340a4 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/presenter/PayPresenter.java +++ b/app/src/main/java/com/mango/moshen/pay/presenter/PayPresenter.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.pay.presenter; +package com.mango.moshen.pay.presenter; import android.annotation.SuppressLint; -import com.yizhuan.erban.pay.view.IPayView; -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.AbstractMvpPresenter; +import com.mango.moshen.pay.view.IPayView; +import com.mango.core.pay.PayModel; +import com.mango.core.pay.bean.WalletInfo; +import com.mango.xchat_android_library.base.factory.AbstractMvpPresenter; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/main/java/com/yizhuan/erban/pay/view/IChargeView.java b/app/src/main/java/com/mango/moshen/pay/view/IChargeView.java similarity index 74% rename from app/src/main/java/com/yizhuan/erban/pay/view/IChargeView.java rename to app/src/main/java/com/mango/moshen/pay/view/IChargeView.java index 0dd33f8b5..100f50f6a 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/view/IChargeView.java +++ b/app/src/main/java/com/mango/moshen/pay/view/IChargeView.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.pay.view; +package com.mango.moshen.pay.view; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.core.pay.bean.ChargeBean; +import com.mango.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/pay/view/IPayView.java b/app/src/main/java/com/mango/moshen/pay/view/IPayView.java similarity index 58% rename from app/src/main/java/com/yizhuan/erban/pay/view/IPayView.java rename to app/src/main/java/com/mango/moshen/pay/view/IPayView.java index 7670a34b8..3c5aeb745 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/view/IPayView.java +++ b/app/src/main/java/com/mango/moshen/pay/view/IPayView.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.pay.view; +package com.mango.moshen.pay.view; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.pay.bean.WalletInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * Created by MadisonRong on 08/01/2018. diff --git a/app/src/main/java/com/yizhuan/erban/push/HWPushMiddleActivity.java b/app/src/main/java/com/mango/moshen/push/HWPushMiddleActivity.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/push/HWPushMiddleActivity.java rename to app/src/main/java/com/mango/moshen/push/HWPushMiddleActivity.java index d32d0a20d..1d00f9c27 100644 --- a/app/src/main/java/com/yizhuan/erban/push/HWPushMiddleActivity.java +++ b/app/src/main/java/com/mango/moshen/push/HWPushMiddleActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.push; +package com.mango.moshen.push; import android.app.Activity; import android.content.Intent; @@ -6,11 +6,11 @@ import android.os.Bundle; import android.os.Handler; import android.util.Log; -import com.yizhuan.erban.MainActivity; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.utils.PushMessageHandler; +import com.mango.moshen.MainActivity; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.ui.im.avtivity.NimP2PMessageActivity; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.utils.PushMessageHandler; public class HWPushMiddleActivity extends Activity { @Override diff --git a/app/src/main/java/com/yizhuan/erban/push/MeizuPushReceiver.java b/app/src/main/java/com/mango/moshen/push/MeizuPushReceiver.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/push/MeizuPushReceiver.java rename to app/src/main/java/com/mango/moshen/push/MeizuPushReceiver.java index 0b6107941..46f2100a0 100644 --- a/app/src/main/java/com/yizhuan/erban/push/MeizuPushReceiver.java +++ b/app/src/main/java/com/mango/moshen/push/MeizuPushReceiver.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.push; +package com.mango.moshen.push; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/push/MiPushReceiver.java b/app/src/main/java/com/mango/moshen/push/MiPushReceiver.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/push/MiPushReceiver.java rename to app/src/main/java/com/mango/moshen/push/MiPushReceiver.java index 455bc0001..538412f6f 100644 --- a/app/src/main/java/com/yizhuan/erban/push/MiPushReceiver.java +++ b/app/src/main/java/com/mango/moshen/push/MiPushReceiver.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.push; +package com.mango.moshen.push; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/push/OppoAppPushService.java b/app/src/main/java/com/mango/moshen/push/OppoAppPushService.java similarity index 81% rename from app/src/main/java/com/yizhuan/erban/push/OppoAppPushService.java rename to app/src/main/java/com/mango/moshen/push/OppoAppPushService.java index 24664c06a..aca06b36e 100644 --- a/app/src/main/java/com/yizhuan/erban/push/OppoAppPushService.java +++ b/app/src/main/java/com/mango/moshen/push/OppoAppPushService.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.push; +package com.mango.moshen.push; import com.netease.nimlib.sdk.mixpush.OppoAppPushMessageService; diff --git a/app/src/main/java/com/yizhuan/erban/push/OppoPushService.java b/app/src/main/java/com/mango/moshen/push/OppoPushService.java similarity index 80% rename from app/src/main/java/com/yizhuan/erban/push/OppoPushService.java rename to app/src/main/java/com/mango/moshen/push/OppoPushService.java index 23368a2bc..121bf058a 100644 --- a/app/src/main/java/com/yizhuan/erban/push/OppoPushService.java +++ b/app/src/main/java/com/mango/moshen/push/OppoPushService.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.push; +package com.mango.moshen.push; import com.netease.nimlib.sdk.mixpush.OppoPushMessageService; diff --git a/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java b/app/src/main/java/com/mango/moshen/radish/activity/RadishRecordActivity.java similarity index 78% rename from app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java rename to app/src/main/java/com/mango/moshen/radish/activity/RadishRecordActivity.java index ec3fb2a93..7c0426be5 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java +++ b/app/src/main/java/com/mango/moshen/radish/activity/RadishRecordActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.radish.activity; +package com.mango.moshen.radish.activity; import androidx.lifecycle.Observer; import android.content.Context; @@ -11,24 +11,24 @@ import android.view.View; import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.radish.presenter.RadishRecordPresenter; -import com.yizhuan.erban.radish.view.IRadishRecordView; -import com.yizhuan.erban.radish.wallet.RadishWalletManager; -import com.yizhuan.erban.radish.widget.RadishRecordNavAdapter; -import com.yizhuan.erban.ui.radish.RadishRecordFragment; -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.radish.RadishWalletInfo; -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; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.RoomContributeListAdapter; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.radish.presenter.RadishRecordPresenter; +import com.mango.moshen.radish.view.IRadishRecordView; +import com.mango.moshen.radish.wallet.RadishWalletManager; +import com.mango.moshen.radish.widget.RadishRecordNavAdapter; +import com.mango.moshen.ui.radish.RadishRecordFragment; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.core.UriProvider; +import com.mango.core.radish.RadishWalletInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.base.factory.CreatePresenter; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/radish/adapter/RadishRecordAdapter.java b/app/src/main/java/com/mango/moshen/radish/adapter/RadishRecordAdapter.java similarity index 74% rename from app/src/main/java/com/yizhuan/erban/radish/adapter/RadishRecordAdapter.java rename to app/src/main/java/com/mango/moshen/radish/adapter/RadishRecordAdapter.java index 21027a570..d183cfee1 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/adapter/RadishRecordAdapter.java +++ b/app/src/main/java/com/mango/moshen/radish/adapter/RadishRecordAdapter.java @@ -1,17 +1,17 @@ -package com.yizhuan.erban.radish.adapter; +package com.mango.moshen.radish.adapter; import androidx.core.content.ContextCompat; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bills.adapter.BillBaseAdapter; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.moshen.bills.adapter.BillBaseAdapter; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.RadishRecordInfo; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.List; -import static com.yizhuan.erban.ui.radish.RadishRecordFragment.TYPE_RADISH_INCOME; +import static com.mango.moshen.ui.radish.RadishRecordFragment.TYPE_RADISH_INCOME; public class RadishRecordAdapter extends BillBaseAdapter { private byte mType; diff --git a/app/src/main/java/com/yizhuan/erban/radish/helper/PrizeAnimUiHelper.java b/app/src/main/java/com/mango/moshen/radish/helper/PrizeAnimUiHelper.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/radish/helper/PrizeAnimUiHelper.java rename to app/src/main/java/com/mango/moshen/radish/helper/PrizeAnimUiHelper.java index e50e01239..7d842749e 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/helper/PrizeAnimUiHelper.java +++ b/app/src/main/java/com/mango/moshen/radish/helper/PrizeAnimUiHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.radish.helper; +package com.mango.moshen.radish.helper; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; @@ -12,18 +12,18 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.ShareDialog; -import com.yizhuan.xchat_android_core.radish.signin.SignInModel; -import com.yizhuan.xchat_android_core.radish.task.bean.PrizeAnim; -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.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.ShareDialog; +import com.mango.core.radish.signin.SignInModel; +import com.mango.core.radish.task.bean.PrizeAnim; +import com.mango.core.share.ShareModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/yizhuan/erban/radish/helper/TaskCenterDialogHelper.java b/app/src/main/java/com/mango/moshen/radish/helper/TaskCenterDialogHelper.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/radish/helper/TaskCenterDialogHelper.java rename to app/src/main/java/com/mango/moshen/radish/helper/TaskCenterDialogHelper.java index 3339183cf..b0c63cd21 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/helper/TaskCenterDialogHelper.java +++ b/app/src/main/java/com/mango/moshen/radish/helper/TaskCenterDialogHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.radish.helper; +package com.mango.moshen.radish.helper; import android.content.Context; import android.view.LayoutInflater; @@ -6,9 +6,9 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.ui.utils.ImageLoadUtils; public class TaskCenterDialogHelper { diff --git a/app/src/main/java/com/yizhuan/erban/radish/presenter/RadishRecordFrgPresenter.java b/app/src/main/java/com/mango/moshen/radish/presenter/RadishRecordFrgPresenter.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/radish/presenter/RadishRecordFrgPresenter.java rename to app/src/main/java/com/mango/moshen/radish/presenter/RadishRecordFrgPresenter.java index 72cd0917d..c21f4a140 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/presenter/RadishRecordFrgPresenter.java +++ b/app/src/main/java/com/mango/moshen/radish/presenter/RadishRecordFrgPresenter.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.radish.presenter; +package com.mango.moshen.radish.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.radish.view.IRadishRecordFrgView; -import com.yizhuan.xchat_android_core.radish.RadishModel; -import com.yizhuan.xchat_android_core.radish.RadishRecordResult; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.radish.view.IRadishRecordFrgView; +import com.mango.core.radish.RadishModel; +import com.mango.core.radish.RadishRecordResult; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/yizhuan/erban/radish/presenter/RadishRecordPresenter.java b/app/src/main/java/com/mango/moshen/radish/presenter/RadishRecordPresenter.java similarity index 74% rename from app/src/main/java/com/yizhuan/erban/radish/presenter/RadishRecordPresenter.java rename to app/src/main/java/com/mango/moshen/radish/presenter/RadishRecordPresenter.java index f5b8575af..677f867a0 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/presenter/RadishRecordPresenter.java +++ b/app/src/main/java/com/mango/moshen/radish/presenter/RadishRecordPresenter.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.radish.presenter; +package com.mango.moshen.radish.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.radish.view.IRadishRecordView; -import com.yizhuan.xchat_android_core.radish.RadishModel; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.radish.view.IRadishRecordView; +import com.mango.core.radish.RadishModel; import java.math.RoundingMode; import java.text.DecimalFormat; diff --git a/app/src/main/java/com/yizhuan/erban/radish/signin/SignDialogTimeManager.java b/app/src/main/java/com/mango/moshen/radish/signin/SignDialogTimeManager.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/radish/signin/SignDialogTimeManager.java rename to app/src/main/java/com/mango/moshen/radish/signin/SignDialogTimeManager.java index 52067db7e..9f969d87a 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/signin/SignDialogTimeManager.java +++ b/app/src/main/java/com/mango/moshen/radish/signin/SignDialogTimeManager.java @@ -1,22 +1,22 @@ -package com.yizhuan.erban.radish.signin; +package com.mango.moshen.radish.signin; import android.content.Context; import android.text.TextUtils; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.erban.guide.GuideActivity; -import com.yizhuan.erban.other.activity.SplashActivity; -import com.yizhuan.erban.radish.signin.view.SignInDialog; -import com.yizhuan.erban.ui.login.AddUserInfoActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.radish.signin.SignInModel; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.UIUtils; +import com.mango.moshen.guide.GuideActivity; +import com.mango.moshen.other.activity.SplashActivity; +import com.mango.moshen.radish.signin.view.SignInDialog; +import com.mango.moshen.ui.login.AddUserInfoActivity; +import com.mango.core.auth.AuthModel; +import com.mango.core.radish.signin.SignInModel; +import com.mango.core.radish.signin.bean.SignDetailInfo; +import com.mango.core.utils.ActivityUtil; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.UIUtils; import java.util.Calendar; import java.util.HashMap; diff --git a/app/src/main/java/com/yizhuan/erban/radish/signin/SignInActivity.java b/app/src/main/java/com/mango/moshen/radish/signin/SignInActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/radish/signin/SignInActivity.java rename to app/src/main/java/com/mango/moshen/radish/signin/SignInActivity.java index 786508ca4..c70994528 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/signin/SignInActivity.java +++ b/app/src/main/java/com/mango/moshen/radish/signin/SignInActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.radish.signin; +package com.mango.moshen.radish.signin; import android.annotation.SuppressLint; import android.content.Context; @@ -19,46 +19,46 @@ import android.widget.ScrollView; import android.widget.TextView; import com.coorchice.library.SuperTextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.common.widget.TutuSwitchView; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.common.widget.dialog.DialogUiHelper; -import com.yizhuan.erban.radish.helper.PrizeAnimUiHelper; -import com.yizhuan.erban.radish.signin.adpter.RewardListAdapter; -import com.yizhuan.erban.radish.signin.adpter.RewardTotalNoticeAdapter; -import com.yizhuan.erban.radish.signin.helper.SignInUiHelper; -import com.yizhuan.erban.radish.signin.presenter.SignInPresenter; -import com.yizhuan.erban.radish.signin.view.CarveUpGoldAdapter; -import com.yizhuan.erban.radish.signin.view.ISignInView; -import com.yizhuan.erban.radish.signin.view.RuleDialog; -import com.yizhuan.erban.ui.widget.ShareDialog; -import com.yizhuan.erban.ui.widget.marqueeview.BetterMarqueeView; -import com.yizhuan.erban.utils.CertificateHelper; -import com.yizhuan.erban.utils.NumberFormatUtil; -import com.yizhuan.erban.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.radish.signin.SignInModel; -import com.yizhuan.xchat_android_core.radish.signin.bean.DrawNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReplenishSignInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.RsPlatformType; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDrawInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignInfo; -import com.yizhuan.xchat_android_core.radish.task.bean.PrizeAnim; -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.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RadishNotEnoughException; -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.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.common.widget.TutuSwitchView; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.common.widget.dialog.DialogUiHelper; +import com.mango.moshen.radish.helper.PrizeAnimUiHelper; +import com.mango.moshen.radish.signin.adpter.RewardListAdapter; +import com.mango.moshen.radish.signin.adpter.RewardTotalNoticeAdapter; +import com.mango.moshen.radish.signin.helper.SignInUiHelper; +import com.mango.moshen.radish.signin.presenter.SignInPresenter; +import com.mango.moshen.radish.signin.view.CarveUpGoldAdapter; +import com.mango.moshen.radish.signin.view.ISignInView; +import com.mango.moshen.radish.signin.view.RuleDialog; +import com.mango.moshen.ui.widget.ShareDialog; +import com.mango.moshen.ui.widget.marqueeview.BetterMarqueeView; +import com.mango.moshen.utils.CertificateHelper; +import com.mango.moshen.utils.NumberFormatUtil; +import com.mango.moshen.utils.SpannableBuilder; +import com.mango.core.radish.signin.SignInModel; +import com.mango.core.radish.signin.bean.DrawNoticeInfo; +import com.mango.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.mango.core.radish.signin.bean.ReplenishSignInfo; +import com.mango.core.radish.signin.bean.RewardNoticeInfo; +import com.mango.core.radish.signin.bean.RsPlatformType; +import com.mango.core.radish.signin.bean.SignDetailInfo; +import com.mango.core.radish.signin.bean.SignDrawInfo; +import com.mango.core.radish.signin.bean.SignInfo; +import com.mango.core.radish.task.bean.PrizeAnim; +import com.mango.core.share.ShareModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.utils.net.RadishNotEnoughException; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.widget.IOSSwitchView; import com.yy.mobile.rollingtextview.CharOrder; import com.yy.mobile.rollingtextview.RollingTextView; import com.yy.mobile.rollingtextview.strategy.Direction; diff --git a/app/src/main/java/com/yizhuan/erban/radish/signin/adpter/RewardListAdapter.java b/app/src/main/java/com/mango/moshen/radish/signin/adpter/RewardListAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/radish/signin/adpter/RewardListAdapter.java rename to app/src/main/java/com/mango/moshen/radish/signin/adpter/RewardListAdapter.java index 0a46df7b2..daba148b4 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/signin/adpter/RewardListAdapter.java +++ b/app/src/main/java/com/mango/moshen/radish/signin/adpter/RewardListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.radish.signin.adpter; +package com.mango.moshen.radish.signin.adpter; import androidx.core.content.ContextCompat; import android.view.View; @@ -7,10 +7,10 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.RedPointView; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.RedPointView; +import com.mango.core.radish.signin.bean.RewardNoticeInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/radish/signin/adpter/RewardTotalNoticeAdapter.java b/app/src/main/java/com/mango/moshen/radish/signin/adpter/RewardTotalNoticeAdapter.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/radish/signin/adpter/RewardTotalNoticeAdapter.java rename to app/src/main/java/com/mango/moshen/radish/signin/adpter/RewardTotalNoticeAdapter.java index 2d3be3a1b..aa716809e 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/signin/adpter/RewardTotalNoticeAdapter.java +++ b/app/src/main/java/com/mango/moshen/radish/signin/adpter/RewardTotalNoticeAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.radish.signin.adpter; +package com.mango.moshen.radish.signin.adpter; import androidx.core.content.ContextCompat; import android.view.View; @@ -6,10 +6,10 @@ import android.widget.ImageView; import android.widget.TextView; import com.coorchice.library.SuperTextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.radish.signin.view.RewardProgressView; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; +import com.mango.moshen.R; +import com.mango.moshen.radish.signin.view.RewardProgressView; +import com.mango.core.radish.signin.bean.RewardNoticeInfo; +import com.mango.core.radish.signin.bean.SignDetailInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/radish/signin/helper/SignInUiHelper.java b/app/src/main/java/com/mango/moshen/radish/signin/helper/SignInUiHelper.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/radish/signin/helper/SignInUiHelper.java rename to app/src/main/java/com/mango/moshen/radish/signin/helper/SignInUiHelper.java index 8f04408aa..22be05195 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/signin/helper/SignInUiHelper.java +++ b/app/src/main/java/com/mango/moshen/radish/signin/helper/SignInUiHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.radish.signin.helper; +package com.mango.moshen.radish.signin.helper; import android.content.Context; import android.text.TextUtils; @@ -6,9 +6,9 @@ import android.text.style.ForegroundColorSpan; import android.view.View; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.utils.SpannableBuilder; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.utils.SpannableBuilder; /** * create by lvzebiao @2019/4/28 diff --git a/app/src/main/java/com/yizhuan/erban/radish/signin/presenter/SignInPresenter.java b/app/src/main/java/com/mango/moshen/radish/signin/presenter/SignInPresenter.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/radish/signin/presenter/SignInPresenter.java rename to app/src/main/java/com/mango/moshen/radish/signin/presenter/SignInPresenter.java index f090f2570..bdfcded78 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/signin/presenter/SignInPresenter.java +++ b/app/src/main/java/com/mango/moshen/radish/signin/presenter/SignInPresenter.java @@ -1,16 +1,16 @@ -package com.yizhuan.erban.radish.signin.presenter; +package com.mango.moshen.radish.signin.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.radish.signin.view.ISignInView; -import com.yizhuan.xchat_android_core.radish.signin.ISignInModel; -import com.yizhuan.xchat_android_core.radish.signin.SignInModel; -import com.yizhuan.xchat_android_core.radish.signin.bean.DrawNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDrawInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.radish.signin.view.ISignInView; +import com.mango.core.radish.signin.ISignInModel; +import com.mango.core.radish.signin.SignInModel; +import com.mango.core.radish.signin.bean.DrawNoticeInfo; +import com.mango.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.mango.core.radish.signin.bean.RewardNoticeInfo; +import com.mango.core.radish.signin.bean.SignDetailInfo; +import com.mango.core.radish.signin.bean.SignDrawInfo; +import com.mango.core.radish.signin.bean.SignInfo; +import com.mango.core.utils.net.BeanObserver; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/radish/signin/view/CarveUpGoldAdapter.java b/app/src/main/java/com/mango/moshen/radish/signin/view/CarveUpGoldAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/radish/signin/view/CarveUpGoldAdapter.java rename to app/src/main/java/com/mango/moshen/radish/signin/view/CarveUpGoldAdapter.java index 4bce81261..b0f1dedde 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/signin/view/CarveUpGoldAdapter.java +++ b/app/src/main/java/com/mango/moshen/radish/signin/view/CarveUpGoldAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.radish.signin.view; +package com.mango.moshen.radish.signin.view; import android.content.Context; import androidx.core.content.ContextCompat; @@ -9,9 +9,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.marqueeview.BetterMarqueeView; -import com.yizhuan.xchat_android_core.radish.signin.bean.DrawNoticeInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.marqueeview.BetterMarqueeView; +import com.mango.core.radish.signin.bean.DrawNoticeInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/radish/signin/view/ISignInView.java b/app/src/main/java/com/mango/moshen/radish/signin/view/ISignInView.java similarity index 68% rename from app/src/main/java/com/yizhuan/erban/radish/signin/view/ISignInView.java rename to app/src/main/java/com/mango/moshen/radish/signin/view/ISignInView.java index ae48ac7f3..7969b6f62 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/signin/view/ISignInView.java +++ b/app/src/main/java/com/mango/moshen/radish/signin/view/ISignInView.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.radish.signin.view; +package com.mango.moshen.radish.signin.view; -import com.yizhuan.xchat_android_core.radish.signin.bean.DrawNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDrawInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.radish.signin.bean.DrawNoticeInfo; +import com.mango.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.mango.core.radish.signin.bean.RewardNoticeInfo; +import com.mango.core.radish.signin.bean.SignDetailInfo; +import com.mango.core.radish.signin.bean.SignDrawInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/radish/signin/view/RewardProgressView.java b/app/src/main/java/com/mango/moshen/radish/signin/view/RewardProgressView.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/radish/signin/view/RewardProgressView.java rename to app/src/main/java/com/mango/moshen/radish/signin/view/RewardProgressView.java index cc216dcba..d0aab2a7a 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/signin/view/RewardProgressView.java +++ b/app/src/main/java/com/mango/moshen/radish/signin/view/RewardProgressView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.radish.signin.view; +package com.mango.moshen.radish.signin.view; import android.content.Context; import android.graphics.Canvas; @@ -8,8 +8,8 @@ import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; /** * 签到奖品的进度 diff --git a/app/src/main/java/com/yizhuan/erban/radish/signin/view/RuleDialog.java b/app/src/main/java/com/mango/moshen/radish/signin/view/RuleDialog.java similarity index 79% rename from app/src/main/java/com/yizhuan/erban/radish/signin/view/RuleDialog.java rename to app/src/main/java/com/mango/moshen/radish/signin/view/RuleDialog.java index e3679b1b6..1f8f78ed2 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/signin/view/RuleDialog.java +++ b/app/src/main/java/com/mango/moshen/radish/signin/view/RuleDialog.java @@ -1,15 +1,15 @@ -package com.yizhuan.erban.radish.signin.view; +package com.mango.moshen.radish.signin.view; import android.content.Context; import android.os.Build; import android.webkit.WebSettings; import android.webkit.WebViewClient; -import com.yizhuan.erban.R; -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog; -import com.yizhuan.erban.databinding.DialogRuleBinding; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.R; +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog; +import com.mango.moshen.databinding.DialogRuleBinding; +import com.mango.core.UriProvider; +import com.mango.xchat_android_library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.dialog_rule) public class RuleDialog extends BaseBindingDialog { diff --git a/app/src/main/java/com/yizhuan/erban/radish/signin/view/SignInDialog.java b/app/src/main/java/com/mango/moshen/radish/signin/view/SignInDialog.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/radish/signin/view/SignInDialog.java rename to app/src/main/java/com/mango/moshen/radish/signin/view/SignInDialog.java index 60cd65d40..843e9e168 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/signin/view/SignInDialog.java +++ b/app/src/main/java/com/mango/moshen/radish/signin/view/SignInDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.radish.signin.view; +package com.mango.moshen.radish.signin.view; import android.content.Context; import android.graphics.Color; @@ -13,18 +13,18 @@ import android.view.WindowManager; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.radish.signin.SignInActivity; -import com.yizhuan.erban.utils.NumberFormatUtil; -import com.yizhuan.xchat_android_core.radish.signin.ISignInModel; -import com.yizhuan.xchat_android_core.radish.signin.SignInModel; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.radish.signin.SignInActivity; +import com.mango.moshen.utils.NumberFormatUtil; +import com.mango.core.radish.signin.ISignInModel; +import com.mango.core.radish.signin.SignInModel; +import com.mango.core.radish.signin.bean.SignDetailInfo; +import com.mango.core.radish.signin.bean.SignInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.SingleToastUtil; import com.yy.mobile.rollingtextview.CharOrder; import com.yy.mobile.rollingtextview.RollingTextView; import com.yy.mobile.rollingtextview.strategy.Direction; diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java b/app/src/main/java/com/mango/moshen/radish/task/activity/TaskCenterActivity.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java rename to app/src/main/java/com/mango/moshen/radish/task/activity/TaskCenterActivity.java index d3174cb04..abe2db162 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java +++ b/app/src/main/java/com/mango/moshen/radish/task/activity/TaskCenterActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.radish.task.activity; +package com.mango.moshen.radish.task.activity; import android.content.Context; import android.content.Intent; @@ -10,24 +10,24 @@ import android.view.ViewStub; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.radish.helper.PrizeAnimUiHelper; -import com.yizhuan.erban.radish.task.fragment.TaskCenterFragment; -import com.yizhuan.erban.radish.task.presenter.TaskCenterPresenter; -import com.yizhuan.erban.radish.task.view.ITaskCenterView; -import com.yizhuan.erban.radish.widget.TaskCenterNavAdapter; -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.radish.task.bean.PrizeAnim; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.RoomContributeListAdapter; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.radish.helper.PrizeAnimUiHelper; +import com.mango.moshen.radish.task.fragment.TaskCenterFragment; +import com.mango.moshen.radish.task.presenter.TaskCenterPresenter; +import com.mango.moshen.radish.task.view.ITaskCenterView; +import com.mango.moshen.radish.widget.TaskCenterNavAdapter; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.core.radish.task.bean.PrizeAnim; +import com.mango.core.radish.task.bean.TaskInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.xchat_android_library.base.factory.CreatePresenter; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/adpter/TaskCenterAdapter.java b/app/src/main/java/com/mango/moshen/radish/task/adpter/TaskCenterAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/radish/task/adpter/TaskCenterAdapter.java rename to app/src/main/java/com/mango/moshen/radish/task/adpter/TaskCenterAdapter.java index 9908a48b7..ec905a055 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/task/adpter/TaskCenterAdapter.java +++ b/app/src/main/java/com/mango/moshen/radish/task/adpter/TaskCenterAdapter.java @@ -1,17 +1,16 @@ -package com.yizhuan.erban.radish.task.adpter; +package com.mango.moshen.radish.task.adpter; import android.content.Context; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.radish.task.bean.TaskInfo; /** * create by lvzebiao @2019/3/26 diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/fragment/TaskCenterFragment.java b/app/src/main/java/com/mango/moshen/radish/task/fragment/TaskCenterFragment.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/radish/task/fragment/TaskCenterFragment.java rename to app/src/main/java/com/mango/moshen/radish/task/fragment/TaskCenterFragment.java index 63b70b68b..2b379c587 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/task/fragment/TaskCenterFragment.java +++ b/app/src/main/java/com/mango/moshen/radish/task/fragment/TaskCenterFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.radish.task.fragment; +package com.mango.moshen.radish.task.fragment; import android.annotation.SuppressLint; import android.os.Bundle; @@ -11,26 +11,26 @@ import androidx.recyclerview.widget.SimpleItemAnimator; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.radish.helper.TaskCenterDialogHelper; -import com.yizhuan.erban.radish.task.adpter.TaskCenterAdapter; -import com.yizhuan.erban.radish.task.presenter.TaskCenterFrgPresenter; -import com.yizhuan.erban.radish.task.view.ITaskCenterView; -import com.yizhuan.erban.radish.task.view.ITaskCenterViewFrg; -import com.yizhuan.erban.ui.im.RouterHandler; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.HorizontalDecoration; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.radish.task.ITaskModel; -import com.yizhuan.xchat_android_core.radish.task.TaskModel; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -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.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.radish.helper.TaskCenterDialogHelper; +import com.mango.moshen.radish.task.adpter.TaskCenterAdapter; +import com.mango.moshen.radish.task.presenter.TaskCenterFrgPresenter; +import com.mango.moshen.radish.task.view.ITaskCenterView; +import com.mango.moshen.radish.task.view.ITaskCenterViewFrg; +import com.mango.moshen.ui.im.RouterHandler; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.recyclerview.decoration.HorizontalDecoration; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.radish.task.ITaskModel; +import com.mango.core.radish.task.TaskModel; +import com.mango.core.radish.task.bean.TaskInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.SingleToastUtil; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/mango/moshen/radish/task/presenter/TaskCenterFrgPresenter.java b/app/src/main/java/com/mango/moshen/radish/task/presenter/TaskCenterFrgPresenter.java new file mode 100644 index 000000000..4a8cf5385 --- /dev/null +++ b/app/src/main/java/com/mango/moshen/radish/task/presenter/TaskCenterFrgPresenter.java @@ -0,0 +1,7 @@ +package com.mango.moshen.radish.task.presenter; + +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.radish.task.view.ITaskCenterViewFrg; + +public class TaskCenterFrgPresenter extends BaseMvpPresenter { +} diff --git a/app/src/main/java/com/mango/moshen/radish/task/presenter/TaskCenterPresenter.java b/app/src/main/java/com/mango/moshen/radish/task/presenter/TaskCenterPresenter.java new file mode 100644 index 000000000..38bfd52c4 --- /dev/null +++ b/app/src/main/java/com/mango/moshen/radish/task/presenter/TaskCenterPresenter.java @@ -0,0 +1,12 @@ +package com.mango.moshen.radish.task.presenter; + +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.radish.task.view.ITaskCenterView; + +/** + * create by lvzebiao @2019/3/27 + */ +public class TaskCenterPresenter extends BaseMvpPresenter { + + +} diff --git a/app/src/main/java/com/mango/moshen/radish/task/view/ITaskCenterView.java b/app/src/main/java/com/mango/moshen/radish/task/view/ITaskCenterView.java new file mode 100644 index 000000000..d98a85e22 --- /dev/null +++ b/app/src/main/java/com/mango/moshen/radish/task/view/ITaskCenterView.java @@ -0,0 +1,11 @@ +package com.mango.moshen.radish.task.view; + +import com.mango.core.radish.task.bean.TaskInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; + +/** + * create by lvzebiao @2019/3/27 + */ +public interface ITaskCenterView extends IMvpBaseView { + void playPriceAnim(TaskInfo info); +} diff --git a/app/src/main/java/com/mango/moshen/radish/task/view/ITaskCenterViewFrg.java b/app/src/main/java/com/mango/moshen/radish/task/view/ITaskCenterViewFrg.java new file mode 100644 index 000000000..39b26d6e9 --- /dev/null +++ b/app/src/main/java/com/mango/moshen/radish/task/view/ITaskCenterViewFrg.java @@ -0,0 +1,6 @@ +package com.mango.moshen.radish.task.view; + +import com.mango.xchat_android_library.base.IMvpBaseView; + +public interface ITaskCenterViewFrg extends IMvpBaseView { +} diff --git a/app/src/main/java/com/yizhuan/erban/radish/view/IRadishRecordFrgView.java b/app/src/main/java/com/mango/moshen/radish/view/IRadishRecordFrgView.java similarity index 50% rename from app/src/main/java/com/yizhuan/erban/radish/view/IRadishRecordFrgView.java rename to app/src/main/java/com/mango/moshen/radish/view/IRadishRecordFrgView.java index df5dba45e..1882585f0 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/view/IRadishRecordFrgView.java +++ b/app/src/main/java/com/mango/moshen/radish/view/IRadishRecordFrgView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.radish.view; +package com.mango.moshen.radish.view; -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordListInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.bills.bean.RadishRecordListInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; public interface IRadishRecordFrgView extends IMvpBaseView { void getRadishRecordSuccess(RadishRecordListInfo list); diff --git a/app/src/main/java/com/mango/moshen/radish/view/IRadishRecordView.java b/app/src/main/java/com/mango/moshen/radish/view/IRadishRecordView.java new file mode 100644 index 000000000..d81e4b633 --- /dev/null +++ b/app/src/main/java/com/mango/moshen/radish/view/IRadishRecordView.java @@ -0,0 +1,6 @@ +package com.mango.moshen.radish.view; + +import com.mango.xchat_android_library.base.IMvpBaseView; + +public interface IRadishRecordView extends IMvpBaseView { +} diff --git a/app/src/main/java/com/yizhuan/erban/radish/wallet/RadishWalletManager.java b/app/src/main/java/com/mango/moshen/radish/wallet/RadishWalletManager.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/radish/wallet/RadishWalletManager.java rename to app/src/main/java/com/mango/moshen/radish/wallet/RadishWalletManager.java index 21b32e060..a80b4402b 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/wallet/RadishWalletManager.java +++ b/app/src/main/java/com/mango/moshen/radish/wallet/RadishWalletManager.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.radish.wallet; +package com.mango.moshen.radish.wallet; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; -import com.yizhuan.xchat_android_core.radish.RadishModel; -import com.yizhuan.xchat_android_core.radish.RadishWalletInfo; -import com.yizhuan.xchat_android_core.radish.event.RadishWalletInfoUpdateEvent; +import com.mango.core.radish.RadishModel; +import com.mango.core.radish.RadishWalletInfo; +import com.mango.core.radish.event.RadishWalletInfoUpdateEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/radish/widget/RadishRecordNavAdapter.java b/app/src/main/java/com/mango/moshen/radish/widget/RadishRecordNavAdapter.java similarity index 79% rename from app/src/main/java/com/yizhuan/erban/radish/widget/RadishRecordNavAdapter.java rename to app/src/main/java/com/mango/moshen/radish/widget/RadishRecordNavAdapter.java index e5f00b9d0..f03d82659 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/widget/RadishRecordNavAdapter.java +++ b/app/src/main/java/com/mango/moshen/radish/widget/RadishRecordNavAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.radish.widget; +package com.mango.moshen.radish.widget; import android.content.Context; import android.graphics.Color; @@ -6,13 +6,13 @@ import androidx.core.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -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.mango.moshen.R; +import com.mango.moshen.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/radish/widget/TaskCenterNavAdapter.java b/app/src/main/java/com/mango/moshen/radish/widget/TaskCenterNavAdapter.java similarity index 79% rename from app/src/main/java/com/yizhuan/erban/radish/widget/TaskCenterNavAdapter.java rename to app/src/main/java/com/mango/moshen/radish/widget/TaskCenterNavAdapter.java index e5e16339d..077c88c73 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/widget/TaskCenterNavAdapter.java +++ b/app/src/main/java/com/mango/moshen/radish/widget/TaskCenterNavAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.radish.widget; +package com.mango.moshen.radish.widget; import android.content.Context; import android.graphics.Color; @@ -6,13 +6,13 @@ import androidx.core.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -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.mango.moshen.R; +import com.mango.moshen.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/reciever/IncomingCallReceiver.java b/app/src/main/java/com/mango/moshen/reciever/IncomingCallReceiver.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/reciever/IncomingCallReceiver.java rename to app/src/main/java/com/mango/moshen/reciever/IncomingCallReceiver.java index f91810456..899485003 100644 --- a/app/src/main/java/com/yizhuan/erban/reciever/IncomingCallReceiver.java +++ b/app/src/main/java/com/mango/moshen/reciever/IncomingCallReceiver.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.reciever; +package com.mango.moshen.reciever; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.telephony.TelephonyManager; -import com.yizhuan.xchat_android_core.im.state.PhoneCallStateModel; +import com.mango.core.im.state.PhoneCallStateModel; /** * Created by zhouxiangfeng on 2017/5/31. diff --git a/app/src/main/java/com/yizhuan/erban/reciever/NotificationClickReceiver.java b/app/src/main/java/com/mango/moshen/reciever/NotificationClickReceiver.java similarity index 70% rename from app/src/main/java/com/yizhuan/erban/reciever/NotificationClickReceiver.java rename to app/src/main/java/com/mango/moshen/reciever/NotificationClickReceiver.java index 3f7b8344d..d4158613c 100644 --- a/app/src/main/java/com/yizhuan/erban/reciever/NotificationClickReceiver.java +++ b/app/src/main/java/com/mango/moshen/reciever/NotificationClickReceiver.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.reciever; +package com.mango.moshen.reciever; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.RoomInfo; /** * Created by chenran on 2017/11/16. diff --git a/app/src/main/java/com/yizhuan/erban/reciever/OnePixelReceiver.java b/app/src/main/java/com/mango/moshen/reciever/OnePixelReceiver.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/reciever/OnePixelReceiver.java rename to app/src/main/java/com/mango/moshen/reciever/OnePixelReceiver.java index 001c99e64..f9669cb62 100644 --- a/app/src/main/java/com/yizhuan/erban/reciever/OnePixelReceiver.java +++ b/app/src/main/java/com/mango/moshen/reciever/OnePixelReceiver.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.reciever; +package com.mango.moshen.reciever; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.yizhuan.erban.ui.keepalive.OnePiexlActivity; +import com.mango.moshen.ui.keepalive.OnePiexlActivity; /** * diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/CpDataManager.java b/app/src/main/java/com/mango/moshen/relation/cp/CpDataManager.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/relation/cp/CpDataManager.java rename to app/src/main/java/com/mango/moshen/relation/cp/CpDataManager.java index 748403554..270a034d0 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/CpDataManager.java +++ b/app/src/main/java/com/mango/moshen/relation/cp/CpDataManager.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.relation.cp; +package com.mango.moshen.relation.cp; -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo; +import com.mango.core.relation.cp.CpInviteInfo; public class CpDataManager { diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/CpDataParser.kt b/app/src/main/java/com/mango/moshen/relation/cp/CpDataParser.kt similarity index 88% rename from app/src/main/java/com/yizhuan/erban/relation/cp/CpDataParser.kt rename to app/src/main/java/com/mango/moshen/relation/cp/CpDataParser.kt index d7db16851..ae6b74c6c 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/CpDataParser.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/CpDataParser.kt @@ -1,7 +1,7 @@ -package com.yizhuan.erban.relation.cp +package com.mango.moshen.relation.cp -import com.yizhuan.xchat_android_core.relation.cp.CpInviteDetailEntity -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo +import com.mango.core.relation.cp.CpInviteDetailEntity +import com.mango.core.relation.cp.CpInviteInfo object CpDataParser { fun inviteMsg2cpDetailEntity(msgEntity: CpInviteInfo) = CpInviteDetailEntity( diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/CpViewHelper.kt b/app/src/main/java/com/mango/moshen/relation/cp/CpViewHelper.kt similarity index 96% rename from app/src/main/java/com/yizhuan/erban/relation/cp/CpViewHelper.kt rename to app/src/main/java/com/mango/moshen/relation/cp/CpViewHelper.kt index f9146c09f..bd0cd78d1 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/CpViewHelper.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/CpViewHelper.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp +package com.mango.moshen.relation.cp import android.content.Context import android.graphics.Color @@ -8,8 +8,8 @@ import android.text.style.ForegroundColorSpan import android.widget.TextView import androidx.annotation.ColorInt import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.common.widget.dialog.DialogManager +import com.mango.moshen.R +import com.mango.moshen.common.widget.dialog.DialogManager import java.lang.StringBuilder object CpViewHelper { diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpHomeActivity.kt b/app/src/main/java/com/mango/moshen/relation/cp/activity/CpHomeActivity.kt similarity index 83% rename from app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpHomeActivity.kt rename to app/src/main/java/com/mango/moshen/relation/cp/activity/CpHomeActivity.kt index ec7d39416..f0179786e 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpHomeActivity.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/activity/CpHomeActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.activity +package com.mango.moshen.relation.cp.activity import android.content.Context import android.content.Intent @@ -6,17 +6,17 @@ import android.graphics.Color import android.view.View import androidx.activity.viewModels import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseBindingActivity -import com.yizhuan.erban.base.TitleBar -import com.yizhuan.erban.databinding.ActivityCpHomeBinding -import com.yizhuan.erban.relation.cp.viewmodel.CpViewModel -import com.yizhuan.erban.relation.cp.widget.RelationCpCardView.Companion.PAGE_TYPE_SELF_CP -import com.yizhuan.erban.ui.relation.FansListActivity -import com.yizhuan.erban.ui.user.UserInfoActivity -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.relation.cp.CpBindUnbindEvent -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.base.BaseBindingActivity +import com.mango.moshen.base.TitleBar +import com.mango.moshen.databinding.ActivityCpHomeBinding +import com.mango.moshen.relation.cp.viewmodel.CpViewModel +import com.mango.moshen.relation.cp.widget.RelationCpCardView.Companion.PAGE_TYPE_SELF_CP +import com.mango.moshen.ui.relation.FansListActivity +import com.mango.moshen.ui.user.UserInfoActivity +import com.mango.core.auth.AuthModel +import com.mango.core.relation.cp.CpBindUnbindEvent +import com.mango.xchat_android_library.annatation.ActLayoutRes import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpInviteRecordActivity.kt b/app/src/main/java/com/mango/moshen/relation/cp/activity/CpInviteRecordActivity.kt similarity index 81% rename from app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpInviteRecordActivity.kt rename to app/src/main/java/com/mango/moshen/relation/cp/activity/CpInviteRecordActivity.kt index 9b586b552..40221fc71 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpInviteRecordActivity.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/activity/CpInviteRecordActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.activity +package com.mango.moshen.relation.cp.activity import android.content.Context import android.content.Intent @@ -6,22 +6,21 @@ import android.graphics.Color import androidx.activity.viewModels import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseBindingActivity -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.ActivityCpInviteRecordBinding -import com.yizhuan.erban.relation.cp.CpDataManager -import com.yizhuan.erban.relation.cp.CpDataParser -import com.yizhuan.erban.relation.cp.CpViewHelper -import com.yizhuan.erban.relation.cp.adapter.InviteRecordAdapter -import com.yizhuan.erban.relation.cp.dialog.CpInviteReplyConfirmDialog -import com.yizhuan.erban.relation.cp.dialog.CpInviteReplyDialog -import com.yizhuan.erban.relation.cp.viewmodel.CpViewModel -import com.yizhuan.erban.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_core.relation.cp.CpBindUnbindEvent -import com.yizhuan.xchat_android_core.relation.cp.CpInviteDetailEntity -import com.yizhuan.xchat_android_core.relation.cp.UserCpListEntity -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.base.BaseBindingActivity +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.ActivityCpInviteRecordBinding +import com.mango.moshen.relation.cp.CpDataManager +import com.mango.moshen.relation.cp.CpViewHelper +import com.mango.moshen.relation.cp.adapter.InviteRecordAdapter +import com.mango.moshen.relation.cp.dialog.CpInviteReplyConfirmDialog +import com.mango.moshen.relation.cp.dialog.CpInviteReplyDialog +import com.mango.moshen.relation.cp.viewmodel.CpViewModel +import com.mango.moshen.ui.widget.dialog.CommonTipDialog +import com.mango.core.relation.cp.CpBindUnbindEvent +import com.mango.core.relation.cp.CpInviteDetailEntity +import com.mango.core.relation.cp.UserCpListEntity +import com.mango.xchat_android_library.annatation.ActLayoutRes import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpTaskActivity.kt b/app/src/main/java/com/mango/moshen/relation/cp/activity/CpTaskActivity.kt similarity index 84% rename from app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpTaskActivity.kt rename to app/src/main/java/com/mango/moshen/relation/cp/activity/CpTaskActivity.kt index c8bdb8624..618d31b92 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpTaskActivity.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/activity/CpTaskActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.activity +package com.mango.moshen.relation.cp.activity import android.content.Context import android.content.Intent @@ -7,22 +7,22 @@ import android.widget.TextView import androidx.activity.viewModels import com.netease.nim.uikit.StatusBarUtil import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseBindingActivity -import com.yizhuan.erban.databinding.ActivityCpTaskBinding -import com.yizhuan.erban.relation.cp.adapter.CpTaskIndicatorAdapter -import com.yizhuan.erban.relation.cp.adapter.TaskPagerAdapter -import com.yizhuan.erban.relation.cp.fragment.CpTaskFragment -import com.yizhuan.erban.relation.cp.viewmodel.CpViewModel -import com.yizhuan.erban.relation.cp.widget.CpTaskDescriptionView -import com.yizhuan.erban.relation.extention.visibility -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.erban.ui.widget.OnPageSelectedListener -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.relation.cp.CpTaskEntity -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.base.BaseBindingActivity +import com.mango.moshen.databinding.ActivityCpTaskBinding +import com.mango.moshen.relation.cp.adapter.CpTaskIndicatorAdapter +import com.mango.moshen.relation.cp.adapter.TaskPagerAdapter +import com.mango.moshen.relation.cp.fragment.CpTaskFragment +import com.mango.moshen.relation.cp.viewmodel.CpViewModel +import com.mango.moshen.relation.cp.widget.CpTaskDescriptionView +import com.mango.moshen.relation.extention.visibility +import com.mango.moshen.ui.utils.ImageLoadUtilsV2 +import com.mango.moshen.ui.widget.OnPageSelectedListener +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.mango.core.auth.AuthModel +import com.mango.core.relation.cp.CpTaskEntity +import com.mango.xchat_android_library.annatation.ActLayoutRes @ActLayoutRes(R.layout.activity_cp_task) class CpTaskActivity : BaseBindingActivity(), diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/CpTaskAdapter.kt b/app/src/main/java/com/mango/moshen/relation/cp/adapter/CpTaskAdapter.kt similarity index 84% rename from app/src/main/java/com/yizhuan/erban/relation/cp/adapter/CpTaskAdapter.kt rename to app/src/main/java/com/mango/moshen/relation/cp/adapter/CpTaskAdapter.kt index d42e9e1da..a5518152d 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/CpTaskAdapter.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/adapter/CpTaskAdapter.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.relation.cp.adapter +package com.mango.moshen.relation.cp.adapter import android.widget.TextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.relation.cp.Task +import com.mango.moshen.R +import com.mango.core.relation.cp.Task class CpTaskAdapter : BaseQuickAdapter(R.layout.item_cp_task) { override fun convert(helper: BaseViewHolder, item: Task?) { diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/CpTaskIndicatorAdapter.java b/app/src/main/java/com/mango/moshen/relation/cp/adapter/CpTaskIndicatorAdapter.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/relation/cp/adapter/CpTaskIndicatorAdapter.java rename to app/src/main/java/com/mango/moshen/relation/cp/adapter/CpTaskIndicatorAdapter.java index 6a240d0bc..730a0409b 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/CpTaskIndicatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/relation/cp/adapter/CpTaskIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.adapter; +package com.mango.moshen.relation.cp.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -7,11 +7,10 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; -import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -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.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/DeclarationRecommondAdapter.kt b/app/src/main/java/com/mango/moshen/relation/cp/adapter/DeclarationRecommondAdapter.kt similarity index 82% rename from app/src/main/java/com/yizhuan/erban/relation/cp/adapter/DeclarationRecommondAdapter.kt rename to app/src/main/java/com/mango/moshen/relation/cp/adapter/DeclarationRecommondAdapter.kt index 56221fdd3..4822be49b 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/DeclarationRecommondAdapter.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/adapter/DeclarationRecommondAdapter.kt @@ -1,8 +1,8 @@ -package com.yizhuan.erban.relation.cp.adapter +package com.mango.moshen.relation.cp.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R +import com.mango.moshen.R class DeclarationRecommendAdapter : BaseQuickAdapter(R.layout.item_cp_declaration_recommend) { diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/InviteRecordAdapter.kt b/app/src/main/java/com/mango/moshen/relation/cp/adapter/InviteRecordAdapter.kt similarity index 90% rename from app/src/main/java/com/yizhuan/erban/relation/cp/adapter/InviteRecordAdapter.kt rename to app/src/main/java/com/mango/moshen/relation/cp/adapter/InviteRecordAdapter.kt index d221a9297..09e62672f 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/InviteRecordAdapter.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/adapter/InviteRecordAdapter.kt @@ -1,13 +1,13 @@ -package com.yizhuan.erban.relation.cp.adapter +package com.mango.moshen.relation.cp.adapter import android.content.Context import android.widget.ImageView import android.widget.TextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.relation.cp.UserCpListEntity +import com.mango.moshen.R +import com.mango.moshen.ui.utils.ImageLoadUtilsV2 +import com.mango.core.relation.cp.UserCpListEntity class InviteRecordAdapter(private val context: Context) : diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/TaskPagerAdapter.kt b/app/src/main/java/com/mango/moshen/relation/cp/adapter/TaskPagerAdapter.kt similarity index 82% rename from app/src/main/java/com/yizhuan/erban/relation/cp/adapter/TaskPagerAdapter.kt rename to app/src/main/java/com/mango/moshen/relation/cp/adapter/TaskPagerAdapter.kt index 976964255..263743f7c 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/TaskPagerAdapter.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/adapter/TaskPagerAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.erban.relation.cp.adapter +package com.mango.moshen.relation.cp.adapter import android.annotation.SuppressLint import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentStatePagerAdapter -import com.yizhuan.erban.base.BaseFragment +import com.mango.moshen.base.BaseFragment @SuppressLint("WrongConstant") class TaskPagerAdapter(fm: FragmentManager, private val list: List) : diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpGlobalDialog.kt b/app/src/main/java/com/mango/moshen/relation/cp/dialog/CpGlobalDialog.kt similarity index 85% rename from app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpGlobalDialog.kt rename to app/src/main/java/com/mango/moshen/relation/cp/dialog/CpGlobalDialog.kt index 6b8da1816..6c1f3f6f4 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpGlobalDialog.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/dialog/CpGlobalDialog.kt @@ -1,18 +1,18 @@ -package com.yizhuan.erban.relation.cp.dialog +package com.mango.moshen.relation.cp.dialog import android.content.Context import android.view.Gravity import android.view.View import android.view.WindowManager import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.DialogCpGlobalBinding -import com.yizhuan.erban.relation.cp.CpDataManager -import com.yizhuan.erban.relation.cp.activity.CpInviteRecordActivity -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.databinding.DialogCpGlobalBinding +import com.mango.moshen.relation.cp.CpDataManager +import com.mango.moshen.relation.cp.activity.CpInviteRecordActivity +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog +import com.mango.moshen.ui.utils.ImageLoadUtilsV2 +import com.mango.core.relation.cp.CpInviteInfo +import com.mango.xchat_android_library.annatation.ActLayoutRes import io.reactivex.* import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInvitePageDialog.kt b/app/src/main/java/com/mango/moshen/relation/cp/dialog/CpInvitePageDialog.kt similarity index 81% rename from app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInvitePageDialog.kt rename to app/src/main/java/com/mango/moshen/relation/cp/dialog/CpInvitePageDialog.kt index e59a0df71..c8dd258e6 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInvitePageDialog.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/dialog/CpInvitePageDialog.kt @@ -1,21 +1,20 @@ -package com.yizhuan.erban.relation.cp.dialog +package com.mango.moshen.relation.cp.dialog import android.content.Context import android.graphics.Color -import android.text.SpannableStringBuilder import android.text.style.AbsoluteSizeSpan import android.view.View import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.DialogCpInviteBinding -import com.yizhuan.erban.relation.cp.CpViewHelper -import com.yizhuan.erban.relation.cp.adapter.DeclarationRecommendAdapter -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.erban.ui.widget.LinearLayoutManagerWrapper -import com.yizhuan.xchat_android_core.relation.cp.CpInvitePageEntity -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.ScreenUtils +import com.mango.moshen.R +import com.mango.moshen.databinding.DialogCpInviteBinding +import com.mango.moshen.relation.cp.CpViewHelper +import com.mango.moshen.relation.cp.adapter.DeclarationRecommendAdapter +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog +import com.mango.moshen.ui.utils.ImageLoadUtilsV2 +import com.mango.moshen.ui.widget.LinearLayoutManagerWrapper +import com.mango.core.relation.cp.CpInvitePageEntity +import com.mango.xchat_android_library.annatation.ActLayoutRes +import com.mango.xchat_android_library.utils.ScreenUtils @ActLayoutRes(R.layout.dialog_cp_invite) class CpInvitePageDialog(context: Context) : View.OnClickListener, diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyConfirmDialog.kt b/app/src/main/java/com/mango/moshen/relation/cp/dialog/CpInviteReplyConfirmDialog.kt similarity index 75% rename from app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyConfirmDialog.kt rename to app/src/main/java/com/mango/moshen/relation/cp/dialog/CpInviteReplyConfirmDialog.kt index 67def5cf2..4ce2521e8 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyConfirmDialog.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/dialog/CpInviteReplyConfirmDialog.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.relation.cp.dialog +package com.mango.moshen.relation.cp.dialog import android.content.Context import android.text.SpannableStringBuilder import android.view.View import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.DialogCpInviteReplyConfirmBinding -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.erban.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.databinding.DialogCpInviteReplyConfirmBinding +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog +import com.mango.moshen.ui.widget.dialog.CommonTipDialog +import com.mango.xchat_android_library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_cp_invite_reply_confirm) class CpInviteReplyConfirmDialog(context: Context) : diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt b/app/src/main/java/com/mango/moshen/relation/cp/dialog/CpInviteReplyDialog.kt similarity index 86% rename from app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt rename to app/src/main/java/com/mango/moshen/relation/cp/dialog/CpInviteReplyDialog.kt index 85d61fedb..ead29d258 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/dialog/CpInviteReplyDialog.kt @@ -1,18 +1,18 @@ -package com.yizhuan.erban.relation.cp.dialog +package com.mango.moshen.relation.cp.dialog import android.content.Context import android.graphics.Color import android.view.View import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.DialogCpInviteReplyBinding -import com.yizhuan.erban.relation.cp.CpViewHelper -import com.yizhuan.erban.relation.cp.CpViewHelper.getColorSpan -import com.yizhuan.erban.relation.extention.toTimeString -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.relation.cp.CpInviteDetailEntity -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.databinding.DialogCpInviteReplyBinding +import com.mango.moshen.relation.cp.CpViewHelper +import com.mango.moshen.relation.cp.CpViewHelper.getColorSpan +import com.mango.moshen.relation.extention.toTimeString +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog +import com.mango.moshen.ui.utils.ImageLoadUtilsV2 +import com.mango.core.relation.cp.CpInviteDetailEntity +import com.mango.xchat_android_library.annatation.ActLayoutRes import io.reactivex.* import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpMpDialog.kt b/app/src/main/java/com/mango/moshen/relation/cp/dialog/CpMpDialog.kt similarity index 82% rename from app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpMpDialog.kt rename to app/src/main/java/com/mango/moshen/relation/cp/dialog/CpMpDialog.kt index c3b421796..ee0586c96 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpMpDialog.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/dialog/CpMpDialog.kt @@ -1,13 +1,13 @@ -package com.yizhuan.erban.relation.cp.dialog +package com.mango.moshen.relation.cp.dialog import android.content.Context import android.text.Editable import android.view.View -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.DialogCpMpBinding -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper +import com.mango.moshen.R +import com.mango.moshen.databinding.DialogCpMpBinding +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog +import com.mango.xchat_android_library.annatation.ActLayoutRes +import com.mango.xchat_android_library.utils.TextWatcherWrapper @ActLayoutRes(R.layout.dialog_cp_mp) class CpMpDialog(context: Context, private val type: Int) : diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/fragment/CpTaskFragment.kt b/app/src/main/java/com/mango/moshen/relation/cp/fragment/CpTaskFragment.kt similarity index 77% rename from app/src/main/java/com/yizhuan/erban/relation/cp/fragment/CpTaskFragment.kt rename to app/src/main/java/com/mango/moshen/relation/cp/fragment/CpTaskFragment.kt index 5112b0cc6..8779cd1a8 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/fragment/CpTaskFragment.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/fragment/CpTaskFragment.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.relation.cp.fragment +package com.mango.moshen.relation.cp.fragment import android.os.Bundle import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseBindingFragment -import com.yizhuan.erban.databinding.FragmentCpTaskBinding -import com.yizhuan.erban.relation.cp.adapter.CpTaskAdapter -import com.yizhuan.erban.relation.cp.viewmodel.CpViewModel -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.base.BaseBindingFragment +import com.mango.moshen.databinding.FragmentCpTaskBinding +import com.mango.moshen.relation.cp.adapter.CpTaskAdapter +import com.mango.moshen.relation.cp.viewmodel.CpViewModel +import com.mango.xchat_android_library.annatation.ActLayoutRes @ActLayoutRes(R.layout.fragment_cp_task) class CpTaskFragment : BaseBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/fragment/UserInfoCpFragment.kt b/app/src/main/java/com/mango/moshen/relation/cp/fragment/UserInfoCpFragment.kt similarity index 83% rename from app/src/main/java/com/yizhuan/erban/relation/cp/fragment/UserInfoCpFragment.kt rename to app/src/main/java/com/mango/moshen/relation/cp/fragment/UserInfoCpFragment.kt index d16ce6521..88b8585e6 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/fragment/UserInfoCpFragment.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/fragment/UserInfoCpFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.fragment +package com.mango.moshen.relation.cp.fragment import android.os.Bundle import android.view.Gravity @@ -9,18 +9,18 @@ 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.base.BaseViewBindingFragment -import com.yizhuan.erban.databinding.FragmentUserinfoCpBinding -import com.yizhuan.erban.relation.cp.viewmodel.CpViewModel -import com.yizhuan.erban.relation.cp.widget.RelationCpCardView -import com.yizhuan.erban.ui.im.friend.FriendFragmentCpDelegate -import com.yizhuan.erban.ui.relation.FansListActivity -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.noble.NobleResourceType -import com.yizhuan.xchat_android_core.noble.NobleUtil -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.base.BaseViewBindingFragment +import com.mango.moshen.databinding.FragmentUserinfoCpBinding +import com.mango.moshen.relation.cp.viewmodel.CpViewModel +import com.mango.moshen.relation.cp.widget.RelationCpCardView +import com.mango.moshen.ui.im.friend.FriendFragmentCpDelegate +import com.mango.moshen.ui.relation.FansListActivity +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.auth.AuthModel +import com.mango.core.noble.NobleResourceType +import com.mango.core.noble.NobleUtil +import com.mango.xchat_android_library.annatation.ActLayoutRes import java.io.File import java.net.URL diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/model/Api.kt b/app/src/main/java/com/mango/moshen/relation/cp/model/Api.kt similarity index 94% rename from app/src/main/java/com/yizhuan/erban/relation/cp/model/Api.kt rename to app/src/main/java/com/mango/moshen/relation/cp/model/Api.kt index c624832d8..276b9f06f 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/model/Api.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/model/Api.kt @@ -1,7 +1,7 @@ -package com.yizhuan.erban.relation.cp.model +package com.mango.moshen.relation.cp.model -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.relation.cp.* +import com.mango.core.bean.response.ServiceResult +import com.mango.core.relation.cp.* import retrofit2.http.* interface Api { diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/model/CpModel.kt b/app/src/main/java/com/mango/moshen/relation/cp/model/CpModel.kt similarity index 86% rename from app/src/main/java/com/yizhuan/erban/relation/cp/model/CpModel.kt rename to app/src/main/java/com/mango/moshen/relation/cp/model/CpModel.kt index 4eeb17cf1..1be8a09a7 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/model/CpModel.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/model/CpModel.kt @@ -1,9 +1,9 @@ -package com.yizhuan.erban.relation.cp.model +package com.mango.moshen.relation.cp.model -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.relation.cp.* -import com.yizhuan.xchat_android_core.utils.net.launchRequest -import com.yizhuan.xchat_android_library.net.rxnet.RxNet +import com.mango.core.base.BaseModel +import com.mango.core.relation.cp.* +import com.mango.core.utils.net.launchRequest +import com.mango.xchat_android_library.net.rxnet.RxNet object CpModel : BaseModel() { private val api = RxNet.create(Api::class.java) diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/viewmodel/CpViewModel.kt b/app/src/main/java/com/mango/moshen/relation/cp/viewmodel/CpViewModel.kt similarity index 92% rename from app/src/main/java/com/yizhuan/erban/relation/cp/viewmodel/CpViewModel.kt rename to app/src/main/java/com/mango/moshen/relation/cp/viewmodel/CpViewModel.kt index af296fdb5..53ed6b4f0 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/viewmodel/CpViewModel.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/viewmodel/CpViewModel.kt @@ -1,13 +1,13 @@ -package com.yizhuan.erban.relation.cp.viewmodel +package com.mango.moshen.relation.cp.viewmodel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.erban.base.BaseViewModel -import com.yizhuan.erban.relation.cp.model.CpModel -import com.yizhuan.xchat_android_core.relation.cp.* -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption -import com.yizhuan.xchat_android_core.utils.net.ServerException -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.base.BaseViewModel +import com.mango.moshen.relation.cp.model.CpModel +import com.mango.core.relation.cp.* +import com.mango.core.utils.net.BalanceNotEnoughExeption +import com.mango.core.utils.net.ServerException +import com.mango.core.utils.toast import org.greenrobot.eventbus.EventBus class CpViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/widget/CpTaskDescriptionView.kt b/app/src/main/java/com/mango/moshen/relation/cp/widget/CpTaskDescriptionView.kt similarity index 97% rename from app/src/main/java/com/yizhuan/erban/relation/cp/widget/CpTaskDescriptionView.kt rename to app/src/main/java/com/mango/moshen/relation/cp/widget/CpTaskDescriptionView.kt index 41d606a15..aa661a54a 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/widget/CpTaskDescriptionView.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/widget/CpTaskDescriptionView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.widget +package com.mango.moshen.relation.cp.widget import android.content.Context import android.graphics.Color @@ -11,7 +11,7 @@ import android.view.LayoutInflater import android.widget.LinearLayout import android.widget.TextView import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R +import com.mango.moshen.R class CpTaskDescriptionView(context: Context, attr: AttributeSet?, def: Int) : LinearLayout( diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/widget/RelationCpCardView.kt b/app/src/main/java/com/mango/moshen/relation/cp/widget/RelationCpCardView.kt similarity index 94% rename from app/src/main/java/com/yizhuan/erban/relation/cp/widget/RelationCpCardView.kt rename to app/src/main/java/com/mango/moshen/relation/cp/widget/RelationCpCardView.kt index b410db10a..4f02ee02f 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/cp/widget/RelationCpCardView.kt +++ b/app/src/main/java/com/mango/moshen/relation/cp/widget/RelationCpCardView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.widget +package com.mango.moshen.relation.cp.widget import android.content.Context import android.graphics.Color @@ -10,12 +10,12 @@ import androidx.core.content.ContextCompat import androidx.core.view.isVisible import androidx.databinding.DataBindingUtil import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.LayoutCpCardBinding -import com.yizhuan.erban.relation.extention.visibility -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.relation.cp.CpInvitePageEntity -import com.yizhuan.xchat_android_core.relation.cp.CpRelation +import com.mango.moshen.R +import com.mango.moshen.databinding.LayoutCpCardBinding +import com.mango.moshen.relation.extention.visibility +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.relation.cp.CpInvitePageEntity +import com.mango.core.relation.cp.CpRelation class RelationCpCardView(context: Context, attr: AttributeSet?, def: Int) : FrameLayout(context, attr, def) { diff --git a/app/src/main/java/com/yizhuan/erban/relation/extention/RelationExtention.kt b/app/src/main/java/com/mango/moshen/relation/extention/RelationExtention.kt similarity index 78% rename from app/src/main/java/com/yizhuan/erban/relation/extention/RelationExtention.kt rename to app/src/main/java/com/mango/moshen/relation/extention/RelationExtention.kt index 5d74cce90..e58934fa2 100644 --- a/app/src/main/java/com/yizhuan/erban/relation/extention/RelationExtention.kt +++ b/app/src/main/java/com/mango/moshen/relation/extention/RelationExtention.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.extention +package com.mango.moshen.relation.extention import android.view.View diff --git a/app/src/main/java/com/yizhuan/erban/service/DaemonService.java b/app/src/main/java/com/mango/moshen/service/DaemonService.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/service/DaemonService.java rename to app/src/main/java/com/mango/moshen/service/DaemonService.java index 38f4f8ce5..755a168c7 100644 --- a/app/src/main/java/com/yizhuan/erban/service/DaemonService.java +++ b/app/src/main/java/com/mango/moshen/service/DaemonService.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.service; +package com.mango.moshen.service; import android.annotation.TargetApi; import android.app.Notification; @@ -12,10 +12,10 @@ import android.os.Build; import android.os.IBinder; import androidx.annotation.Nullable; -import com.yizhuan.erban.R; -import com.yizhuan.erban.reciever.NotificationClickReceiver; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.mango.moshen.R; +import com.mango.moshen.reciever.NotificationClickReceiver; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.RoomInfo; /** * @author chenran diff --git a/app/src/main/java/com/yizhuan/erban/share/Holder.java b/app/src/main/java/com/mango/moshen/share/Holder.java similarity index 69% rename from app/src/main/java/com/yizhuan/erban/share/Holder.java rename to app/src/main/java/com/mango/moshen/share/Holder.java index c1c447e3b..fddf8b2fb 100644 --- a/app/src/main/java/com/yizhuan/erban/share/Holder.java +++ b/app/src/main/java/com/mango/moshen/share/Holder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.share; +package com.mango.moshen.share; /** * Created by MadisonRong on 08/06/2018. diff --git a/app/src/main/java/com/yizhuan/erban/share/viewholder/InAppSharingMsgViewHolder.java b/app/src/main/java/com/mango/moshen/share/viewholder/InAppSharingMsgViewHolder.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/share/viewholder/InAppSharingMsgViewHolder.java rename to app/src/main/java/com/mango/moshen/share/viewholder/InAppSharingMsgViewHolder.java index 3c26ee9a1..37e5afea8 100644 --- a/app/src/main/java/com/yizhuan/erban/share/viewholder/InAppSharingMsgViewHolder.java +++ b/app/src/main/java/com/mango/moshen/share/viewholder/InAppSharingMsgViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.share.viewholder; +package com.mango.moshen.share.viewholder; import android.graphics.Color; import android.view.View; @@ -7,18 +7,18 @@ import android.widget.TextView; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.im.RouterHandler; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingFamilyAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingMiniWorldAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingRoomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingTeamAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RouterType; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingInfo; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingTeamInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.im.RouterHandler; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.InAppSharingFamilyAttachment; +import com.mango.core.im.custom.bean.InAppSharingMiniWorldAttachment; +import com.mango.core.im.custom.bean.InAppSharingRoomAttachment; +import com.mango.core.im.custom.bean.InAppSharingTeamAttachment; +import com.mango.core.im.custom.bean.RouterType; +import com.mango.core.share.bean.InAppSharingInfo; +import com.mango.core.share.bean.InAppSharingTeamInfo; +import com.mango.core.team.bean.TeamInfo; /** * Created by MadisonRong on 08/06/2018. diff --git a/app/src/main/java/com/yizhuan/erban/skill/SKillDataParser.kt b/app/src/main/java/com/mango/moshen/skill/SKillDataParser.kt similarity index 90% rename from app/src/main/java/com/yizhuan/erban/skill/SKillDataParser.kt rename to app/src/main/java/com/mango/moshen/skill/SKillDataParser.kt index afef25815..7f36a120c 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/SKillDataParser.kt +++ b/app/src/main/java/com/mango/moshen/skill/SKillDataParser.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.skill +package com.mango.moshen.skill -import com.yizhuan.erban.skill.widget.ItemAttribute -import com.yizhuan.erban.skill.widget.ItemEventListener -import com.yizhuan.erban.skill.widget.SkillAttribute -import com.yizhuan.erban.skill.widget.SkillItem -import com.yizhuan.xchat_android_core.skill.entity.* +import com.mango.moshen.skill.widget.ItemAttribute +import com.mango.moshen.skill.widget.ItemEventListener +import com.mango.moshen.skill.widget.SkillAttribute +import com.mango.moshen.skill.widget.SkillItem +import com.mango.core.skill.entity.* object SKillDataParser { private fun parseItemRecordToAttribute( diff --git a/app/src/main/java/com/yizhuan/erban/skill/SkillDataDelegate.kt b/app/src/main/java/com/mango/moshen/skill/SkillDataDelegate.kt similarity index 90% rename from app/src/main/java/com/yizhuan/erban/skill/SkillDataDelegate.kt rename to app/src/main/java/com/mango/moshen/skill/SkillDataDelegate.kt index 0536ad290..bf7903598 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/SkillDataDelegate.kt +++ b/app/src/main/java/com/mango/moshen/skill/SkillDataDelegate.kt @@ -1,18 +1,18 @@ -package com.yizhuan.erban.skill +package com.mango.moshen.skill import android.annotation.SuppressLint -import com.yizhuan.erban.base.BaseActivity -import com.yizhuan.erban.skill.dialog.SkillSelectionDialog -import com.yizhuan.erban.skill.repository.SkillDataManager -import com.yizhuan.erban.skill.repository.SkillModel -import com.yizhuan.erban.skill.widget.* -import com.yizhuan.xchat_android_core.file.FileModel -import com.yizhuan.xchat_android_core.skill.entity.PropRefEntity -import com.yizhuan.xchat_android_core.skill.entity.PropsEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillPostServerEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity -import com.yizhuan.xchat_android_core.skill.event.SkillEvent -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.base.BaseActivity +import com.mango.moshen.skill.dialog.SkillSelectionDialog +import com.mango.moshen.skill.repository.SkillDataManager +import com.mango.moshen.skill.repository.SkillModel +import com.mango.moshen.skill.widget.* +import com.mango.core.file.FileModel +import com.mango.core.skill.entity.PropRefEntity +import com.mango.core.skill.entity.PropsEntity +import com.mango.core.skill.entity.SkillPostServerEntity +import com.mango.core.skill.entity.SkillPropertyEntity +import com.mango.core.skill.event.SkillEvent +import com.mango.core.utils.toast import org.greenrobot.eventbus.EventBus import java.io.File diff --git a/app/src/main/java/com/yizhuan/erban/skill/activity/AddSkillActivity.kt b/app/src/main/java/com/mango/moshen/skill/activity/AddSkillActivity.kt similarity index 88% rename from app/src/main/java/com/yizhuan/erban/skill/activity/AddSkillActivity.kt rename to app/src/main/java/com/mango/moshen/skill/activity/AddSkillActivity.kt index a5e5227e3..402e82572 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/activity/AddSkillActivity.kt +++ b/app/src/main/java/com/mango/moshen/skill/activity/AddSkillActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.activity +package com.mango.moshen.skill.activity import android.Manifest import android.annotation.SuppressLint @@ -6,15 +6,14 @@ import android.content.Context import android.content.Intent import android.view.View import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseBindingActivity -import com.yizhuan.erban.databinding.ActivitySkillEditBinding -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity -import com.yizhuan.erban.skill.repository.SkillDataManager -import com.yizhuan.erban.skill.repository.SkillModel -import com.yizhuan.erban.skill.widget.CARD_TYPE_AUDIO -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import io.reactivex.functions.Consumer +import com.mango.moshen.R +import com.mango.moshen.base.BaseBindingActivity +import com.mango.moshen.databinding.ActivitySkillEditBinding +import com.mango.core.skill.entity.SkillPropertyEntity +import com.mango.moshen.skill.repository.SkillDataManager +import com.mango.moshen.skill.repository.SkillModel +import com.mango.moshen.skill.widget.CARD_TYPE_AUDIO +import com.mango.xchat_android_library.annatation.ActLayoutRes @ActLayoutRes(R.layout.activity_skill_edit) class AddSkillActivity : BaseBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/erban/skill/activity/EditSkillActivity.kt b/app/src/main/java/com/mango/moshen/skill/activity/EditSkillActivity.kt similarity index 88% rename from app/src/main/java/com/yizhuan/erban/skill/activity/EditSkillActivity.kt rename to app/src/main/java/com/mango/moshen/skill/activity/EditSkillActivity.kt index 1061d9879..bead9736f 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/activity/EditSkillActivity.kt +++ b/app/src/main/java/com/mango/moshen/skill/activity/EditSkillActivity.kt @@ -1,16 +1,16 @@ -package com.yizhuan.erban.skill.activity +package com.mango.moshen.skill.activity import android.annotation.SuppressLint import android.content.Context import android.content.Intent import android.view.View import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseBindingActivity -import com.yizhuan.erban.databinding.ActivitySkillEditBinding -import com.yizhuan.erban.skill.repository.SkillModel -import com.yizhuan.erban.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.base.BaseBindingActivity +import com.mango.moshen.databinding.ActivitySkillEditBinding +import com.mango.moshen.skill.repository.SkillModel +import com.mango.moshen.ui.widget.dialog.CommonTipDialog +import com.mango.xchat_android_library.annatation.ActLayoutRes @ActLayoutRes(R.layout.activity_skill_edit) class EditSkillActivity : BaseBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/erban/skill/activity/SkillDetailActivity.kt b/app/src/main/java/com/mango/moshen/skill/activity/SkillDetailActivity.kt similarity index 85% rename from app/src/main/java/com/yizhuan/erban/skill/activity/SkillDetailActivity.kt rename to app/src/main/java/com/mango/moshen/skill/activity/SkillDetailActivity.kt index 6cc0956b7..8b986d97f 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/activity/SkillDetailActivity.kt +++ b/app/src/main/java/com/mango/moshen/skill/activity/SkillDetailActivity.kt @@ -1,15 +1,15 @@ -package com.yizhuan.erban.skill.activity +package com.mango.moshen.skill.activity import android.annotation.SuppressLint import android.content.Context import android.content.Intent import android.view.View import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseBindingActivity -import com.yizhuan.erban.databinding.ActivitySkillEditBinding -import com.yizhuan.erban.skill.repository.SkillModel -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.base.BaseBindingActivity +import com.mango.moshen.databinding.ActivitySkillEditBinding +import com.mango.moshen.skill.repository.SkillModel +import com.mango.xchat_android_library.annatation.ActLayoutRes /** * 客态显示 diff --git a/app/src/main/java/com/yizhuan/erban/skill/activity/SkillEditableDelegate.kt b/app/src/main/java/com/mango/moshen/skill/activity/SkillEditableDelegate.kt similarity index 84% rename from app/src/main/java/com/yizhuan/erban/skill/activity/SkillEditableDelegate.kt rename to app/src/main/java/com/mango/moshen/skill/activity/SkillEditableDelegate.kt index 0dda92a26..eb02e7115 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/activity/SkillEditableDelegate.kt +++ b/app/src/main/java/com/mango/moshen/skill/activity/SkillEditableDelegate.kt @@ -1,12 +1,12 @@ -package com.yizhuan.erban.skill.activity +package com.mango.moshen.skill.activity -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseBindingActivity -import com.yizhuan.erban.databinding.ActivitySkillEditBinding -import com.yizhuan.erban.skill.SKillDataParser -import com.yizhuan.erban.skill.SkillDataDelegate -import com.yizhuan.erban.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_core.skill.entity.* +import com.mango.moshen.R +import com.mango.moshen.base.BaseBindingActivity +import com.mango.moshen.databinding.ActivitySkillEditBinding +import com.mango.moshen.skill.SKillDataParser +import com.mango.moshen.skill.SkillDataDelegate +import com.mango.moshen.ui.widget.dialog.CommonTipDialog +import com.mango.core.skill.entity.* /** * 编辑-添加 界面 diff --git a/app/src/main/java/com/yizhuan/erban/skill/activity/SkillHomeActivity.kt b/app/src/main/java/com/mango/moshen/skill/activity/SkillHomeActivity.kt similarity index 87% rename from app/src/main/java/com/yizhuan/erban/skill/activity/SkillHomeActivity.kt rename to app/src/main/java/com/mango/moshen/skill/activity/SkillHomeActivity.kt index 85d8074ee..415c1fda7 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/activity/SkillHomeActivity.kt +++ b/app/src/main/java/com/mango/moshen/skill/activity/SkillHomeActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.activity +package com.mango.moshen.skill.activity import android.annotation.SuppressLint import android.content.Context @@ -10,21 +10,19 @@ import android.widget.FrameLayout import android.widget.ImageView import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseBindingActivity -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.ActivitySkillHomeBinding -import com.yizhuan.erban.skill.SKillDataParser -import com.yizhuan.erban.skill.adapter.MineSkillCardAdapter -import com.yizhuan.erban.skill.decoration.SkillLinearVerticalDecoration -import com.yizhuan.erban.skill.dialog.AddSkillCardDialog -import com.yizhuan.xchat_android_core.skill.event.SkillEvent -import com.yizhuan.erban.skill.repository.SkillDataManager -import com.yizhuan.erban.skill.repository.SkillModel -import com.yizhuan.erban.skill.widget.CARD_TYPE_AUDIO -import com.yizhuan.erban.skill.widget.SkillAttribute -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.base.BaseBindingActivity +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.ActivitySkillHomeBinding +import com.mango.moshen.skill.adapter.MineSkillCardAdapter +import com.mango.moshen.skill.decoration.SkillLinearVerticalDecoration +import com.mango.moshen.skill.dialog.AddSkillCardDialog +import com.mango.core.skill.event.SkillEvent +import com.mango.moshen.skill.repository.SkillDataManager +import com.mango.moshen.skill.repository.SkillModel +import com.mango.moshen.skill.widget.CARD_TYPE_AUDIO +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil +import com.mango.xchat_android_library.annatation.ActLayoutRes import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/skill/adapter/AddSkillCardAdapter.kt b/app/src/main/java/com/mango/moshen/skill/adapter/AddSkillCardAdapter.kt similarity index 76% rename from app/src/main/java/com/yizhuan/erban/skill/adapter/AddSkillCardAdapter.kt rename to app/src/main/java/com/mango/moshen/skill/adapter/AddSkillCardAdapter.kt index aabd45c05..c3a9b202f 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/adapter/AddSkillCardAdapter.kt +++ b/app/src/main/java/com/mango/moshen/skill/adapter/AddSkillCardAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.erban.skill.adapter +package com.mango.moshen.skill.adapter import android.text.TextUtils import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 +import com.mango.moshen.R +import com.mango.core.skill.entity.SkillTypeEntity +import com.mango.moshen.ui.utils.ImageLoadUtilsV2 class AddSkillCardAdapter : BaseQuickAdapter(R.layout.item_add_skill_select_card) { diff --git a/app/src/main/java/com/yizhuan/erban/skill/adapter/MineSkillCardAdapter.kt b/app/src/main/java/com/mango/moshen/skill/adapter/MineSkillCardAdapter.kt similarity index 73% rename from app/src/main/java/com/yizhuan/erban/skill/adapter/MineSkillCardAdapter.kt rename to app/src/main/java/com/mango/moshen/skill/adapter/MineSkillCardAdapter.kt index 81192802c..46fec6669 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/adapter/MineSkillCardAdapter.kt +++ b/app/src/main/java/com/mango/moshen/skill/adapter/MineSkillCardAdapter.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.skill.adapter +package com.mango.moshen.skill.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseActivity -import com.yizhuan.erban.skill.SKillDataParser -import com.yizhuan.erban.skill.SkillDataDelegate -import com.yizhuan.erban.skill.widget.CARD_TYPE_AUDIO -import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity -import com.yizhuan.erban.skill.widget.SkillCardView +import com.mango.moshen.R +import com.mango.moshen.base.BaseActivity +import com.mango.moshen.skill.SKillDataParser +import com.mango.moshen.skill.SkillDataDelegate +import com.mango.moshen.skill.widget.CARD_TYPE_AUDIO +import com.mango.core.skill.entity.SkillRecordEntity +import com.mango.moshen.skill.widget.SkillCardView /** * 用户所有技能卡 显示 diff --git a/app/src/main/java/com/yizhuan/erban/skill/adapter/SkillSelectionAdapter.kt b/app/src/main/java/com/mango/moshen/skill/adapter/SkillSelectionAdapter.kt similarity index 93% rename from app/src/main/java/com/yizhuan/erban/skill/adapter/SkillSelectionAdapter.kt rename to app/src/main/java/com/mango/moshen/skill/adapter/SkillSelectionAdapter.kt index 09aac69e0..c799addc7 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/adapter/SkillSelectionAdapter.kt +++ b/app/src/main/java/com/mango/moshen/skill/adapter/SkillSelectionAdapter.kt @@ -1,13 +1,13 @@ -package com.yizhuan.erban.skill.adapter +package com.mango.moshen.skill.adapter import android.content.Context import android.graphics.Color import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.skill.widget.ItemAttribute -import com.yizhuan.xchat_android_core.skill.entity.PropDictVo -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.R +import com.mango.moshen.skill.widget.ItemAttribute +import com.mango.core.skill.entity.PropDictVo +import com.mango.core.utils.toast class SkillSelectionAdapter( diff --git a/app/src/main/java/com/yizhuan/erban/skill/decoration/SkillGridDecoration.kt b/app/src/main/java/com/mango/moshen/skill/decoration/SkillGridDecoration.kt similarity index 88% rename from app/src/main/java/com/yizhuan/erban/skill/decoration/SkillGridDecoration.kt rename to app/src/main/java/com/mango/moshen/skill/decoration/SkillGridDecoration.kt index bdd126e5e..208ebcb6a 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/decoration/SkillGridDecoration.kt +++ b/app/src/main/java/com/mango/moshen/skill/decoration/SkillGridDecoration.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.skill.decoration +package com.mango.moshen.skill.decoration import android.content.Context import android.graphics.Rect import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil class SkillGridDecoration(context: Context, horizontalDp: Int, verticalDp: Int) : RecyclerView.ItemDecoration() { diff --git a/app/src/main/java/com/yizhuan/erban/skill/decoration/SkillLinearVerticalDecoration.kt b/app/src/main/java/com/mango/moshen/skill/decoration/SkillLinearVerticalDecoration.kt similarity index 90% rename from app/src/main/java/com/yizhuan/erban/skill/decoration/SkillLinearVerticalDecoration.kt rename to app/src/main/java/com/mango/moshen/skill/decoration/SkillLinearVerticalDecoration.kt index f3606db7a..20e4081b9 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/decoration/SkillLinearVerticalDecoration.kt +++ b/app/src/main/java/com/mango/moshen/skill/decoration/SkillLinearVerticalDecoration.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.skill.decoration +package com.mango.moshen.skill.decoration import android.content.Context import android.graphics.Rect import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil class SkillLinearVerticalDecoration(context: Context, topSpaceDp: Int, bottomSpaceDp: Int) : RecyclerView.ItemDecoration() { diff --git a/app/src/main/java/com/yizhuan/erban/skill/dialog/AddSkillCardDialog.kt b/app/src/main/java/com/mango/moshen/skill/dialog/AddSkillCardDialog.kt similarity index 70% rename from app/src/main/java/com/yizhuan/erban/skill/dialog/AddSkillCardDialog.kt rename to app/src/main/java/com/mango/moshen/skill/dialog/AddSkillCardDialog.kt index cb642d660..8c36fe2a7 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/dialog/AddSkillCardDialog.kt +++ b/app/src/main/java/com/mango/moshen/skill/dialog/AddSkillCardDialog.kt @@ -1,17 +1,17 @@ -package com.yizhuan.erban.skill.dialog +package com.mango.moshen.skill.dialog import android.content.Context import android.view.Gravity import android.view.View import androidx.recyclerview.widget.GridLayoutManager -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.DialogAddSkillItemBinding -import com.yizhuan.erban.skill.adapter.AddSkillCardAdapter -import com.yizhuan.erban.skill.decoration.SkillGridDecoration -import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.databinding.DialogAddSkillItemBinding +import com.mango.moshen.skill.adapter.AddSkillCardAdapter +import com.mango.moshen.skill.decoration.SkillGridDecoration +import com.mango.core.skill.entity.SkillTypeEntity +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil +import com.mango.xchat_android_library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_add_skill_item) class AddSkillCardDialog( diff --git a/app/src/main/java/com/yizhuan/erban/skill/dialog/SkillSelectionDialog.kt b/app/src/main/java/com/mango/moshen/skill/dialog/SkillSelectionDialog.kt similarity index 68% rename from app/src/main/java/com/yizhuan/erban/skill/dialog/SkillSelectionDialog.kt rename to app/src/main/java/com/mango/moshen/skill/dialog/SkillSelectionDialog.kt index 714187d1d..7943344a9 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/dialog/SkillSelectionDialog.kt +++ b/app/src/main/java/com/mango/moshen/skill/dialog/SkillSelectionDialog.kt @@ -1,18 +1,18 @@ -package com.yizhuan.erban.skill.dialog +package com.mango.moshen.skill.dialog import android.content.Context import android.view.Gravity import android.view.View import androidx.recyclerview.widget.GridLayoutManager -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.DialogAddSkillItemBinding -import com.yizhuan.erban.skill.adapter.SkillSelectionAdapter -import com.yizhuan.erban.skill.decoration.SkillGridDecoration -import com.yizhuan.xchat_android_core.skill.entity.PropsEntity -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.xchat_android_core.skill.entity.PropDictVo -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.databinding.DialogAddSkillItemBinding +import com.mango.moshen.skill.adapter.SkillSelectionAdapter +import com.mango.moshen.skill.decoration.SkillGridDecoration +import com.mango.core.skill.entity.PropsEntity +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil +import com.mango.core.skill.entity.PropDictVo +import com.mango.xchat_android_library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_add_skill_item) class SkillSelectionDialog( diff --git a/app/src/main/java/com/yizhuan/erban/skill/repository/Api.kt b/app/src/main/java/com/mango/moshen/skill/repository/Api.kt similarity index 73% rename from app/src/main/java/com/yizhuan/erban/skill/repository/Api.kt rename to app/src/main/java/com/mango/moshen/skill/repository/Api.kt index 777abe246..1bf49d56c 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/repository/Api.kt +++ b/app/src/main/java/com/mango/moshen/skill/repository/Api.kt @@ -1,11 +1,11 @@ -package com.yizhuan.erban.skill.repository +package com.mango.moshen.skill.repository import com.google.gson.JsonElement -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity +import com.mango.core.skill.entity.SkillPropertyEntity +import com.mango.core.skill.entity.SkillRecordEntity +import com.mango.core.skill.entity.SkillTypeEntity +import com.mango.core.bean.response.ServiceResult +import com.mango.core.user.bean.UserInfoSkillEntity import io.reactivex.Single import okhttp3.RequestBody import retrofit2.http.* diff --git a/app/src/main/java/com/yizhuan/erban/skill/repository/ISkillModel.kt b/app/src/main/java/com/mango/moshen/skill/repository/ISkillModel.kt similarity index 56% rename from app/src/main/java/com/yizhuan/erban/skill/repository/ISkillModel.kt rename to app/src/main/java/com/mango/moshen/skill/repository/ISkillModel.kt index 374dca068..8c5cca45e 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/repository/ISkillModel.kt +++ b/app/src/main/java/com/mango/moshen/skill/repository/ISkillModel.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.skill.repository +package com.mango.moshen.skill.repository -import com.yizhuan.xchat_android_core.skill.entity.SkillPostServerEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity +import com.mango.core.skill.entity.SkillPostServerEntity +import com.mango.core.skill.entity.SkillPropertyEntity +import com.mango.core.skill.entity.SkillRecordEntity +import com.mango.core.skill.entity.SkillTypeEntity +import com.mango.core.user.bean.UserInfoSkillEntity import io.reactivex.Single diff --git a/app/src/main/java/com/yizhuan/erban/skill/repository/SkillDataManager.java b/app/src/main/java/com/mango/moshen/skill/repository/SkillDataManager.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/skill/repository/SkillDataManager.java rename to app/src/main/java/com/mango/moshen/skill/repository/SkillDataManager.java index d40e57768..93cc5c6f5 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/repository/SkillDataManager.java +++ b/app/src/main/java/com/mango/moshen/skill/repository/SkillDataManager.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.skill.repository; +package com.mango.moshen.skill.repository; import android.util.SparseArray; -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity; +import com.mango.core.skill.entity.SkillPropertyEntity; public class SkillDataManager { private static final class Helper { diff --git a/app/src/main/java/com/yizhuan/erban/skill/repository/SkillModel.kt b/app/src/main/java/com/mango/moshen/skill/repository/SkillModel.kt similarity index 75% rename from app/src/main/java/com/yizhuan/erban/skill/repository/SkillModel.kt rename to app/src/main/java/com/mango/moshen/skill/repository/SkillModel.kt index 69af36498..7e6f2b5e2 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/repository/SkillModel.kt +++ b/app/src/main/java/com/mango/moshen/skill/repository/SkillModel.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.skill.repository +package com.mango.moshen.skill.repository import com.google.gson.Gson -import com.yizhuan.xchat_android_core.skill.entity.SkillPostServerEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity -import com.yizhuan.xchat_android_core.utils.net.RxHelper -import com.yizhuan.xchat_android_library.net.rxnet.RxNet +import com.mango.core.skill.entity.SkillPostServerEntity +import com.mango.core.skill.entity.SkillPropertyEntity +import com.mango.core.skill.entity.SkillRecordEntity +import com.mango.core.skill.entity.SkillTypeEntity +import com.mango.core.base.BaseModel +import com.mango.core.user.bean.UserInfoSkillEntity +import com.mango.core.utils.net.RxHelper +import com.mango.xchat_android_library.net.rxnet.RxNet import io.reactivex.Single import okhttp3.MediaType import okhttp3.RequestBody diff --git a/app/src/main/java/com/yizhuan/erban/skill/widget/EditItem.kt b/app/src/main/java/com/mango/moshen/skill/widget/EditItem.kt similarity index 90% rename from app/src/main/java/com/yizhuan/erban/skill/widget/EditItem.kt rename to app/src/main/java/com/mango/moshen/skill/widget/EditItem.kt index 9a0786fc2..c79f7bac3 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/widget/EditItem.kt +++ b/app/src/main/java/com/mango/moshen/skill/widget/EditItem.kt @@ -1,13 +1,13 @@ -package com.yizhuan.erban.skill.widget +package com.mango.moshen.skill.widget import android.content.Context import android.view.LayoutInflater import android.view.View import android.widget.EditText import android.widget.TextView -import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.skill.entity.PropRefEntity -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.mango.moshen.R +import com.mango.core.skill.entity.PropRefEntity +import com.mango.core.utils.TextUtils class EditItem(private val itemAttr: ItemAttribute) : SkillItem { private lateinit var contentView: EditText diff --git a/app/src/main/java/com/yizhuan/erban/skill/widget/ItemAttribute.kt b/app/src/main/java/com/mango/moshen/skill/widget/ItemAttribute.kt similarity index 89% rename from app/src/main/java/com/yizhuan/erban/skill/widget/ItemAttribute.kt rename to app/src/main/java/com/mango/moshen/skill/widget/ItemAttribute.kt index bf1ca0017..536726915 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/widget/ItemAttribute.kt +++ b/app/src/main/java/com/mango/moshen/skill/widget/ItemAttribute.kt @@ -1,6 +1,6 @@ -package com.yizhuan.erban.skill.widget +package com.mango.moshen.skill.widget -import com.yizhuan.xchat_android_core.skill.entity.PropRefEntity +import com.mango.core.skill.entity.PropRefEntity import java.io.File data class ItemAttribute( diff --git a/app/src/main/java/com/yizhuan/erban/skill/widget/RecordDurationItem.kt b/app/src/main/java/com/mango/moshen/skill/widget/RecordDurationItem.kt similarity index 92% rename from app/src/main/java/com/yizhuan/erban/skill/widget/RecordDurationItem.kt rename to app/src/main/java/com/mango/moshen/skill/widget/RecordDurationItem.kt index e377af1f6..ebb676119 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/widget/RecordDurationItem.kt +++ b/app/src/main/java/com/mango/moshen/skill/widget/RecordDurationItem.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.widget +package com.mango.moshen.skill.widget import android.content.Context import android.view.View diff --git a/app/src/main/java/com/yizhuan/erban/skill/widget/RecordIResourceItem.kt b/app/src/main/java/com/mango/moshen/skill/widget/RecordIResourceItem.kt similarity index 94% rename from app/src/main/java/com/yizhuan/erban/skill/widget/RecordIResourceItem.kt rename to app/src/main/java/com/mango/moshen/skill/widget/RecordIResourceItem.kt index 7c2c45a54..9ef4760d5 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/widget/RecordIResourceItem.kt +++ b/app/src/main/java/com/mango/moshen/skill/widget/RecordIResourceItem.kt @@ -1,17 +1,17 @@ -package com.yizhuan.erban.skill.widget +package com.mango.moshen.skill.widget import android.content.Context import android.view.LayoutInflater import android.view.View import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.netease.nimlib.sdk.media.record.RecordType -import com.yizhuan.erban.R -import com.yizhuan.erban.audio.helper.AudioPlayerHelper -import com.yizhuan.erban.audio.helper.OnPlayListener -import com.yizhuan.erban.databinding.LayoutSkillAudioBinding -import com.yizhuan.erban.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_core.utils.TextUtils -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.R +import com.mango.moshen.audio.helper.AudioPlayerHelper +import com.mango.moshen.audio.helper.OnPlayListener +import com.mango.moshen.databinding.LayoutSkillAudioBinding +import com.mango.moshen.ui.widget.dialog.CommonTipDialog +import com.mango.core.utils.TextUtils +import com.mango.core.utils.toast import java.io.File class RecordIResourceItem(private val itemAttribute: ItemAttribute) : SkillItem, diff --git a/app/src/main/java/com/yizhuan/erban/skill/widget/SelectionItem.kt b/app/src/main/java/com/mango/moshen/skill/widget/SelectionItem.kt similarity index 94% rename from app/src/main/java/com/yizhuan/erban/skill/widget/SelectionItem.kt rename to app/src/main/java/com/mango/moshen/skill/widget/SelectionItem.kt index 85e710c36..36ee00c83 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/widget/SelectionItem.kt +++ b/app/src/main/java/com/mango/moshen/skill/widget/SelectionItem.kt @@ -1,12 +1,12 @@ -package com.yizhuan.erban.skill.widget +package com.mango.moshen.skill.widget import android.content.Context import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout -import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.mango.moshen.R +import com.mango.core.utils.TextUtils import java.lang.StringBuilder class SelectionItem(private val itemAttr: ItemAttribute) : SkillItem { diff --git a/app/src/main/java/com/yizhuan/erban/skill/widget/SkillAttribute.kt b/app/src/main/java/com/mango/moshen/skill/widget/SkillAttribute.kt similarity index 91% rename from app/src/main/java/com/yizhuan/erban/skill/widget/SkillAttribute.kt rename to app/src/main/java/com/mango/moshen/skill/widget/SkillAttribute.kt index 5d04bb4b9..d0f5b4505 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/widget/SkillAttribute.kt +++ b/app/src/main/java/com/mango/moshen/skill/widget/SkillAttribute.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.widget +package com.mango.moshen.skill.widget const val CARD_TYPE_GAME = 1 const val CARD_TYPE_ART = 2 diff --git a/app/src/main/java/com/yizhuan/erban/skill/widget/SkillCardView.kt b/app/src/main/java/com/mango/moshen/skill/widget/SkillCardView.kt similarity index 94% rename from app/src/main/java/com/yizhuan/erban/skill/widget/SkillCardView.kt rename to app/src/main/java/com/mango/moshen/skill/widget/SkillCardView.kt index 97bbe9063..b4ac0ddf0 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/widget/SkillCardView.kt +++ b/app/src/main/java/com/mango/moshen/skill/widget/SkillCardView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.widget +package com.mango.moshen.skill.widget import android.content.Context import android.text.TextUtils @@ -9,10 +9,10 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView import androidx.annotation.Nullable -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil +import com.mango.moshen.R +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.moshen.ui.utils.ImageLoadUtilsV2 +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil /** * 技能卡 diff --git a/app/src/main/java/com/yizhuan/erban/skill/widget/SkillItem.kt b/app/src/main/java/com/mango/moshen/skill/widget/SkillItem.kt similarity index 84% rename from app/src/main/java/com/yizhuan/erban/skill/widget/SkillItem.kt rename to app/src/main/java/com/mango/moshen/skill/widget/SkillItem.kt index cddd20be0..c7b1206a0 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/widget/SkillItem.kt +++ b/app/src/main/java/com/mango/moshen/skill/widget/SkillItem.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.widget +package com.mango.moshen.skill.widget import android.content.Context import android.view.View diff --git a/app/src/main/java/com/yizhuan/erban/skill/widget/SkillItemHelper.kt b/app/src/main/java/com/mango/moshen/skill/widget/SkillItemHelper.kt similarity index 89% rename from app/src/main/java/com/yizhuan/erban/skill/widget/SkillItemHelper.kt rename to app/src/main/java/com/mango/moshen/skill/widget/SkillItemHelper.kt index e1ae450b5..cbcdad1b4 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/widget/SkillItemHelper.kt +++ b/app/src/main/java/com/mango/moshen/skill/widget/SkillItemHelper.kt @@ -1,12 +1,12 @@ -package com.yizhuan.erban.skill.widget +package com.mango.moshen.skill.widget import android.graphics.Color import android.text.SpannableStringBuilder import android.text.style.ForegroundColorSpan import android.widget.EditText import android.widget.TextView -import com.yizhuan.erban.skill.widget.ItemAttribute.Companion.STATE_AUDIO -import com.yizhuan.erban.skill.widget.ItemAttribute.Companion.STATE_DURATION +import com.mango.moshen.skill.widget.ItemAttribute.Companion.STATE_AUDIO +import com.mango.moshen.skill.widget.ItemAttribute.Companion.STATE_DURATION object SkillItemHelper { /** diff --git a/app/src/main/java/com/yizhuan/erban/skill/widget/TimerRecorderView.kt b/app/src/main/java/com/mango/moshen/skill/widget/TimerRecorderView.kt similarity index 98% rename from app/src/main/java/com/yizhuan/erban/skill/widget/TimerRecorderView.kt rename to app/src/main/java/com/mango/moshen/skill/widget/TimerRecorderView.kt index 817045aad..c0affba74 100644 --- a/app/src/main/java/com/yizhuan/erban/skill/widget/TimerRecorderView.kt +++ b/app/src/main/java/com/mango/moshen/skill/widget/TimerRecorderView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.widget +package com.mango.moshen.skill.widget import android.animation.ValueAnimator import android.content.Context @@ -14,7 +14,7 @@ import com.netease.nim.uikit.impl.NimUIKitImpl import com.netease.nimlib.sdk.media.record.AudioRecorder import com.netease.nimlib.sdk.media.record.IAudioRecordCallback import com.netease.nimlib.sdk.media.record.RecordType -import com.yizhuan.erban.R +import com.mango.moshen.R import java.io.File private const val STATE_PAUSED = 0 diff --git a/app/src/main/java/com/yizhuan/erban/sys/ErbanSysMsgViewModel.java b/app/src/main/java/com/mango/moshen/sys/ErbanSysMsgViewModel.java similarity index 68% rename from app/src/main/java/com/yizhuan/erban/sys/ErbanSysMsgViewModel.java rename to app/src/main/java/com/mango/moshen/sys/ErbanSysMsgViewModel.java index a6b89766b..d1e11d35c 100644 --- a/app/src/main/java/com/yizhuan/erban/sys/ErbanSysMsgViewModel.java +++ b/app/src/main/java/com/mango/moshen/sys/ErbanSysMsgViewModel.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.sys; +package com.mango.moshen.sys; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.msg.sys.ApproveMsgInfo; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgModel; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.utils.net.RxHelper; +import com.mango.core.auth.AuthModel; +import com.mango.core.msg.sys.ApproveMsgInfo; +import com.mango.core.msg.sys.ErbanSysMsgModel; import java.util.Map; diff --git a/app/src/main/java/com/yizhuan/erban/team/adapter/AddTeamMemberAdapter.java b/app/src/main/java/com/mango/moshen/team/adapter/AddTeamMemberAdapter.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/team/adapter/AddTeamMemberAdapter.java rename to app/src/main/java/com/mango/moshen/team/adapter/AddTeamMemberAdapter.java index 252a87dec..6f061e80f 100644 --- a/app/src/main/java/com/yizhuan/erban/team/adapter/AddTeamMemberAdapter.java +++ b/app/src/main/java/com/mango/moshen/team/adapter/AddTeamMemberAdapter.java @@ -1,14 +1,14 @@ -package com.yizhuan.erban.team.adapter; +package com.mango.moshen.team.adapter; import android.content.Context; import android.view.View; import android.widget.TextView; -import com.yizhuan.erban.BR; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bindadapter.BaseAdapter; -import com.yizhuan.erban.bindadapter.BindingViewHolder; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.bindadapter.BindingViewHolder; +import com.mango.core.family.bean.FamilyMemberInfo; /** * Created by MadisonRong on 29/05/2018. diff --git a/app/src/main/java/com/yizhuan/erban/team/adapter/TeamListAdapter.java b/app/src/main/java/com/mango/moshen/team/adapter/TeamListAdapter.java similarity index 73% rename from app/src/main/java/com/yizhuan/erban/team/adapter/TeamListAdapter.java rename to app/src/main/java/com/mango/moshen/team/adapter/TeamListAdapter.java index 04a58ed38..a674e3216 100644 --- a/app/src/main/java/com/yizhuan/erban/team/adapter/TeamListAdapter.java +++ b/app/src/main/java/com/mango/moshen/team/adapter/TeamListAdapter.java @@ -1,16 +1,16 @@ -package com.yizhuan.erban.team.adapter; +package com.mango.moshen.team.adapter; import android.content.Context; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.BR; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bindadapter.BaseAdapter; -import com.yizhuan.erban.bindadapter.BindingViewHolder; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.bindadapter.BindingViewHolder; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.team.bean.TeamInfo; /** * Created by MadisonRong on 11/06/2018. diff --git a/app/src/main/java/com/yizhuan/erban/team/adapter/TeamMemberListAdapter.java b/app/src/main/java/com/mango/moshen/team/adapter/TeamMemberListAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/team/adapter/TeamMemberListAdapter.java rename to app/src/main/java/com/mango/moshen/team/adapter/TeamMemberListAdapter.java index 02b24fe61..ce8c92572 100644 --- a/app/src/main/java/com/yizhuan/erban/team/adapter/TeamMemberListAdapter.java +++ b/app/src/main/java/com/mango/moshen/team/adapter/TeamMemberListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.team.adapter; +package com.mango.moshen.team.adapter; import android.content.Context; import androidx.databinding.ViewDataBinding; @@ -10,15 +10,15 @@ import android.widget.TextView; import com.netease.nim.uikit.common.ui.imageview.HeadImageView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.BR; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bindadapter.BaseAdapter; -import com.yizhuan.erban.bindadapter.BindingViewHolder; -import com.yizhuan.erban.team.view.TeamMemberListActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.bindadapter.BindingViewHolder; +import com.mango.moshen.team.view.TeamMemberListActivity; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.auth.AuthModel; +import com.mango.core.level.UserLevelVo; +import com.mango.core.team.bean.TeamMemberInfo; /** * Created by MadisonRong on 30/05/2018. diff --git a/app/src/main/java/com/yizhuan/erban/team/adapter/TeamWeeklyBillAdapter.java b/app/src/main/java/com/mango/moshen/team/adapter/TeamWeeklyBillAdapter.java similarity index 79% rename from app/src/main/java/com/yizhuan/erban/team/adapter/TeamWeeklyBillAdapter.java rename to app/src/main/java/com/mango/moshen/team/adapter/TeamWeeklyBillAdapter.java index 2a1ae7b95..460b3c413 100644 --- a/app/src/main/java/com/yizhuan/erban/team/adapter/TeamWeeklyBillAdapter.java +++ b/app/src/main/java/com/mango/moshen/team/adapter/TeamWeeklyBillAdapter.java @@ -1,19 +1,19 @@ -package com.yizhuan.erban.team.adapter; +package com.mango.moshen.team.adapter; import android.content.Context; import android.view.View; import android.widget.TextView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.BR; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bindadapter.BaseAdapter; -import com.yizhuan.erban.bindadapter.BindingViewHolder; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.erban.ui.widget.UserInfoDialog; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionRecordInfo; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.bindadapter.BindingViewHolder; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.moshen.ui.widget.UserInfoDialog; +import com.mango.core.family.model.FamilyModel; +import com.mango.core.team.bean.TeamTransactionRecordInfo; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/app/src/main/java/com/yizhuan/erban/team/bean/NimTeamMember.java b/app/src/main/java/com/mango/moshen/team/bean/NimTeamMember.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/team/bean/NimTeamMember.java rename to app/src/main/java/com/mango/moshen/team/bean/NimTeamMember.java index 1c15e999f..1987fecec 100644 --- a/app/src/main/java/com/yizhuan/erban/team/bean/NimTeamMember.java +++ b/app/src/main/java/com/mango/moshen/team/bean/NimTeamMember.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.team.bean; +package com.mango.moshen.team.bean; import com.netease.nimlib.sdk.team.constant.TeamMemberType; import com.netease.nimlib.sdk.team.model.TeamMember; diff --git a/app/src/main/java/com/yizhuan/erban/team/dialog/QuitTeamDialog.java b/app/src/main/java/com/mango/moshen/team/dialog/QuitTeamDialog.java similarity index 61% rename from app/src/main/java/com/yizhuan/erban/team/dialog/QuitTeamDialog.java rename to app/src/main/java/com/mango/moshen/team/dialog/QuitTeamDialog.java index 7f3b6aa53..1883780af 100644 --- a/app/src/main/java/com/yizhuan/erban/team/dialog/QuitTeamDialog.java +++ b/app/src/main/java/com/mango/moshen/team/dialog/QuitTeamDialog.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.team.dialog; +package com.mango.moshen.team.dialog; import androidx.appcompat.app.AppCompatDialogFragment; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.R; +import com.mango.xchat_android_library.annatation.ActLayoutRes; /** * Created by MadisonRong on 29/05/2018. diff --git a/app/src/main/java/com/yizhuan/erban/team/event/TeamMemberUpdateEvent.java b/app/src/main/java/com/mango/moshen/team/event/TeamMemberUpdateEvent.java similarity index 72% rename from app/src/main/java/com/yizhuan/erban/team/event/TeamMemberUpdateEvent.java rename to app/src/main/java/com/mango/moshen/team/event/TeamMemberUpdateEvent.java index 436f376c4..005846cf4 100644 --- a/app/src/main/java/com/yizhuan/erban/team/event/TeamMemberUpdateEvent.java +++ b/app/src/main/java/com/mango/moshen/team/event/TeamMemberUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.team.event; +package com.mango.moshen.team.event; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/team/view/AddMemberActivity.java b/app/src/main/java/com/mango/moshen/team/view/AddMemberActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/team/view/AddMemberActivity.java rename to app/src/main/java/com/mango/moshen/team/view/AddMemberActivity.java index 8cac60612..ceff10887 100644 --- a/app/src/main/java/com/yizhuan/erban/team/view/AddMemberActivity.java +++ b/app/src/main/java/com/mango/moshen/team/view/AddMemberActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.team.view; +package com.mango.moshen.team.view; import android.app.Activity; import android.content.Intent; @@ -8,15 +8,15 @@ import android.view.View; import com.netease.nim.uikit.common.util.sys.NetworkUtil; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.databinding.ActivityAddTeamMemberBinding; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.team.adapter.AddTeamMemberAdapter; -import com.yizhuan.erban.team.viewmodel.FamilyMemberVM; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.databinding.ActivityAddTeamMemberBinding; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.team.adapter.AddTeamMemberAdapter; +import com.mango.moshen.team.viewmodel.FamilyMemberVM; +import com.mango.core.auth.AuthModel; +import com.mango.core.family.bean.FamilyMemberInfo; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/com/yizhuan/erban/team/view/AddMemberSearchActivity.java b/app/src/main/java/com/mango/moshen/team/view/AddMemberSearchActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/team/view/AddMemberSearchActivity.java rename to app/src/main/java/com/mango/moshen/team/view/AddMemberSearchActivity.java index ff7e0cb00..24dbd56b1 100644 --- a/app/src/main/java/com/yizhuan/erban/team/view/AddMemberSearchActivity.java +++ b/app/src/main/java/com/mango/moshen/team/view/AddMemberSearchActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.team.view; +package com.mango.moshen.team.view; import android.app.Activity; import android.content.Intent; @@ -10,16 +10,16 @@ import android.view.KeyEvent; import android.view.View; import android.view.inputmethod.EditorInfo; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.databinding.ActivityAddTeamMemberSearchListBinding; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.team.adapter.AddTeamMemberAdapter; -import com.yizhuan.erban.team.viewmodel.FamilyMemberVM; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.databinding.ActivityAddTeamMemberSearchListBinding; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.team.adapter.AddTeamMemberAdapter; +import com.mango.moshen.team.viewmodel.FamilyMemberVM; +import com.mango.core.auth.AuthModel; +import com.mango.core.family.bean.FamilyMemberInfo; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/com/yizhuan/erban/team/view/CreateTeamMessageActivity.java b/app/src/main/java/com/mango/moshen/team/view/CreateTeamMessageActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/team/view/CreateTeamMessageActivity.java rename to app/src/main/java/com/mango/moshen/team/view/CreateTeamMessageActivity.java index a56bbcdbc..4b62142d6 100644 --- a/app/src/main/java/com/yizhuan/erban/team/view/CreateTeamMessageActivity.java +++ b/app/src/main/java/com/mango/moshen/team/view/CreateTeamMessageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.team.view; +package com.mango.moshen.team.view; import android.content.Context; import android.content.Intent; @@ -9,15 +9,15 @@ import android.view.View; import android.widget.ImageView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingTakePhotoActivity; -import com.yizhuan.erban.databinding.ActivityCreateTeamMessageBinding; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.erban.team.viewmodel.TeamVM; -import com.yizhuan.erban.utils.KeyBoardUtils; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingTakePhotoActivity; +import com.mango.moshen.databinding.ActivityCreateTeamMessageBinding; +import com.mango.core.auth.AuthModel; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.team.viewmodel.TeamVM; +import com.mango.moshen.utils.KeyBoardUtils; +import com.mango.core.family.bean.FamilyMemberInfo; +import com.mango.core.family.model.FamilyModel; import java.util.ArrayList; import java.util.Objects; diff --git a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamManagementActivity.java b/app/src/main/java/com/mango/moshen/team/view/NimTeamManagementActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/team/view/NimTeamManagementActivity.java rename to app/src/main/java/com/mango/moshen/team/view/NimTeamManagementActivity.java index 6e1f7018f..e93d0d89e 100644 --- a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamManagementActivity.java +++ b/app/src/main/java/com/mango/moshen/team/view/NimTeamManagementActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.team.view; +package com.mango.moshen.team.view; import android.content.Context; import android.content.Intent; @@ -7,28 +7,28 @@ import android.view.View; import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper; import com.netease.nim.uikit.support.glide.GlideApp; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingTakePhotoActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.databinding.ActivityTeamManagementBinding; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.team.viewmodel.TeamVM; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.erban.ui.widget.ShareDialog; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.share.ShareModel; -import com.yizhuan.xchat_android_core.share.bean.SessionType; -import com.yizhuan.xchat_android_core.team.bean.TeamEvent; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.rxbus.RxBus; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingTakePhotoActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.databinding.ActivityTeamManagementBinding; +import com.mango.moshen.friend.view.SelectFriendActivity; +import com.mango.moshen.team.viewmodel.TeamVM; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.moshen.ui.widget.ShareDialog; +import com.mango.core.auth.AuthModel; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.model.FamilyModel; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.share.ShareModel; +import com.mango.core.share.bean.SessionType; +import com.mango.core.team.bean.TeamEvent; +import com.mango.core.team.bean.TeamInfo; +import com.mango.core.team.bean.TeamMemberInfo; +import com.mango.core.team.model.TeamModel; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_library.widget.IOSSwitchView; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java b/app/src/main/java/com/mango/moshen/team/view/NimTeamMessageActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java rename to app/src/main/java/com/mango/moshen/team/view/NimTeamMessageActivity.java index 333fceab1..39222a9db 100644 --- a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java +++ b/app/src/main/java/com/mango/moshen/team/view/NimTeamMessageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.team.view; +package com.mango.moshen.team.view; import android.content.Context; import android.content.Intent; @@ -28,25 +28,25 @@ import com.netease.nimlib.sdk.team.constant.TeamTypeEnum; import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.team.model.TeamMember; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.DragLayout; -import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; -import com.yizhuan.erban.team.viewmodel.TeamVM; -import com.yizhuan.erban.ui.im.actions.FamilyGameAction; -import com.yizhuan.erban.ui.im.actions.LuckyMoneyAction; -import com.yizhuan.erban.ui.im.avtivity.BaseMessageActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.team.bean.TeamEvent; -import com.yizhuan.xchat_android_core.team.model.TeamModel; -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.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.DragLayout; +import com.mango.moshen.family.view.activity.FamilyHomeActivity; +import com.mango.moshen.team.viewmodel.TeamVM; +import com.mango.moshen.ui.im.actions.FamilyGameAction; +import com.mango.moshen.ui.im.actions.LuckyMoneyAction; +import com.mango.moshen.ui.im.avtivity.BaseMessageActivity; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.model.FamilyModel; +import com.mango.core.initial.InitialModel; +import com.mango.core.initial.bean.InitInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.team.bean.TeamEvent; +import com.mango.core.team.model.TeamModel; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageFragment.java b/app/src/main/java/com/mango/moshen/team/view/NimTeamMessageFragment.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageFragment.java rename to app/src/main/java/com/mango/moshen/team/view/NimTeamMessageFragment.java index 2d05feaa2..cda4a916b 100644 --- a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageFragment.java +++ b/app/src/main/java/com/mango/moshen/team/view/NimTeamMessageFragment.java @@ -1,10 +1,9 @@ -package com.yizhuan.erban.team.view; +package com.mango.moshen.team.view; import android.Manifest; import android.annotation.SuppressLint; import android.content.Context; import android.os.Bundle; -import android.util.Log; import com.netease.nim.uikit.business.session.fragment.MessageFragment; import com.netease.nim.uikit.business.session.module.input.InputPanel; @@ -12,24 +11,20 @@ import com.netease.nim.uikit.business.session.module.input.NimAudioChatEvent; import com.netease.nim.uikit.business.session.module.input.NimImageActionEvent; import com.netease.nim.uikit.business.session.module.list.MessageListPanelEx; import com.netease.nimlib.sdk.NIMClient; -import com.netease.nimlib.sdk.msg.MsgService; -import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.team.TeamService; -import com.netease.nimlib.sdk.team.model.LeaveTeamAttachment; import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.team.model.TeamMember; import com.tbruyelle.rxpermissions2.RxPermissions; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.IMMessageManager; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.core.auth.AuthModel; +import com.mango.core.manager.IMMessageManager; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; diff --git a/app/src/main/java/com/yizhuan/erban/team/view/TeamListFragment.java b/app/src/main/java/com/mango/moshen/team/view/TeamListFragment.java similarity index 78% rename from app/src/main/java/com/yizhuan/erban/team/view/TeamListFragment.java rename to app/src/main/java/com/mango/moshen/team/view/TeamListFragment.java index e72372669..dee6c725a 100644 --- a/app/src/main/java/com/yizhuan/erban/team/view/TeamListFragment.java +++ b/app/src/main/java/com/mango/moshen/team/view/TeamListFragment.java @@ -1,19 +1,19 @@ -package com.yizhuan.erban.team.view; +package com.mango.moshen.team.view; import android.app.Activity; import android.os.Bundle; import androidx.recyclerview.widget.LinearLayoutManager; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingFragment; -import com.yizhuan.erban.databinding.FragmentTeamListBinding; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.team.adapter.TeamListAdapter; -import com.yizhuan.erban.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingFragment; +import com.mango.moshen.databinding.FragmentTeamListBinding; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.friend.view.SelectFriendActivity; +import com.mango.moshen.team.adapter.TeamListAdapter; +import com.mango.moshen.team.viewmodel.TeamVM; +import com.mango.core.team.bean.TeamInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; /** * Created by MadisonRong on 11/06/2018. diff --git a/app/src/main/java/com/yizhuan/erban/team/view/TeamMemberListActivity.java b/app/src/main/java/com/mango/moshen/team/view/TeamMemberListActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/team/view/TeamMemberListActivity.java rename to app/src/main/java/com/mango/moshen/team/view/TeamMemberListActivity.java index 9ca7a9a05..6e4e8ce2b 100644 --- a/app/src/main/java/com/yizhuan/erban/team/view/TeamMemberListActivity.java +++ b/app/src/main/java/com/mango/moshen/team/view/TeamMemberListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.team.view; +package com.mango.moshen.team.view; import android.app.Activity; import android.content.Context; @@ -13,21 +13,21 @@ import com.netease.nim.uikit.common.util.sys.NetworkUtil; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.team.TeamService; import com.netease.nimlib.sdk.team.model.Team; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.databinding.ActivityTeamMemberListBinding; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.team.adapter.TeamMemberListAdapter; -import com.yizhuan.erban.team.bean.NimTeamMember; -import com.yizhuan.erban.team.event.TeamMemberUpdateEvent; -import com.yizhuan.erban.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.databinding.ActivityTeamMemberListBinding; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.rxbus.RxBusHelper; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.team.adapter.TeamMemberListAdapter; +import com.mango.moshen.team.bean.NimTeamMember; +import com.mango.moshen.team.event.TeamMemberUpdateEvent; +import com.mango.moshen.team.viewmodel.TeamVM; +import com.mango.core.family.bean.FamilyMemberInfo; +import com.mango.core.team.bean.TeamInfo; +import com.mango.core.team.bean.TeamMemberInfo; +import com.mango.core.team.model.TeamModel; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/team/view/TeamMemberSearchListActivity.java b/app/src/main/java/com/mango/moshen/team/view/TeamMemberSearchListActivity.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/team/view/TeamMemberSearchListActivity.java rename to app/src/main/java/com/mango/moshen/team/view/TeamMemberSearchListActivity.java index 1f935c3c4..5195d38eb 100644 --- a/app/src/main/java/com/yizhuan/erban/team/view/TeamMemberSearchListActivity.java +++ b/app/src/main/java/com/mango/moshen/team/view/TeamMemberSearchListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.team.view; +package com.mango.moshen.team.view; import android.app.Activity; import android.content.Context; @@ -13,29 +13,29 @@ import android.view.View; import android.view.inputmethod.EditorInfo; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.databinding.ActivityTeamMemberSearchListBinding; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.team.adapter.TeamMemberListAdapter; -import com.yizhuan.erban.team.bean.NimTeamMember; -import com.yizhuan.erban.team.event.TeamMemberUpdateEvent; -import com.yizhuan.erban.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.databinding.ActivityTeamMemberSearchListBinding; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.rxbus.RxBusHelper; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.team.adapter.TeamMemberListAdapter; +import com.mango.moshen.team.bean.NimTeamMember; +import com.mango.moshen.team.event.TeamMemberUpdateEvent; +import com.mango.moshen.team.viewmodel.TeamVM; +import com.mango.core.team.bean.TeamInfo; +import com.mango.core.team.bean.TeamMemberInfo; +import com.mango.core.team.model.TeamModel; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.Iterator; -import static com.yizhuan.erban.team.view.TeamMemberListActivity.EXTRA_ID; -import static com.yizhuan.erban.team.view.TeamMemberListActivity.KEY_OPERATION_TYPE; -import static com.yizhuan.erban.team.view.TeamMemberListActivity.OP_TEAM_MEMBER_NORMAL; -import static com.yizhuan.erban.team.view.TeamMemberListActivity.REQUEST_CODE; -import static com.yizhuan.erban.team.view.TeamMemberListActivity.RESULT_DATA; +import static com.mango.moshen.team.view.TeamMemberListActivity.EXTRA_ID; +import static com.mango.moshen.team.view.TeamMemberListActivity.KEY_OPERATION_TYPE; +import static com.mango.moshen.team.view.TeamMemberListActivity.OP_TEAM_MEMBER_NORMAL; +import static com.mango.moshen.team.view.TeamMemberListActivity.REQUEST_CODE; +import static com.mango.moshen.team.view.TeamMemberListActivity.RESULT_DATA; /** * Created by MadisonRong on 31/05/2018. diff --git a/app/src/main/java/com/yizhuan/erban/team/view/TeamWeeklyBillActivity.java b/app/src/main/java/com/mango/moshen/team/view/TeamWeeklyBillActivity.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/team/view/TeamWeeklyBillActivity.java rename to app/src/main/java/com/mango/moshen/team/view/TeamWeeklyBillActivity.java index 657bea336..c60cbdf3a 100644 --- a/app/src/main/java/com/yizhuan/erban/team/view/TeamWeeklyBillActivity.java +++ b/app/src/main/java/com/mango/moshen/team/view/TeamWeeklyBillActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.team.view; +package com.mango.moshen.team.view; import android.content.Context; import android.content.Intent; @@ -12,16 +12,16 @@ import android.widget.TextView; import com.netease.nim.uikit.common.util.sys.NetworkUtil; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.databinding.ActivityTeamWeeklyBillBinding; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.team.adapter.TeamWeeklyBillAdapter; -import com.yizhuan.erban.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionRecordInfo; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.databinding.ActivityTeamWeeklyBillBinding; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.team.adapter.TeamWeeklyBillAdapter; +import com.mango.moshen.team.viewmodel.TeamVM; +import com.mango.core.family.model.FamilyModel; +import com.mango.core.team.bean.TeamTransactionRecordInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/team/view/TeamWeeklyBillSearchActivity.java b/app/src/main/java/com/mango/moshen/team/view/TeamWeeklyBillSearchActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/team/view/TeamWeeklyBillSearchActivity.java rename to app/src/main/java/com/mango/moshen/team/view/TeamWeeklyBillSearchActivity.java index bee7fbe13..495c70c6d 100644 --- a/app/src/main/java/com/yizhuan/erban/team/view/TeamWeeklyBillSearchActivity.java +++ b/app/src/main/java/com/mango/moshen/team/view/TeamWeeklyBillSearchActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.team.view; +package com.mango.moshen.team.view; import android.content.Context; import android.content.Intent; @@ -13,15 +13,15 @@ import android.view.inputmethod.EditorInfo; import com.netease.nim.uikit.common.util.sys.NetworkUtil; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.databinding.ActivityTeamWeeklyBillSearchBinding; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.team.adapter.TeamWeeklyBillAdapter; -import com.yizhuan.erban.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionRecordInfo; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.databinding.ActivityTeamWeeklyBillSearchBinding; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.team.adapter.TeamWeeklyBillAdapter; +import com.mango.moshen.team.viewmodel.TeamVM; +import com.mango.core.team.bean.TeamTransactionRecordInfo; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/team/view/UpdateTeamNameActivity.java b/app/src/main/java/com/mango/moshen/team/view/UpdateTeamNameActivity.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/team/view/UpdateTeamNameActivity.java rename to app/src/main/java/com/mango/moshen/team/view/UpdateTeamNameActivity.java index ad709af80..5dbccb903 100644 --- a/app/src/main/java/com/yizhuan/erban/team/view/UpdateTeamNameActivity.java +++ b/app/src/main/java/com/mango/moshen/team/view/UpdateTeamNameActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.team.view; +package com.mango.moshen.team.view; import android.content.Context; import android.content.Intent; @@ -7,16 +7,16 @@ import android.text.InputFilter; import android.view.View; import android.widget.EditText; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.databinding.ActivityUpdateTeamNameBinding; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.erban.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.databinding.ActivityUpdateTeamNameBinding; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.team.viewmodel.TeamVM; +import com.mango.core.team.bean.TeamInfo; +import com.mango.core.team.model.TeamModel; -import static com.yizhuan.erban.team.view.NimTeamManagementActivity.EXTRA_TEAM_ID; +import static com.mango.moshen.team.view.NimTeamManagementActivity.EXTRA_TEAM_ID; /** * Created by MadisonRong on 28/06/2018. diff --git a/app/src/main/java/com/yizhuan/erban/team/viewmodel/FamilyMemberVM.java b/app/src/main/java/com/mango/moshen/team/viewmodel/FamilyMemberVM.java similarity index 68% rename from app/src/main/java/com/yizhuan/erban/team/viewmodel/FamilyMemberVM.java rename to app/src/main/java/com/mango/moshen/team/viewmodel/FamilyMemberVM.java index de5ae4c75..116b49fc0 100644 --- a/app/src/main/java/com/yizhuan/erban/team/viewmodel/FamilyMemberVM.java +++ b/app/src/main/java/com/mango/moshen/team/viewmodel/FamilyMemberVM.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.team.viewmodel; +package com.mango.moshen.team.viewmodel; -import com.yizhuan.erban.base.BaseVM; -import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.mango.moshen.base.BaseVM; +import com.mango.core.family.bean.response.memberList.RespFamilymember; +import com.mango.core.family.model.FamilyModel; import io.reactivex.Single; diff --git a/app/src/main/java/com/yizhuan/erban/team/viewmodel/TeamVM.java b/app/src/main/java/com/mango/moshen/team/viewmodel/TeamVM.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/team/viewmodel/TeamVM.java rename to app/src/main/java/com/mango/moshen/team/viewmodel/TeamVM.java index 6c182b430..d4c07f585 100644 --- a/app/src/main/java/com/yizhuan/erban/team/viewmodel/TeamVM.java +++ b/app/src/main/java/com/mango/moshen/team/viewmodel/TeamVM.java @@ -1,14 +1,14 @@ -package com.yizhuan.erban.team.viewmodel; +package com.mango.moshen.team.viewmodel; -import com.yizhuan.erban.base.BaseVM; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyRecordsInfo; -import com.yizhuan.xchat_android_core.team.bean.RespTeamMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; +import com.mango.moshen.base.BaseVM; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.luckymoney.LuckyMoneyInfo; +import com.mango.core.luckymoney.LuckyMoneyRecordsInfo; +import com.mango.core.team.bean.RespTeamMemberInfo; +import com.mango.core.team.bean.TeamInfo; +import com.mango.core.team.bean.TeamMemberInfo; +import com.mango.core.team.bean.TeamTransactionInfo; +import com.mango.core.team.model.TeamModel; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/anim/AnimFactory.java b/app/src/main/java/com/mango/moshen/ui/anim/AnimFactory.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/anim/AnimFactory.java rename to app/src/main/java/com/mango/moshen/ui/anim/AnimFactory.java index f2bc20c53..6b77f6c05 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/anim/AnimFactory.java +++ b/app/src/main/java/com/mango/moshen/ui/anim/AnimFactory.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.anim; +package com.mango.moshen.ui.anim; import android.content.Context; import android.graphics.Color; @@ -7,10 +7,10 @@ import android.graphics.drawable.ColorDrawable; import android.util.Log; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; -import com.yizhuan.xchat_android_core.room.face.FaceInfo; -import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo; -import com.yizhuan.xchat_android_library.threadmgr.ThreadPoolManager; +import com.mango.core.room.face.DynamicFaceModel; +import com.mango.core.room.face.FaceInfo; +import com.mango.core.room.face.FaceReceiveInfo; +import com.mango.xchat_android_library.threadmgr.ThreadPoolManager; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/anim/FlowFaceDrawable.java b/app/src/main/java/com/mango/moshen/ui/anim/FlowFaceDrawable.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/anim/FlowFaceDrawable.java rename to app/src/main/java/com/mango/moshen/ui/anim/FlowFaceDrawable.java index e15a191d3..d441f38d0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/anim/FlowFaceDrawable.java +++ b/app/src/main/java/com/mango/moshen/ui/anim/FlowFaceDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.anim; +package com.mango.moshen.ui.anim; import android.content.Context; import android.graphics.Bitmap; @@ -14,7 +14,7 @@ import androidx.annotation.Nullable; import com.bumptech.glide.request.FutureTarget; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; +import com.mango.moshen.ui.widget.marqueeview.Utils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/anim/FrameAnimation.java b/app/src/main/java/com/mango/moshen/ui/anim/FrameAnimation.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/anim/FrameAnimation.java rename to app/src/main/java/com/mango/moshen/ui/anim/FrameAnimation.java index b2a8b09f7..fa74e6f52 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/anim/FrameAnimation.java +++ b/app/src/main/java/com/mango/moshen/ui/anim/FrameAnimation.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.anim; +package com.mango.moshen.ui.anim; import android.graphics.drawable.Drawable; import android.widget.ImageView; diff --git a/app/src/main/java/com/yizhuan/erban/ui/anim/OneFaceDrawable.java b/app/src/main/java/com/mango/moshen/ui/anim/OneFaceDrawable.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/anim/OneFaceDrawable.java rename to app/src/main/java/com/mango/moshen/ui/anim/OneFaceDrawable.java index 60759c1a5..bb8a9f099 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/anim/OneFaceDrawable.java +++ b/app/src/main/java/com/mango/moshen/ui/anim/OneFaceDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.anim; +package com.mango.moshen.ui.anim; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/yizhuan/erban/ui/anim/OverlayFaceDrawable.java b/app/src/main/java/com/mango/moshen/ui/anim/OverlayFaceDrawable.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/anim/OverlayFaceDrawable.java rename to app/src/main/java/com/mango/moshen/ui/anim/OverlayFaceDrawable.java index 8e01dee82..b3675da08 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/anim/OverlayFaceDrawable.java +++ b/app/src/main/java/com/mango/moshen/ui/anim/OverlayFaceDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.anim; +package com.mango.moshen.ui.anim; import android.content.Context; import android.graphics.Bitmap; @@ -14,7 +14,7 @@ import androidx.annotation.Nullable; import com.bumptech.glide.request.FutureTarget; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; +import com.mango.moshen.ui.widget.marqueeview.Utils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/anim/WavingDrawable.java b/app/src/main/java/com/mango/moshen/ui/anim/WavingDrawable.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/anim/WavingDrawable.java rename to app/src/main/java/com/mango/moshen/ui/anim/WavingDrawable.java index c50fc3ab1..a66d34efb 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/anim/WavingDrawable.java +++ b/app/src/main/java/com/mango/moshen/ui/anim/WavingDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.anim; +package com.mango.moshen.ui.anim; import android.graphics.Canvas; import android.graphics.Color; diff --git a/app/src/main/java/com/yizhuan/erban/ui/bean/BaseResponse.java b/app/src/main/java/com/mango/moshen/ui/bean/BaseResponse.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/bean/BaseResponse.java rename to app/src/main/java/com/mango/moshen/ui/bean/BaseResponse.java index 5fd1005cd..9b5724725 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/bean/BaseResponse.java +++ b/app/src/main/java/com/mango/moshen/ui/bean/BaseResponse.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.bean; +package com.mango.moshen.ui.bean; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/bean/Footer.java b/app/src/main/java/com/mango/moshen/ui/bean/Footer.java similarity index 68% rename from app/src/main/java/com/yizhuan/erban/ui/bean/Footer.java rename to app/src/main/java/com/mango/moshen/ui/bean/Footer.java index 0c443bb97..bbe573229 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/bean/Footer.java +++ b/app/src/main/java/com/mango/moshen/ui/bean/Footer.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.bean; +package com.mango.moshen.ui.bean; /** * Created by zhouxiangfeng on 2017/4/30. diff --git a/app/src/main/java/com/yizhuan/erban/ui/bean/FooterLoadMoreBean.java b/app/src/main/java/com/mango/moshen/ui/bean/FooterLoadMoreBean.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/ui/bean/FooterLoadMoreBean.java rename to app/src/main/java/com/mango/moshen/ui/bean/FooterLoadMoreBean.java index fb33cd8c4..c33cf327d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/bean/FooterLoadMoreBean.java +++ b/app/src/main/java/com/mango/moshen/ui/bean/FooterLoadMoreBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.bean; +package com.mango.moshen.ui.bean; diff --git a/app/src/main/java/com/yizhuan/erban/ui/bean/header.java b/app/src/main/java/com/mango/moshen/ui/bean/header.java similarity index 68% rename from app/src/main/java/com/yizhuan/erban/ui/bean/header.java rename to app/src/main/java/com/mango/moshen/ui/bean/header.java index cbaa49edf..a10c0e25c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/bean/header.java +++ b/app/src/main/java/com/mango/moshen/ui/bean/header.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.bean; +package com.mango.moshen.ui.bean; /** * Created by zhouxiangfeng on 2017/4/30. diff --git a/app/src/main/java/com/yizhuan/erban/ui/behavior/FixAppBarBehavior.java b/app/src/main/java/com/mango/moshen/ui/behavior/FixAppBarBehavior.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/behavior/FixAppBarBehavior.java rename to app/src/main/java/com/mango/moshen/ui/behavior/FixAppBarBehavior.java index 52a531e4c..b6a5dda38 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/behavior/FixAppBarBehavior.java +++ b/app/src/main/java/com/mango/moshen/ui/behavior/FixAppBarBehavior.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.behavior; +package com.mango.moshen.ui.behavior; import android.content.Context; import com.google.android.material.appbar.AppBarLayout; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/adapter/FaceGVAdapter.java b/app/src/main/java/com/mango/moshen/ui/gift/adapter/FaceGVAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/gift/adapter/FaceGVAdapter.java rename to app/src/main/java/com/mango/moshen/ui/gift/adapter/FaceGVAdapter.java index 71184fe18..76fac9280 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/adapter/FaceGVAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/adapter/FaceGVAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.adapter; +package com.mango.moshen.ui.gift.adapter; import android.content.Context; import android.graphics.Bitmap; @@ -11,10 +11,10 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.gift.util.RecyclerViewUtil; -import com.yizhuan.erban.ui.gift.widget.GiftDataInfo; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; +import com.mango.moshen.R; +import com.mango.moshen.ui.gift.util.RecyclerViewUtil; +import com.mango.moshen.ui.gift.widget.GiftDataInfo; +import com.mango.moshen.ui.utils.ImageLoadUtils; import java.io.IOException; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/adapter/FaceVPAdapter.java b/app/src/main/java/com/mango/moshen/ui/gift/adapter/FaceVPAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/gift/adapter/FaceVPAdapter.java rename to app/src/main/java/com/mango/moshen/ui/gift/adapter/FaceVPAdapter.java index a35f9bfeb..fb86b4a5b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/adapter/FaceVPAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/adapter/FaceVPAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.adapter; +package com.mango.moshen.ui.gift.adapter; import androidx.viewpager.widget.PagerAdapter; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java b/app/src/main/java/com/mango/moshen/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java similarity index 57% rename from app/src/main/java/com/yizhuan/erban/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java rename to app/src/main/java/com/mango/moshen/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java index 4ce12bde9..e5cc57d38 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java @@ -1,12 +1,10 @@ -package com.yizhuan.erban.ui.gift.callback; +package com.mango.moshen.ui.gift.callback; -import com.yizhuan.erban.ui.widget.GiftDialog; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; +import com.mango.moshen.ui.widget.GiftDialog; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.room.queue.bean.MicMemberInfo; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; public class OnGiftDialogBtnClickListenerWrapper implements GiftDialog.OnGiftDialogBtnClickListener { diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftGridView.java b/app/src/main/java/com/mango/moshen/ui/gift/dialog/GiftGridView.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftGridView.java rename to app/src/main/java/com/mango/moshen/ui/gift/dialog/GiftGridView.java index 97bee7fe5..1cbc667d5 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftGridView.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/dialog/GiftGridView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.dialog; +package com.mango.moshen.ui.gift.dialog; import android.content.Context; import android.util.AttributeSet; @@ -13,12 +13,12 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.erban.BR; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -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 com.mango.moshen.BR; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.magic.bean.MagicInfo; +import com.mango.xchat_android_library.bindinglist.IItem; +import com.mango.xchat_android_library.bindinglist.MultiTypeAdapter; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java b/app/src/main/java/com/mango/moshen/ui/gift/dialog/GiftInfoVm.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java rename to app/src/main/java/com/mango/moshen/ui/gift/dialog/GiftInfoVm.java index 10ac50227..18566925a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/dialog/GiftInfoVm.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.dialog; +package com.mango.moshen.ui.gift.dialog; import android.content.Context; @@ -7,11 +7,11 @@ import androidx.databinding.ObservableField; import android.graphics.drawable.Drawable; -import com.yizhuan.erban.R; -import com.yizhuan.erban.vip.VipHelper; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.SimpleVipInfo; -import com.yizhuan.xchat_android_library.bindinglist.BaseItem; +import com.mango.moshen.R; +import com.mango.moshen.vip.VipHelper; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.SimpleVipInfo; +import com.mango.xchat_android_library.bindinglist.BaseItem; /** * 礼物item diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/PageIndicatorView.java b/app/src/main/java/com/mango/moshen/ui/gift/dialog/PageIndicatorView.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/gift/dialog/PageIndicatorView.java rename to app/src/main/java/com/mango/moshen/ui/gift/dialog/PageIndicatorView.java index 126517bdf..5eb83c6ff 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/PageIndicatorView.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/dialog/PageIndicatorView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.dialog; +package com.mango.moshen.ui.gift.dialog; import android.content.Context; import android.util.AttributeSet; @@ -6,8 +6,8 @@ import android.view.Gravity; import android.view.View; import android.widget.LinearLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/gif/AnimatedGifDrawable.java b/app/src/main/java/com/mango/moshen/ui/gift/gif/AnimatedGifDrawable.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/gift/gif/AnimatedGifDrawable.java rename to app/src/main/java/com/mango/moshen/ui/gift/gif/AnimatedGifDrawable.java index 33ec76495..a00af3669 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/gif/AnimatedGifDrawable.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/gif/AnimatedGifDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.gif; +package com.mango.moshen.ui.gift.gif; import android.graphics.Bitmap; import android.graphics.drawable.AnimationDrawable; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/gif/AnimatedImageSpan.java b/app/src/main/java/com/mango/moshen/ui/gift/gif/AnimatedImageSpan.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/gift/gif/AnimatedImageSpan.java rename to app/src/main/java/com/mango/moshen/ui/gift/gif/AnimatedImageSpan.java index 287990601..9d2b5f628 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/gif/AnimatedImageSpan.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/gif/AnimatedImageSpan.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.gif; +package com.mango.moshen.ui.gift.gif; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/gif/GifDecoder.java b/app/src/main/java/com/mango/moshen/ui/gift/gif/GifDecoder.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/gift/gif/GifDecoder.java rename to app/src/main/java/com/mango/moshen/ui/gift/gif/GifDecoder.java index 2480ff1b8..5bd6d48f8 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/gif/GifDecoder.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/gif/GifDecoder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.gif; +package com.mango.moshen.ui.gift.gif; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/util/ExpressionUtil.java b/app/src/main/java/com/mango/moshen/ui/gift/util/ExpressionUtil.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/gift/util/ExpressionUtil.java rename to app/src/main/java/com/mango/moshen/ui/gift/util/ExpressionUtil.java index 41ac8c244..995d47be6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/util/ExpressionUtil.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/util/ExpressionUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.util; +package com.mango.moshen.ui.gift.util; import android.content.Context; import android.graphics.Bitmap; @@ -15,11 +15,11 @@ import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.gift.adapter.FaceGVAdapter; -import com.yizhuan.erban.ui.gift.gif.AnimatedGifDrawable; -import com.yizhuan.erban.ui.gift.gif.AnimatedImageSpan; -import com.yizhuan.erban.ui.gift.widget.GiftDataInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.gift.adapter.FaceGVAdapter; +import com.mango.moshen.ui.gift.gif.AnimatedGifDrawable; +import com.mango.moshen.ui.gift.gif.AnimatedImageSpan; +import com.mango.moshen.ui.gift.widget.GiftDataInfo; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/util/FileUtil.java b/app/src/main/java/com/mango/moshen/ui/gift/util/FileUtil.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/gift/util/FileUtil.java rename to app/src/main/java/com/mango/moshen/ui/gift/util/FileUtil.java index dcc7f767a..67037f39c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/util/FileUtil.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/util/FileUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.util; +package com.mango.moshen.ui.gift.util; import android.content.Context; import android.content.pm.ApplicationInfo; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/util/GiftPanelControl.java b/app/src/main/java/com/mango/moshen/ui/gift/util/GiftPanelControl.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/gift/util/GiftPanelControl.java rename to app/src/main/java/com/mango/moshen/ui/gift/util/GiftPanelControl.java index 6c8ebd130..61f3140c5 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/util/GiftPanelControl.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/util/GiftPanelControl.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.util; +package com.mango.moshen.ui.gift.util; import android.content.Context; import androidx.viewpager.widget.ViewPager; @@ -9,10 +9,10 @@ import android.widget.ImageView; import android.widget.LinearLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.gift.adapter.FaceGVAdapter; -import com.yizhuan.erban.ui.gift.adapter.FaceVPAdapter; -import com.yizhuan.erban.ui.gift.widget.GiftDataInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.gift.adapter.FaceGVAdapter; +import com.mango.moshen.ui.gift.adapter.FaceVPAdapter; +import com.mango.moshen.ui.gift.widget.GiftDataInfo; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/util/GlideCacheUtil.java b/app/src/main/java/com/mango/moshen/ui/gift/util/GlideCacheUtil.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/gift/util/GlideCacheUtil.java rename to app/src/main/java/com/mango/moshen/ui/gift/util/GlideCacheUtil.java index b92417a64..15c318366 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/util/GlideCacheUtil.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/util/GlideCacheUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.util; +package com.mango.moshen.ui.gift.util; import android.content.Context; import android.os.Looper; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/util/Preconditions.java b/app/src/main/java/com/mango/moshen/ui/gift/util/Preconditions.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/gift/util/Preconditions.java rename to app/src/main/java/com/mango/moshen/ui/gift/util/Preconditions.java index b37f96f0b..cac689b3d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/util/Preconditions.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/util/Preconditions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.erban.ui.gift.util; +package com.mango.moshen.ui.gift.util; import android.os.Looper; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/util/RecyclerViewUtil.java b/app/src/main/java/com/mango/moshen/ui/gift/util/RecyclerViewUtil.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/gift/util/RecyclerViewUtil.java rename to app/src/main/java/com/mango/moshen/ui/gift/util/RecyclerViewUtil.java index d363079bd..59e16ee75 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/util/RecyclerViewUtil.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/util/RecyclerViewUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.util; +package com.mango.moshen.ui.gift.util; import android.content.Context; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/CustormAnim.java b/app/src/main/java/com/mango/moshen/ui/gift/widget/CustormAnim.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/gift/widget/CustormAnim.java rename to app/src/main/java/com/mango/moshen/ui/gift/widget/CustormAnim.java index 698f897d7..05d887cb4 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/CustormAnim.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/widget/CustormAnim.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.widget; +package com.mango.moshen.ui.gift.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -9,7 +9,7 @@ import androidx.annotation.NonNull; import android.view.View; import android.view.animation.DecelerateInterpolator; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * @author KathLine diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftAnimationUtil.java b/app/src/main/java/com/mango/moshen/ui/gift/widget/GiftAnimationUtil.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftAnimationUtil.java rename to app/src/main/java/com/mango/moshen/ui/gift/widget/GiftAnimationUtil.java index 731455f2f..301c3a64a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftAnimationUtil.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/widget/GiftAnimationUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.widget; +package com.mango.moshen.ui.gift.widget; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftControl.java b/app/src/main/java/com/mango/moshen/ui/gift/widget/GiftControl.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftControl.java rename to app/src/main/java/com/mango/moshen/ui/gift/widget/GiftControl.java index 54ce36c0a..172ae6dcc 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftControl.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/widget/GiftControl.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.widget; +package com.mango.moshen.ui.gift.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftDataInfo.java b/app/src/main/java/com/mango/moshen/ui/gift/widget/GiftDataInfo.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftDataInfo.java rename to app/src/main/java/com/mango/moshen/ui/gift/widget/GiftDataInfo.java index 086308aea..d65f0df0a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftDataInfo.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/widget/GiftDataInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.widget; +package com.mango.moshen.ui.gift.widget; /** * Created by KathLine on 2017/1/8. diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftFrameLayout.java b/app/src/main/java/com/mango/moshen/ui/gift/widget/GiftFrameLayout.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftFrameLayout.java rename to app/src/main/java/com/mango/moshen/ui/gift/widget/GiftFrameLayout.java index bb2bd070b..fb3de4619 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftFrameLayout.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/widget/GiftFrameLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.widget; +package com.mango.moshen.ui.gift.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -25,8 +25,8 @@ import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.transition.Transition; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.io.IOException; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GlideCircleTransform.java b/app/src/main/java/com/mango/moshen/ui/gift/widget/GlideCircleTransform.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/gift/widget/GlideCircleTransform.java rename to app/src/main/java/com/mango/moshen/ui/gift/widget/GlideCircleTransform.java index a7ffbf464..3b3dd8fd9 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GlideCircleTransform.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/widget/GlideCircleTransform.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.widget; +package com.mango.moshen.ui.gift.widget; import android.graphics.Bitmap; import android.graphics.BitmapShader; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/ICustormAnim.java b/app/src/main/java/com/mango/moshen/ui/gift/widget/ICustormAnim.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/ui/gift/widget/ICustormAnim.java rename to app/src/main/java/com/mango/moshen/ui/gift/widget/ICustormAnim.java index cedc931c9..5b274843d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/ICustormAnim.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/widget/ICustormAnim.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.widget; +package com.mango.moshen.ui.gift.widget; import android.animation.AnimatorSet; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/NumberTextView.java b/app/src/main/java/com/mango/moshen/ui/gift/widget/NumberTextView.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/gift/widget/NumberTextView.java rename to app/src/main/java/com/mango/moshen/ui/gift/widget/NumberTextView.java index b502075ac..5caf4a6d6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/NumberTextView.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/widget/NumberTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.widget; +package com.mango.moshen.ui.gift.widget; import android.content.Context; import android.util.AttributeSet; @@ -6,7 +6,7 @@ import android.view.LayoutInflater; import android.widget.ImageView; import android.widget.LinearLayout; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/StrokeTextView.java b/app/src/main/java/com/mango/moshen/ui/gift/widget/StrokeTextView.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/gift/widget/StrokeTextView.java rename to app/src/main/java/com/mango/moshen/ui/gift/widget/StrokeTextView.java index 681aba51a..ee342c7e6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/StrokeTextView.java +++ b/app/src/main/java/com/mango/moshen/ui/gift/widget/StrokeTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.gift.widget; +package com.mango.moshen.ui.gift.widget; import android.content.Context; import android.content.res.TypedArray; @@ -8,7 +8,7 @@ import android.text.TextPaint; import android.util.AttributeSet; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.lang.reflect.Field; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/GreetPresenter.java b/app/src/main/java/com/mango/moshen/ui/im/GreetPresenter.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/ui/im/GreetPresenter.java rename to app/src/main/java/com/mango/moshen/ui/im/GreetPresenter.java index 4c75ce807..6f5a2c326 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/GreetPresenter.java +++ b/app/src/main/java/com/mango/moshen/ui/im/GreetPresenter.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.ui.im; +package com.mango.moshen.ui.im; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.im.GreetModel; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.im.GreetModel; +import com.mango.core.utils.SharedPreferenceUtils; import io.reactivex.Single; import io.reactivex.SingleSource; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/ImInitHelper.java b/app/src/main/java/com/mango/moshen/ui/im/ImInitHelper.java similarity index 64% rename from app/src/main/java/com/yizhuan/erban/ui/im/ImInitHelper.java rename to app/src/main/java/com/mango/moshen/ui/im/ImInitHelper.java index fc0678432..f89b44fdc 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/ImInitHelper.java +++ b/app/src/main/java/com/mango/moshen/ui/im/ImInitHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im; +package com.mango.moshen.ui.im; import android.content.Context; @@ -9,60 +9,59 @@ import com.netease.nim.uikit.api.model.session.SessionEventListener; import com.netease.nim.uikit.business.session.actions.BaseAction; import com.netease.nim.uikit.business.session.actions.ImageAction; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.erban.community.holder.DynamicSysHolder; -import com.yizhuan.erban.community.im.WorldDynamicShareViewHolder; -import com.yizhuan.erban.luckymoney.viewholder.LuckyMoneyMsgViewHolder; -import com.yizhuan.erban.luckymoney.viewholder.LuckyMoneyTipsViewHolder; -import com.yizhuan.erban.module_hall.HallDataManager; -import com.yizhuan.erban.public_chat_hall.msg.viewholder.MsgViewHolderAitMe; -import com.yizhuan.erban.share.viewholder.InAppSharingMsgViewHolder; -import com.yizhuan.erban.ui.im.actions.GiftAction; -import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.erban.ui.im.chat.MsgViewHolderAudioParty; -import com.yizhuan.erban.ui.im.chat.MsgViewHolderChatHint; -import com.yizhuan.erban.ui.im.chat.MsgViewHolderContent; -import com.yizhuan.erban.ui.im.chat.MsgViewHolderGift; -import com.yizhuan.erban.ui.im.chat.MsgViewHolderHello; -import com.yizhuan.erban.ui.im.chat.MsgViewHolderLevel; -import com.yizhuan.erban.ui.im.chat.MsgViewHolderLottery; -import com.yizhuan.erban.ui.im.chat.MsgViewHolderOnline; -import com.yizhuan.erban.ui.im.chat.MsgViewHolderRedPackage; -import com.yizhuan.erban.ui.im.chat.MsgViewHolderRedPacket; -import com.yizhuan.erban.ui.im.chat.MsgViewHolderSkill; -import com.yizhuan.erban.ui.im.chat.MsgViewHolderText; -import com.yizhuan.erban.ui.im.chat.SignInNoticeMsgViewHolder; -import com.yizhuan.erban.ui.im.chat.SysMsgV2ViewHolder; -import com.yizhuan.erban.ui.im.chat.SysMsgViewHolder; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.xchat_android_core.community.attachment.DynamicSysAttachment; -import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarveUpGoldThirdLevelAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatHintAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CpInviteAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingFamilyAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingMiniWorldAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingRoomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingTeamAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LevelUpAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LotteryAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NoticeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenRoomNotiAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.SkillMsgAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgV2Attachment; -import com.yizhuan.xchat_android_core.miniworld.bean.OpenAudioPartyAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitMeAttachment; +import com.mango.moshen.community.holder.DynamicSysHolder; +import com.mango.moshen.community.im.WorldDynamicShareViewHolder; +import com.mango.moshen.luckymoney.viewholder.LuckyMoneyMsgViewHolder; +import com.mango.moshen.luckymoney.viewholder.LuckyMoneyTipsViewHolder; +import com.mango.moshen.module_hall.HallDataManager; +import com.mango.moshen.public_chat_hall.msg.viewholder.MsgViewHolderAitMe; +import com.mango.moshen.share.viewholder.InAppSharingMsgViewHolder; +import com.mango.moshen.ui.im.actions.GiftAction; +import com.mango.moshen.ui.im.avtivity.NimP2PMessageActivity; +import com.mango.moshen.ui.im.chat.MsgViewHolderAudioParty; +import com.mango.moshen.ui.im.chat.MsgViewHolderChatHint; +import com.mango.moshen.ui.im.chat.MsgViewHolderContent; +import com.mango.moshen.ui.im.chat.MsgViewHolderGift; +import com.mango.moshen.ui.im.chat.MsgViewHolderHello; +import com.mango.moshen.ui.im.chat.MsgViewHolderLevel; +import com.mango.moshen.ui.im.chat.MsgViewHolderLottery; +import com.mango.moshen.ui.im.chat.MsgViewHolderOnline; +import com.mango.moshen.ui.im.chat.MsgViewHolderRedPackage; +import com.mango.moshen.ui.im.chat.MsgViewHolderRedPacket; +import com.mango.moshen.ui.im.chat.MsgViewHolderSkill; +import com.mango.moshen.ui.im.chat.MsgViewHolderText; +import com.mango.moshen.ui.im.chat.SignInNoticeMsgViewHolder; +import com.mango.moshen.ui.im.chat.SysMsgV2ViewHolder; +import com.mango.moshen.ui.im.chat.SysMsgViewHolder; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.core.community.attachment.DynamicSysAttachment; +import com.mango.core.community.im.WorldDynamicAttachment; +import com.mango.core.im.custom.bean.AssistantAttachment; +import com.mango.core.im.custom.bean.CarAttachment; +import com.mango.core.im.custom.bean.CarveUpGoldThirdLevelAttachment; +import com.mango.core.im.custom.bean.ChatHintAttachment; +import com.mango.core.im.custom.bean.CpInviteAttachment; +import com.mango.core.im.custom.bean.GiftAttachment; +import com.mango.core.im.custom.bean.InAppSharingFamilyAttachment; +import com.mango.core.im.custom.bean.InAppSharingMiniWorldAttachment; +import com.mango.core.im.custom.bean.InAppSharingRoomAttachment; +import com.mango.core.im.custom.bean.InAppSharingTeamAttachment; +import com.mango.core.im.custom.bean.LevelUpAttachment; +import com.mango.core.im.custom.bean.LotteryAttachment; +import com.mango.core.im.custom.bean.LuckyMoneyAttachment; +import com.mango.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.mango.core.im.custom.bean.NewbieHelloAttachment; +import com.mango.core.im.custom.bean.NobleAttachment; +import com.mango.core.im.custom.bean.NoticeAttachment; +import com.mango.core.im.custom.bean.OpenRoomNotiAttachment; +import com.mango.core.im.custom.bean.OpenSignInAttachment; +import com.mango.core.im.custom.bean.RedPackageAttachment; +import com.mango.core.im.custom.bean.RedPacketAttachment; +import com.mango.core.im.custom.bean.SkillMsgAttachment; +import com.mango.core.im.custom.bean.SysMsgAttachment; +import com.mango.core.im.custom.bean.SysMsgV2Attachment; +import com.mango.core.miniworld.bean.OpenAudioPartyAttachment; +import com.mango.core.public_chat_hall.attachment.AitMeAttachment; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java b/app/src/main/java/com/mango/moshen/ui/im/MessageListPanelEx.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java rename to app/src/main/java/com/mango/moshen/ui/im/MessageListPanelEx.java index f5a7a550c..d2cee003b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java +++ b/app/src/main/java/com/mango/moshen/ui/im/MessageListPanelEx.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im; +package com.mango.moshen.ui.im; import android.app.Activity; import android.content.ActivityNotFoundException; @@ -65,8 +65,8 @@ import com.netease.nimlib.sdk.robot.model.RobotAttachment; import com.netease.nimlib.sdk.robot.model.RobotMsgType; import com.netease.nimlib.sdk.team.constant.TeamMemberType; import com.netease.nimlib.sdk.team.model.TeamMember; -import com.yizhuan.xchat_android_core.room.event.MessageSizeEvent; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.core.room.event.MessageSizeEvent; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java b/app/src/main/java/com/mango/moshen/ui/im/RouterHandler.java similarity index 78% rename from app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java rename to app/src/main/java/com/mango/moshen/ui/im/RouterHandler.java index 669a7e45f..27bde226f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java +++ b/app/src/main/java/com/mango/moshen/ui/im/RouterHandler.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im; +package com.mango.moshen.ui.im; import android.annotation.SuppressLint; import android.content.Context; @@ -6,61 +6,61 @@ import android.content.Intent; import android.os.Bundle; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.audio.VoiceMatchActivity; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.avroom.recommendcard.MyRecommendCardActivity; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.base.DialogManagerInterface; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.decoration.view.DecorationStoreActivity; -import com.yizhuan.erban.decoration.view.MyDecorationActivity; -import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; -import com.yizhuan.erban.fansteam.FansTeamListActivity; -import com.yizhuan.erban.home.activity.CollectionRoomActivity; -import com.yizhuan.erban.home.activity.VisitorListActivity; -import com.yizhuan.erban.home.helper.OpenRoomHelper; -import com.yizhuan.erban.miniworld.activity.MiniWorldGuestPageActivity; -import com.yizhuan.erban.miniworld.activity.MiniWorldMainActivity; -import com.yizhuan.erban.module_hall.HallDataManager; -import com.yizhuan.erban.module_hall.hall.activity.ModuleClanActivity; -import com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity; -import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity; -import com.yizhuan.erban.radish.signin.SignInActivity; -import com.yizhuan.erban.radish.task.activity.TaskCenterActivity; -import com.yizhuan.erban.relation.cp.activity.CpHomeActivity; -import com.yizhuan.erban.relation.cp.activity.CpInviteRecordActivity; -import com.yizhuan.erban.relation.cp.activity.CpTaskActivity; -import com.yizhuan.erban.team.view.NimTeamMessageActivity; -import com.yizhuan.erban.ui.login.BindPhoneActivity; -import com.yizhuan.erban.ui.login.ShowBindPhoneActivity; -import com.yizhuan.erban.ui.patriarch.PatriarchModeActivity; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.erban.ui.setting.FeedbackActivity; -import com.yizhuan.erban.ui.setting.ModifyPwdActivity; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.withdraw.BinderAlipayActivity; -import com.yizhuan.erban.vip.VipMainActivity; -import com.yizhuan.tutu.mentoring_relationship.activity.MentoringRelationshipActivity; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.event.SquareTaskEvent; -import com.yizhuan.xchat_android_core.im.custom.bean.RouterType; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -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.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.withdraw.WithdrawModel; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.UIHelper; +import com.mango.moshen.audio.VoiceMatchActivity; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.avroom.recommendcard.MyRecommendCardActivity; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.base.DialogManagerInterface; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.decoration.view.DecorationStoreActivity; +import com.mango.moshen.decoration.view.MyDecorationActivity; +import com.mango.moshen.family.view.activity.FamilyHomeActivity; +import com.mango.moshen.fansteam.FansTeamListActivity; +import com.mango.moshen.home.activity.CollectionRoomActivity; +import com.mango.moshen.home.activity.VisitorListActivity; +import com.mango.moshen.home.helper.OpenRoomHelper; +import com.mango.moshen.miniworld.activity.MiniWorldGuestPageActivity; +import com.mango.moshen.miniworld.activity.MiniWorldMainActivity; +import com.mango.moshen.module_hall.HallDataManager; +import com.mango.moshen.module_hall.hall.activity.ModuleClanActivity; +import com.mango.moshen.module_hall.hall.activity.ModuleHallActivity; +import com.mango.moshen.public_chat_hall.activity.PublicChatHallHomeActivity; +import com.mango.moshen.radish.signin.SignInActivity; +import com.mango.moshen.radish.task.activity.TaskCenterActivity; +import com.mango.moshen.relation.cp.activity.CpHomeActivity; +import com.mango.moshen.relation.cp.activity.CpInviteRecordActivity; +import com.mango.moshen.relation.cp.activity.CpTaskActivity; +import com.mango.moshen.team.view.NimTeamMessageActivity; +import com.mango.moshen.ui.login.BindPhoneActivity; +import com.mango.moshen.ui.login.ShowBindPhoneActivity; +import com.mango.moshen.ui.patriarch.PatriarchModeActivity; +import com.mango.moshen.ui.pay.ChargeActivity; +import com.mango.moshen.ui.setting.FeedbackActivity; +import com.mango.moshen.ui.setting.ModifyPwdActivity; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.ui.withdraw.BinderAlipayActivity; +import com.mango.moshen.vip.VipMainActivity; +import com.mango.moshen.mentoring_relationship.activity.MentoringRelationshipActivity; +import com.mango.core.DemoCache; +import com.mango.core.auth.AuthModel; +import com.mango.core.community.event.SquareTaskEvent; +import com.mango.core.im.custom.bean.RouterType; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.module_hall.hall.HallModel; +import com.mango.core.module_hall.hall.bean.HallInfo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.core.withdraw.WithdrawModel; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/mango/moshen/ui/im/actions/ChatterBoxAction.java b/app/src/main/java/com/mango/moshen/ui/im/actions/ChatterBoxAction.java new file mode 100644 index 000000000..2774f4a24 --- /dev/null +++ b/app/src/main/java/com/mango/moshen/ui/im/actions/ChatterBoxAction.java @@ -0,0 +1,46 @@ +package com.mango.moshen.ui.im.actions; + +import android.os.Handler; + +import com.netease.nim.uikit.business.session.actions.BaseAction; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.higuide.TuTuGuideHelper; +import com.mango.core.im.chatterbox.ChatterBoxHelper; +import com.mango.core.im.chatterbox.HideInputEvent; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; + +import org.greenrobot.eventbus.EventBus; + +public class ChatterBoxAction extends BaseAction { + + private long lastClick = 0L; + public static String sessionId; + + public ChatterBoxAction() { + super(R.drawable.chat_icon_say, R.string.chat_action); + } + + @Override + public void onClick() { + long currentClick = System.currentTimeMillis(); + + if (currentClick - lastClick > 1000L) { + + StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MESSAGE_START_CHATTER_BOX, "消息-发起话匣子"); + + EventBus.getDefault().post(new HideInputEvent()); + lastClick = currentClick; + + if (TuTuGuideHelper.isNeedHiGuide(TuTuGuideHelper.KEY_GUIDE_CHATTER_BOX)) { + new Handler().post(() -> { + TuTuGuideHelper helper = new TuTuGuideHelper(getActivity()); + helper.createHiGuide(() -> helper.createDiceOverLayer()); + TuTuGuideHelper.setNoNeedHiGuide(TuTuGuideHelper.KEY_GUIDE_CHATTER_BOX); + }); + } + ChatterBoxHelper.topicBoxCanSend(); + + } + } +} diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/actions/DecorationAction.java b/app/src/main/java/com/mango/moshen/ui/im/actions/DecorationAction.java similarity index 70% rename from app/src/main/java/com/yizhuan/erban/ui/im/actions/DecorationAction.java rename to app/src/main/java/com/mango/moshen/ui/im/actions/DecorationAction.java index 6dbfd8be9..d3d4e9d36 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/actions/DecorationAction.java +++ b/app/src/main/java/com/mango/moshen/ui/im/actions/DecorationAction.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.ui.im.actions; +package com.mango.moshen.ui.im.actions; import com.netease.nim.uikit.business.session.actions.BaseAction; -import com.yizhuan.erban.R; -import com.yizhuan.erban.decoration.view.DecorationStoreActivity; -import com.yizhuan.xchat_android_library.utils.JavaUtil; +import com.mango.moshen.R; +import com.mango.moshen.decoration.view.DecorationStoreActivity; +import com.mango.xchat_android_library.utils.JavaUtil; /** * Created by huangmeng1 on 2018/5/10. diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/actions/FamilyGameAction.java b/app/src/main/java/com/mango/moshen/ui/im/actions/FamilyGameAction.java similarity index 81% rename from app/src/main/java/com/yizhuan/erban/ui/im/actions/FamilyGameAction.java rename to app/src/main/java/com/mango/moshen/ui/im/actions/FamilyGameAction.java index abe70f9d5..f1396199a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/actions/FamilyGameAction.java +++ b/app/src/main/java/com/mango/moshen/ui/im/actions/FamilyGameAction.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.ui.im.actions; +package com.mango.moshen.ui.im.actions; import com.netease.nim.uikit.business.session.actions.BaseAction; -import com.yizhuan.erban.R; -import com.yizhuan.erban.family.view.activity.FamilyGameListActivity; +import com.mango.moshen.R; +import com.mango.moshen.family.view.activity.FamilyGameListActivity; /** * Created by MadisonRong on 29/05/2018. diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/actions/GiftAction.java b/app/src/main/java/com/mango/moshen/ui/im/actions/GiftAction.java similarity index 71% rename from app/src/main/java/com/yizhuan/erban/ui/im/actions/GiftAction.java rename to app/src/main/java/com/mango/moshen/ui/im/actions/GiftAction.java index 0e2382c53..c94162a76 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/actions/GiftAction.java +++ b/app/src/main/java/com/mango/moshen/ui/im/actions/GiftAction.java @@ -1,28 +1,21 @@ -package com.yizhuan.erban.ui.im.actions; +package com.mango.moshen.ui.im.actions; import android.annotation.SuppressLint; import com.netease.nim.uikit.business.session.actions.BaseAction; import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.widget.GiftDialog; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.toolbox.GiftToolbox; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.VipLevelNotEnoughException; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.ui.widget.GiftDialog; +import com.mango.core.gift.GiftModel; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.toolbox.GiftToolbox; +import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.VipLevelNotEnoughException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/actions/GiftActionEvent.java b/app/src/main/java/com/mango/moshen/ui/im/actions/GiftActionEvent.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/im/actions/GiftActionEvent.java rename to app/src/main/java/com/mango/moshen/ui/im/actions/GiftActionEvent.java index 72db55549..85c0bd5ca 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/actions/GiftActionEvent.java +++ b/app/src/main/java/com/mango/moshen/ui/im/actions/GiftActionEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.actions; +package com.mango.moshen.ui.im.actions; import java.io.Serializable; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/actions/LuckyMoneyAction.java b/app/src/main/java/com/mango/moshen/ui/im/actions/LuckyMoneyAction.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/ui/im/actions/LuckyMoneyAction.java rename to app/src/main/java/com/mango/moshen/ui/im/actions/LuckyMoneyAction.java index b443f33f5..2c5bd1bf5 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/actions/LuckyMoneyAction.java +++ b/app/src/main/java/com/mango/moshen/ui/im/actions/LuckyMoneyAction.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.ui.im.actions; +package com.mango.moshen.ui.im.actions; import com.netease.nim.uikit.business.session.actions.BaseAction; -import com.yizhuan.erban.R; -import com.yizhuan.erban.luckymoney.view.LuckyMoneyCreationActivity; +import com.mango.moshen.R; +import com.mango.moshen.luckymoney.view.LuckyMoneyCreationActivity; /** * Created by MadisonRong on 29/05/2018. diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/audio/ShakeHeartDialogFragment.java b/app/src/main/java/com/mango/moshen/ui/im/audio/ShakeHeartDialogFragment.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/im/audio/ShakeHeartDialogFragment.java rename to app/src/main/java/com/mango/moshen/ui/im/audio/ShakeHeartDialogFragment.java index 7b0fd5aa7..362fb9f62 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/audio/ShakeHeartDialogFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/im/audio/ShakeHeartDialogFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.audio; +package com.mango.moshen.ui.im.audio; import android.app.Dialog; import android.content.Context; @@ -23,7 +23,7 @@ import android.view.animation.ScaleAnimation; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; public class ShakeHeartDialogFragment extends DialogFragment { diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListActivity.java b/app/src/main/java/com/mango/moshen/ui/im/avtivity/AddBlackListActivity.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListActivity.java rename to app/src/main/java/com/mango/moshen/ui/im/avtivity/AddBlackListActivity.java index 0c74d1401..8669659d2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/im/avtivity/AddBlackListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.avtivity; +package com.mango.moshen.ui.im.avtivity; import android.annotation.SuppressLint; import android.content.Context; @@ -12,17 +12,17 @@ import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.business.session.constant.Extras; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.JavaUtil; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.utils.RegexUtil; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.user.UserModel; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.JavaUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListPresenter.java b/app/src/main/java/com/mango/moshen/ui/im/avtivity/AddBlackListPresenter.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListPresenter.java rename to app/src/main/java/com/mango/moshen/ui/im/avtivity/AddBlackListPresenter.java index 20845bd1a..d313d6b98 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListPresenter.java +++ b/app/src/main/java/com/mango/moshen/ui/im/avtivity/AddBlackListPresenter.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.ui.im.avtivity; +package com.mango.moshen.ui.im.avtivity; -import com.yizhuan.erban.base.BaseMvpPresenter; +import com.mango.moshen.base.BaseMvpPresenter; /** * @author Administrator diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BaseMessageActivity.java b/app/src/main/java/com/mango/moshen/ui/im/avtivity/BaseMessageActivity.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BaseMessageActivity.java rename to app/src/main/java/com/mango/moshen/ui/im/avtivity/BaseMessageActivity.java index 4854a2d9e..cf3ecb8ad 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BaseMessageActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/im/avtivity/BaseMessageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.avtivity; +package com.mango.moshen.ui.im.avtivity; import android.app.Activity; import android.content.Intent; @@ -22,7 +22,7 @@ import com.netease.nim.uikit.business.session.fragment.MessageFragment; import com.netease.nim.uikit.common.activity.ToolBarOptions; import com.netease.nim.uikit.common.fragment.TFragment; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.base.BaseActivity; +import com.mango.moshen.base.BaseActivity; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BlackListAdapter.java b/app/src/main/java/com/mango/moshen/ui/im/avtivity/BlackListAdapter.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BlackListAdapter.java rename to app/src/main/java/com/mango/moshen/ui/im/avtivity/BlackListAdapter.java index ff2ee4bab..b626e6c59 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BlackListAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/im/avtivity/BlackListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.avtivity; +package com.mango.moshen.ui.im.avtivity; import androidx.recyclerview.widget.RecyclerView; import android.view.MotionEvent; @@ -9,10 +9,10 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BlackListManageActivity.java b/app/src/main/java/com/mango/moshen/ui/im/avtivity/BlackListManageActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BlackListManageActivity.java rename to app/src/main/java/com/mango/moshen/ui/im/avtivity/BlackListManageActivity.java index b24616b09..65fbb2d60 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BlackListManageActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/im/avtivity/BlackListManageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.avtivity; +package com.mango.moshen.ui.im.avtivity; import android.content.Context; import android.content.Intent; @@ -11,11 +11,11 @@ import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.common.NoDataFragment; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BlackListManagePresenter.java b/app/src/main/java/com/mango/moshen/ui/im/avtivity/BlackListManagePresenter.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BlackListManagePresenter.java rename to app/src/main/java/com/mango/moshen/ui/im/avtivity/BlackListManagePresenter.java index 5b463faad..b31d47fb5 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BlackListManagePresenter.java +++ b/app/src/main/java/com/mango/moshen/ui/im/avtivity/BlackListManagePresenter.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.ui.im.avtivity; +package com.mango.moshen.ui.im.avtivity; -import com.yizhuan.erban.base.BaseMvpPresenter; +import com.mango.moshen.base.BaseMvpPresenter; /** * @author Administrator diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/IAddBlackListView.java b/app/src/main/java/com/mango/moshen/ui/im/avtivity/IAddBlackListView.java similarity index 80% rename from app/src/main/java/com/yizhuan/erban/ui/im/avtivity/IAddBlackListView.java rename to app/src/main/java/com/mango/moshen/ui/im/avtivity/IAddBlackListView.java index 7733eec53..5fa5d27ef 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/IAddBlackListView.java +++ b/app/src/main/java/com/mango/moshen/ui/im/avtivity/IAddBlackListView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.ui.im.avtivity; +package com.mango.moshen.ui.im.avtivity; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** *

diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/IBlackListManageView.java b/app/src/main/java/com/mango/moshen/ui/im/avtivity/IBlackListManageView.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/ui/im/avtivity/IBlackListManageView.java rename to app/src/main/java/com/mango/moshen/ui/im/avtivity/IBlackListManageView.java index 8b12de856..6087bde4c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/IBlackListManageView.java +++ b/app/src/main/java/com/mango/moshen/ui/im/avtivity/IBlackListManageView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.ui.im.avtivity; +package com.mango.moshen.ui.im.avtivity; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NewBaseMessageActivity.java b/app/src/main/java/com/mango/moshen/ui/im/avtivity/NewBaseMessageActivity.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NewBaseMessageActivity.java rename to app/src/main/java/com/mango/moshen/ui/im/avtivity/NewBaseMessageActivity.java index fa95cd86f..9f286c816 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NewBaseMessageActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/im/avtivity/NewBaseMessageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.avtivity; +package com.mango.moshen.ui.im.avtivity; import android.app.Activity; import android.content.Intent; @@ -22,8 +22,8 @@ import com.netease.nim.uikit.business.session.constant.Extras; import com.netease.nim.uikit.common.activity.ToolBarOptions; import com.netease.nim.uikit.common.fragment.TFragment; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.ui.im.fragment.MessageFragment; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.ui.im.fragment.MessageFragment; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimFriendModel.java b/app/src/main/java/com/mango/moshen/ui/im/avtivity/NimFriendModel.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimFriendModel.java rename to app/src/main/java/com/mango/moshen/ui/im/avtivity/NimFriendModel.java index a15067176..fbf14647e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimFriendModel.java +++ b/app/src/main/java/com/mango/moshen/ui/im/avtivity/NimFriendModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.avtivity; +package com.mango.moshen.ui.im.avtivity; import com.netease.nimlib.sdk.InvocationFuture; import com.netease.nimlib.sdk.NIMClient; @@ -6,7 +6,7 @@ import com.netease.nimlib.sdk.friend.FriendService; import com.netease.nimlib.sdk.uinfo.UserService; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; import com.netease.nimlib.sdk.util.api.RequestResult; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java b/app/src/main/java/com/mango/moshen/ui/im/avtivity/NimP2PMessageActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java rename to app/src/main/java/com/mango/moshen/ui/im/avtivity/NimP2PMessageActivity.java index 4842f7499..5e3e91c34 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/im/avtivity/NimP2PMessageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.avtivity; +package com.mango.moshen.ui.im.avtivity; import android.annotation.SuppressLint; import android.content.Context; @@ -31,40 +31,39 @@ import com.netease.nimlib.sdk.Observer; 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.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.common.widget.CustomImageSpan; -import com.yizhuan.erban.ui.im.audio.ShakeHeartDialogFragment; -import com.yizhuan.erban.ui.im.fragment.MessageFragment; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.tutu.mentoring_relationship.dialog.BuildMentoringRelationshipSuccessDialog; -import com.yizhuan.xchat_android_core.audio.event.VoiceShakeHeartEvent; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringSuccessEvent; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -import com.yizhuan.xchat_android_core.praise.event.IsLikedEvent; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; -import com.yizhuan.xchat_android_core.utils.SystemUidUtil; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.common.widget.CustomImageSpan; +import com.mango.moshen.ui.im.audio.ShakeHeartDialogFragment; +import com.mango.moshen.ui.im.fragment.MessageFragment; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.mentoring_relationship.dialog.BuildMentoringRelationshipSuccessDialog; +import com.mango.core.audio.event.VoiceShakeHeartEvent; +import com.mango.core.auth.AuthModel; +import com.mango.core.im.friend.IMFriendModel; +import com.mango.core.initial.InitialModel; +import com.mango.core.initial.bean.InitInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.mentoring_relationship.event.MentoringSuccessEvent; +import com.mango.core.noble.NobleUtil; +import com.mango.core.praise.PraiseModel; +import com.mango.core.praise.event.IsLikedEvent; +import com.mango.core.praise.event.PraiseEvent; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserDetailInfo; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.StringExtensionKt; +import com.mango.core.utils.SystemUidUtil; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.util.List; -import java.util.Set; import io.reactivex.functions.Consumer; @@ -290,7 +289,7 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity { setTitle(""); // 显示是否 已经加入黑名单 - TextView tvAddBlackTip = getToolBar().findViewById(com.yizhuan.erban.R.id.tv_add_black_tip); + TextView tvAddBlackTip = getToolBar().findViewById(com.mango.moshen.R.id.tv_add_black_tip); List blackListAccount = NimFriendModel.get().getMyBlackListAccount(); tvAddBlackTip.setVisibility(View.GONE); if (!ListUtils.isListEmpty(blackListAccount)) { diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/SwipeRecyclerViewItem.java b/app/src/main/java/com/mango/moshen/ui/im/avtivity/SwipeRecyclerViewItem.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/im/avtivity/SwipeRecyclerViewItem.java rename to app/src/main/java/com/mango/moshen/ui/im/avtivity/SwipeRecyclerViewItem.java index 41f8257d9..a71dc562c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/SwipeRecyclerViewItem.java +++ b/app/src/main/java/com/mango/moshen/ui/im/avtivity/SwipeRecyclerViewItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.avtivity; +package com.mango.moshen.ui.im.avtivity; import android.content.Context; import androidx.annotation.NonNull; @@ -14,7 +14,7 @@ import android.widget.FrameLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * 一个支持侧滑删除的item diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MVHChatterBoxStart.java b/app/src/main/java/com/mango/moshen/ui/im/chat/MVHChatterBoxStart.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/MVHChatterBoxStart.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/MVHChatterBoxStart.java index 995d3ceb2..4180c4737 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MVHChatterBoxStart.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/MVHChatterBoxStart.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.util.Log; import android.view.LayoutInflater; @@ -13,15 +13,15 @@ import com.netease.nimlib.sdk.msg.MessageBuilder; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.CustomMessageConfig; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.chatterbox.ChatterBoxModel; -import com.yizhuan.xchat_android_core.im.chatterbox.TopicBoxItemInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatterBoxAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.DiceThrowAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; +import com.mango.moshen.R; +import com.mango.core.auth.AuthModel; +import com.mango.core.im.chatterbox.ChatterBoxModel; +import com.mango.core.im.chatterbox.TopicBoxItemInfo; +import com.mango.core.im.custom.bean.ChatterBoxAttachment; +import com.mango.core.im.custom.bean.DiceThrowAttachment; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; import java.util.HashMap; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderAudioParty.java b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderAudioParty.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderAudioParty.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderAudioParty.java index 6759d3745..d720072de 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderAudioParty.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderAudioParty.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import androidx.core.content.ContextCompat; import android.view.View; @@ -7,14 +7,14 @@ import android.widget.TextView; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.miniworld.bean.OpenAudioPartyAttachment; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldHelper; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.core.auth.AuthModel; +import com.mango.core.miniworld.bean.OpenAudioPartyAttachment; +import com.mango.core.miniworld.model.MiniWorldHelper; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.utils.SingleToastUtil; public class MsgViewHolderAudioParty extends MsgViewHolderBase implements View.OnClickListener { private ImageView ivIcAudioParty; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderChatHint.java b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderChatHint.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderChatHint.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderChatHint.java index 3eea86f31..ed6945653 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderChatHint.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderChatHint.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.graphics.Color; import android.text.SpannableString; @@ -13,11 +13,11 @@ import androidx.annotation.NonNull; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.erban.ui.webview.SimpleWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatHintAttachment; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.OriginalDrawStatusClickSpan; +import com.mango.moshen.ui.webview.SimpleWebViewActivity; +import com.mango.core.UriProvider; +import com.mango.core.im.custom.bean.ChatHintAttachment; public class MsgViewHolderChatHint extends MsgViewHolderBase { diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderContent.java b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderContent.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderContent.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderContent.java index 669bc0330..9fe676cc0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderContent.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderContent.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.view.View; import android.widget.ImageView; @@ -8,10 +8,10 @@ import android.widget.TextView; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.netease.nim.uikit.common.util.string.StringUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.im.custom.bean.NoticeAttachment; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.core.im.custom.bean.NoticeAttachment; /** * Created by chenran on 2017/9/21. diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderGift.java b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderGift.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderGift.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderGift.java index 9a4267b84..630dca975 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderGift.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderGift.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.text.TextUtils; import android.widget.FrameLayout; @@ -8,12 +8,12 @@ import android.widget.TextView; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.auth.AuthModel; +import com.mango.core.gift.GiftModel; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.im.custom.bean.GiftAttachment; /** * Created by chenran on 2017/10/3. diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderHello.java b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderHello.java similarity index 74% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderHello.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderHello.java index 1a7d93126..f1165db01 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderHello.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderHello.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.annotation.SuppressLint; import android.view.View; @@ -6,19 +6,13 @@ import android.widget.TextView; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.erban.MainActivity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.core.im.custom.bean.NewbieHelloAttachment; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.SingleToastUtil; import io.reactivex.functions.BiConsumer; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderLevel.java b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderLevel.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderLevel.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderLevel.java index 7f6c483a2..1bf2903a1 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderLevel.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderLevel.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.widget.ImageView; import android.widget.LinearLayout; @@ -6,12 +6,11 @@ import android.widget.TextView; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -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.LevelUpAttachment; +import com.mango.moshen.R; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.core.UriProvider; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.LevelUpAttachment; /** * Created by chenran on 2017/10/3. diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderLottery.java b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderLottery.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderLottery.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderLottery.java index 2c4d430f5..60075dd26 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderLottery.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderLottery.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.view.View; import android.widget.TextView; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; +import com.mango.moshen.R; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.core.UriProvider; /** * Created by chenran on 2018/1/2. diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderOnline.java b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderOnline.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderOnline.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderOnline.java index 32e476f7c..ca58df14d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderOnline.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderOnline.java @@ -1,5 +1,5 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.view.View; import android.widget.ImageView; @@ -12,10 +12,10 @@ import com.netease.nim.uikit.common.util.string.StringUtil; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.uinfo.UserService; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -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.im.custom.bean.OpenRoomNotiAttachment; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.im.custom.bean.OpenRoomNotiAttachment; /** * Created by chenran on 2017/9/21. diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPackage.java b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderRedPackage.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPackage.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderRedPackage.java index ab07395a7..860f0f94a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPackage.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderRedPackage.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.view.View; import android.widget.TextView; @@ -7,14 +7,14 @@ import com.coorchice.library.utils.LogUtils; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils; +import com.mango.core.redpackage.RedPackageNotifyInfo; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.core.DemoCache; +import com.mango.core.im.custom.bean.RedPackageAttachment; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.utils.CurrentTimeUtils; import java.util.Map; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPacket.java b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderRedPacket.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPacket.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderRedPacket.java index 849c921ca..5a8f5d291 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPacket.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderRedPacket.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.view.View; import android.widget.LinearLayout; @@ -6,8 +6,8 @@ import android.widget.TextView; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment; +import com.mango.moshen.R; +import com.mango.core.im.custom.bean.RedPacketAttachment; /** * Created by chenran on 2017/9/21. diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderSkill.java b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderSkill.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderSkill.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderSkill.java index 63a4b385d..2e7e0270e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderSkill.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderSkill.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.widget.TextView; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.im.custom.bean.SkillMsgAttachment; -import com.yizhuan.xchat_android_core.skill.entity.SkillNotifyEntity; +import com.mango.moshen.R; +import com.mango.core.im.custom.bean.SkillMsgAttachment; +import com.mango.core.skill.entity.SkillNotifyEntity; /** *

文字消息holder

diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderText.java b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderText.java similarity index 81% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderText.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderText.java index 3f170b427..75f08040c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderText.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/MsgViewHolderText.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.text.style.ForegroundColorSpan; import android.widget.TextView; @@ -6,31 +6,31 @@ import android.widget.TextView; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; -import com.yizhuan.erban.R; -import com.yizhuan.erban.decoration.view.MyDecorationActivity; -import com.yizhuan.erban.ui.im.RouterHandler; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.audio.bean.VoiceBottleSayHiInfo; -import com.yizhuan.xchat_android_core.audio.event.VoiceShakeHeartEvent; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarveUpGoldThirdLevelAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CpInviteAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.VoiceBottleShakeHeartAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; +import com.mango.moshen.R; +import com.mango.moshen.decoration.view.MyDecorationActivity; +import com.mango.moshen.ui.im.RouterHandler; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.utils.SpannableBuilder; +import com.mango.core.UriProvider; +import com.mango.core.audio.bean.VoiceBottleSayHiInfo; +import com.mango.core.audio.event.VoiceShakeHeartEvent; +import com.mango.core.auth.AuthModel; +import com.mango.core.im.custom.bean.AssistantAttachment; +import com.mango.core.im.custom.bean.CarAttachment; +import com.mango.core.im.custom.bean.CarveUpGoldThirdLevelAttachment; +import com.mango.core.im.custom.bean.CpInviteAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.NobleAttachment; +import com.mango.core.im.custom.bean.VoiceBottleShakeHeartAttachment; +import com.mango.core.manager.IMNetEaseManager; import org.greenrobot.eventbus.EventBus; import java.util.HashMap; import java.util.Map; -import static com.yizhuan.xchat_android_core.UriProvider.IM_SERVER_URL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_CAR_EXPIRE; +import static com.mango.core.UriProvider.IM_SERVER_URL; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_CAR_EXPIRE; /** *

文字消息holder

diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/SignInNoticeMsgViewHolder.java b/app/src/main/java/com/mango/moshen/ui/im/chat/SignInNoticeMsgViewHolder.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/SignInNoticeMsgViewHolder.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/SignInNoticeMsgViewHolder.java index a96e0928d..7ad721ff1 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/SignInNoticeMsgViewHolder.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/SignInNoticeMsgViewHolder.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.view.View; import android.widget.TextView; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.radish.signin.SignInActivity; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment; +import com.mango.moshen.R; +import com.mango.moshen.radish.signin.SignInActivity; +import com.mango.core.im.custom.bean.OpenSignInAttachment; /** * 签到提醒 diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/SysMsgV2ViewHolder.java b/app/src/main/java/com/mango/moshen/ui/im/chat/SysMsgV2ViewHolder.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/SysMsgV2ViewHolder.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/SysMsgV2ViewHolder.java index c120d9025..21fff260f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/SysMsgV2ViewHolder.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/SysMsgV2ViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.graphics.Color; import androidx.core.content.ContextCompat; @@ -19,25 +19,25 @@ import com.alibaba.fastjson.JSON; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.erban.R; -import com.yizhuan.erban.sys.ErbanSysMsgViewModel; -import com.yizhuan.erban.ui.im.RouterHandler; -import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgV2Attachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.msg.sys.ApproveMsgInfo; -import com.yizhuan.xchat_android_core.msg.sysv2.ErbanSysMsgV2Component; -import com.yizhuan.xchat_android_core.msg.sysv2.ErbanSysMsgV2Info; -import com.yizhuan.xchat_android_core.msg.sysv2.ErbanSysMsgV2Layout; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.R; +import com.mango.moshen.sys.ErbanSysMsgViewModel; +import com.mango.moshen.ui.im.RouterHandler; +import com.mango.core.im.custom.bean.SysMsgV2Attachment; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.msg.sys.ApproveMsgInfo; +import com.mango.core.msg.sysv2.ErbanSysMsgV2Component; +import com.mango.core.msg.sysv2.ErbanSysMsgV2Info; +import com.mango.core.msg.sysv2.ErbanSysMsgV2Layout; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.SizeUtils; import java.util.List; import java.util.Objects; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG_V2; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_V2_APPROVAL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_V2_TEXT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG_V2; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_V2_APPROVAL; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_V2_TEXT; /** * Created by lvzebiao on 2020/3/28. diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/SysMsgViewHolder.java b/app/src/main/java/com/mango/moshen/ui/im/chat/SysMsgViewHolder.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/im/chat/SysMsgViewHolder.java rename to app/src/main/java/com/mango/moshen/ui/im/chat/SysMsgViewHolder.java index 2b575f8b0..7b66cd955 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/SysMsgViewHolder.java +++ b/app/src/main/java/com/mango/moshen/ui/im/chat/SysMsgViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.chat; +package com.mango.moshen.ui.im.chat; import android.graphics.Color; import androidx.core.content.ContextCompat; @@ -19,29 +19,29 @@ import com.alibaba.fastjson.JSON; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.erban.R; -import com.yizhuan.erban.miniworld.activity.MiniWorldGuestPageActivity; -import com.yizhuan.erban.sys.ErbanSysMsgViewModel; -import com.yizhuan.erban.ui.im.RouterHandler; -import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.msg.sys.ApproveMsgInfo; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgComponent; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgInfo; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgLayout; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.R; +import com.mango.moshen.miniworld.activity.MiniWorldGuestPageActivity; +import com.mango.moshen.sys.ErbanSysMsgViewModel; +import com.mango.moshen.ui.im.RouterHandler; +import com.mango.core.im.custom.bean.SysMsgAttachment; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.msg.sys.ApproveMsgInfo; +import com.mango.core.msg.sys.ErbanSysMsgComponent; +import com.mango.core.msg.sys.ErbanSysMsgInfo; +import com.mango.core.msg.sys.ErbanSysMsgLayout; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.SizeUtils; import java.util.List; import java.util.Map; import java.util.Objects; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEAD_SHIFT_OUT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_APPROVAL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_TEXT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEAD_SHIFT_OUT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_APPROVAL; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_TEXT; /** * Created by MadisonRong on 17/06/2018. diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java b/app/src/main/java/com/mango/moshen/ui/im/fragment/MessageFragment.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java rename to app/src/main/java/com/mango/moshen/ui/im/fragment/MessageFragment.java index 33216f902..5c2fb0294 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/im/fragment/MessageFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.fragment; +package com.mango.moshen.ui.im.fragment; import android.Manifest; import android.annotation.SuppressLint; @@ -51,25 +51,25 @@ import com.netease.nimlib.sdk.robot.model.NimRobotInfo; import com.netease.nimlib.sdk.robot.model.RobotAttachment; import com.netease.nimlib.sdk.robot.model.RobotMsgType; import com.tbruyelle.rxpermissions2.RxPermissions; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.erban.ui.im.GreetPresenter; -import com.yizhuan.erban.ui.im.MessageListPanelEx; -import com.yizhuan.erban.ui.im.chat.MVHChatterBoxStart; -import com.yizhuan.erban.ui.im.model.IMCustomModel; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.utils.PushMessageHandler; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.chatterbox.ChatterBoxHelper; -import com.yizhuan.xchat_android_core.im.chatterbox.HideInputEvent; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ImTipAttachment; -import com.yizhuan.xchat_android_core.room.event.MessageSizeEvent; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.OriginalDrawStatusClickSpan; +import com.mango.moshen.ui.im.GreetPresenter; +import com.mango.moshen.ui.im.MessageListPanelEx; +import com.mango.moshen.ui.im.chat.MVHChatterBoxStart; +import com.mango.moshen.ui.im.model.IMCustomModel; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.utils.PushMessageHandler; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.im.chatterbox.ChatterBoxHelper; +import com.mango.core.im.chatterbox.HideInputEvent; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.ImTipAttachment; +import com.mango.core.room.event.MessageSizeEvent; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.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/ui/im/friend/ActFriendList.java b/app/src/main/java/com/mango/moshen/ui/im/friend/ActFriendList.java similarity index 72% rename from app/src/main/java/com/yizhuan/erban/ui/im/friend/ActFriendList.java rename to app/src/main/java/com/mango/moshen/ui/im/friend/ActFriendList.java index 7c41c30b1..e919c4252 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/friend/ActFriendList.java +++ b/app/src/main/java/com/mango/moshen/ui/im/friend/ActFriendList.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.friend; +package com.mango.moshen.ui.im.friend; import android.content.Context; import android.content.Intent; @@ -6,12 +6,12 @@ import android.os.Bundle; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.home.fragment.ContactsListFragment; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.home.fragment.ContactsListFragment; +import com.mango.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.factory.CreatePresenter; @CreatePresenter(BaseMvpPresenter.class) public class ActFriendList extends BaseMvpActivity> implements IMvpBaseView{ diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt b/app/src/main/java/com/mango/moshen/ui/im/friend/FriendFragmentCpDelegate.kt similarity index 83% rename from app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt rename to app/src/main/java/com/mango/moshen/ui/im/friend/FriendFragmentCpDelegate.kt index 56b3dbcc6..9cf30c135 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt +++ b/app/src/main/java/com/mango/moshen/ui/im/friend/FriendFragmentCpDelegate.kt @@ -1,16 +1,16 @@ -package com.yizhuan.erban.ui.im.friend +package com.mango.moshen.ui.im.friend import android.text.TextUtils import androidx.fragment.app.viewModels -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseFragment -import com.yizhuan.erban.common.widget.dialog.DialogManager -import com.yizhuan.erban.relation.cp.CpViewHelper -import com.yizhuan.erban.relation.cp.dialog.CpInvitePageDialog -import com.yizhuan.erban.relation.cp.viewmodel.CpViewModel -import com.yizhuan.erban.ui.pay.ChargeActivity -import com.yizhuan.xchat_android_core.relation.cp.CpInvitePageEntity -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.R +import com.mango.moshen.base.BaseFragment +import com.mango.moshen.common.widget.dialog.DialogManager +import com.mango.moshen.relation.cp.CpViewHelper +import com.mango.moshen.relation.cp.dialog.CpInvitePageDialog +import com.mango.moshen.relation.cp.viewmodel.CpViewModel +import com.mango.moshen.ui.pay.ChargeActivity +import com.mango.core.relation.cp.CpInvitePageEntity +import com.mango.core.utils.toast class FriendFragmentCpDelegate(private val fragment: BaseFragment) { private val cpViewModel: CpViewModel by fragment.viewModels() diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java b/app/src/main/java/com/mango/moshen/ui/im/friend/FriendListAdapter.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java rename to app/src/main/java/com/mango/moshen/ui/im/friend/FriendListAdapter.java index 64336fb2e..c737c4e38 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/im/friend/FriendListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.friend; +package com.mango.moshen.ui.im.friend; import android.app.Activity; @@ -11,19 +11,17 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.NobleAvatarView; -import com.yizhuan.erban.vip.VipHelper; -import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; - -import lombok.val; +import com.mango.moshen.R; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.ui.im.avtivity.NimP2PMessageActivity; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.NobleAvatarView; +import com.mango.moshen.vip.VipHelper; +import com.mango.moshen.room_chat.activity.NimRoomP2PMessageActivity; +import com.mango.core.noble.NobleUtil; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.StringExtensionKt; /** * @author chenran diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListFragment.java b/app/src/main/java/com/mango/moshen/ui/im/friend/FriendListFragment.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListFragment.java rename to app/src/main/java/com/mango/moshen/ui/im/friend/FriendListFragment.java index 2c101909f..66576773c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/im/friend/FriendListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.friend; +package com.mango.moshen.ui.im.friend; import android.annotation.SuppressLint; import android.app.Activity; @@ -12,20 +12,20 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.orhanobut.logger.Logger; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.decoration.helper.DecorationHelper; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RelationShipEvent; -import com.yizhuan.xchat_android_core.relation.cp.CpBindUnbindEvent; -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.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.decoration.helper.DecorationHelper; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.friend.view.SelectFriendActivity; +import com.mango.core.im.friend.IMFriendModel; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RelationShipEvent; +import com.mango.core.relation.cp.CpBindUnbindEvent; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -41,7 +41,7 @@ import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; import io.reactivex.functions.Function; -import static com.yizhuan.xchat_android_core.Constants.IS_SEND; +import static com.mango.core.Constants.IS_SEND; /** * @description: 好友列表界面 diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListFragmentKotlin.kt b/app/src/main/java/com/mango/moshen/ui/im/friend/FriendListFragmentKotlin.kt similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListFragmentKotlin.kt rename to app/src/main/java/com/mango/moshen/ui/im/friend/FriendListFragmentKotlin.kt index cc8cd7a27..444e68f72 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListFragmentKotlin.kt +++ b/app/src/main/java/com/mango/moshen/ui/im/friend/FriendListFragmentKotlin.kt @@ -1,19 +1,19 @@ -//package com.yizhuan.erban.ui.im.friend +//package com.mango.moshen.ui.im.friend // //import android.app.Activity //import android.os.Bundle //import android.support.v7.widget.LinearLayoutManager -//import com.yizhuan.erban.R -//import com.yizhuan.erban.base.BaseFragment -//import com.yizhuan.erban.friend.action.AbstractSelectFriendAction -//import com.yizhuan.erban.friend.view.SelectFriendActivity -//import com.yizhuan.xchat_android_core.Constants.IS_SEND -//import com.yizhuan.xchat_android_core.im.friend.IMFriendModel -//import com.yizhuan.xchat_android_core.manager.IMNetEaseManager -//import com.yizhuan.xchat_android_core.manager.RelationShipEvent -//import com.yizhuan.xchat_android_core.user.UserModel -//import com.yizhuan.xchat_android_core.user.bean.UserInfo -//import com.yizhuan.xchat_android_library.utils.ListUtils +//import com.mango.moshen.R +//import com.mango.moshen.base.BaseFragment +//import com.mango.moshen.friend.action.AbstractSelectFriendAction +//import com.mango.moshen.friend.view.SelectFriendActivity +//import com.moshen.core.Constants.IS_SEND +//import com.moshen.core.im.friend.IMFriendModel +//import com.moshen.core.manager.IMNetEaseManager +//import com.moshen.core.manager.RelationShipEvent +//import com.moshen.core.user.UserModel +//import com.moshen.core.user.bean.UserInfo +//import com.moshen.xchat_android_library.utils.ListUtils //import kotlinx.android.synthetic.main.fragment_fans_list.* //import org.greenrobot.eventbus.EventBus //import org.greenrobot.eventbus.Subscribe diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/model/IMCustomModel.java b/app/src/main/java/com/mango/moshen/ui/im/model/IMCustomModel.java similarity index 75% rename from app/src/main/java/com/yizhuan/erban/ui/im/model/IMCustomModel.java rename to app/src/main/java/com/mango/moshen/ui/im/model/IMCustomModel.java index 52e046885..ccd92ae01 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/model/IMCustomModel.java +++ b/app/src/main/java/com/mango/moshen/ui/im/model/IMCustomModel.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.ui.im.model; +package com.mango.moshen.ui.im.model; -import com.yizhuan.xchat_android_core.bean.PrivateChatLimitInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.BaseMvpModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.bean.PrivateChatLimitInfo; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.manager.BaseMvpModel; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import retrofit2.http.GET; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java b/app/src/main/java/com/mango/moshen/ui/im/recent/RecentContactsFragment.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java rename to app/src/main/java/com/mango/moshen/ui/im/recent/RecentContactsFragment.java index dc98bf0ad..61ee6056d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/im/recent/RecentContactsFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.recent; +package com.mango.moshen.ui.im.recent; import android.os.Bundle; import android.text.TextUtils; @@ -34,19 +34,18 @@ import com.netease.nimlib.sdk.RequestCallbackWrapper; import com.netease.nimlib.sdk.ResponseCode; import com.netease.nimlib.sdk.msg.MsgService; import com.netease.nimlib.sdk.msg.MsgServiceObserve; -import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.team.model.TeamMember; -import com.yizhuan.erban.R; -import com.yizhuan.erban.home.event.ContactTrashEvent; -import com.yizhuan.erban.ui.im.recent.adapter.RecentContactAdapter; -import com.yizhuan.xchat_android_core.utils.CheckUtils; -import com.yizhuan.xchat_android_core.utils.SystemUidUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.home.event.ContactTrashEvent; +import com.mango.moshen.ui.im.recent.adapter.RecentContactAdapter; +import com.mango.core.utils.CheckUtils; +import com.mango.core.utils.SystemUidUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentListFragment.java b/app/src/main/java/com/mango/moshen/ui/im/recent/RecentListFragment.java similarity index 73% rename from app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentListFragment.java rename to app/src/main/java/com/mango/moshen/ui/im/recent/RecentListFragment.java index de5de00b2..be88a6541 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentListFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/im/recent/RecentListFragment.java @@ -1,14 +1,12 @@ -package com.yizhuan.erban.ui.im.recent; +package com.mango.moshen.ui.im.recent; import android.annotation.SuppressLint; -import android.content.Intent; import android.os.Bundle; import androidx.annotation.Nullable; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.OrientationHelper; import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; @@ -21,65 +19,45 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.google.gson.Gson; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.business.recent.RecentContactsCallback; -import com.netease.nimlib.sdk.msg.attachment.AudioAttachment; -import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; import com.netease.nimlib.sdk.team.model.Team; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.miniworld.activity.MWTeamRoomMessageAct; -import com.yizhuan.erban.miniworld.activity.MiniWorldTeamMessageActivity; -import com.yizhuan.erban.module_hall.im.NimHelper; -import com.yizhuan.erban.module_hall.team.activity.HallTeamMessageActivity; -import com.yizhuan.erban.team.view.NimTeamMessageActivity; -import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.erban.ui.im.recent.adapter.AttentionInRoomAdapter; -import com.yizhuan.erban.ui.relation.AttentionListActivity; -import com.yizhuan.erban.ui.widget.RecallDialog; -import com.yizhuan.tutu.mentoring_relationship.adapter.GrabApprenticesAdapter; -import com.yizhuan.tutu.room_chat.activity.NimHallTeamRoomMessageActivity; -import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; -import com.yizhuan.tutu.room_chat.activity.NimTeamRoomMessageActivity; -import com.yizhuan.tutu.room_chat.activity.RoomNewbieActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment; -import com.yizhuan.xchat_android_core.im.RefreshInRoomListEvent; -import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarveUpGoldThirdLevelAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatHintAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NoticeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgVoiceAttachment; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.GrabApprenticesInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.GrabApprenticesDataEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.model.MentoringRelationshipModel; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitMeAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitMeInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.bean.AttentionItem; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -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.BeanObserver; -import com.yizhuan.xchat_android_library.utils.CommonUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.miniworld.activity.MWTeamRoomMessageAct; +import com.mango.moshen.miniworld.activity.MiniWorldTeamMessageActivity; +import com.mango.moshen.module_hall.im.NimHelper; +import com.mango.moshen.module_hall.team.activity.HallTeamMessageActivity; +import com.mango.moshen.team.view.NimTeamMessageActivity; +import com.mango.moshen.ui.im.avtivity.NimP2PMessageActivity; +import com.mango.moshen.ui.im.recent.adapter.AttentionInRoomAdapter; +import com.mango.moshen.ui.relation.AttentionListActivity; +import com.mango.moshen.mentoring_relationship.adapter.GrabApprenticesAdapter; +import com.mango.moshen.room_chat.activity.NimHallTeamRoomMessageActivity; +import com.mango.moshen.room_chat.activity.NimRoomP2PMessageActivity; +import com.mango.moshen.room_chat.activity.NimTeamRoomMessageActivity; +import com.mango.moshen.room_chat.activity.RoomNewbieActivity; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.event.LoginEvent; +import com.mango.core.im.RefreshInRoomListEvent; +import com.mango.core.initial.InitialModel; +import com.mango.core.level.UserLevelVo; +import com.mango.core.mentoring_relationship.bean.GrabApprenticesInfo; +import com.mango.core.mentoring_relationship.event.GrabApprenticesDataEvent; +import com.mango.core.mentoring_relationship.model.MentoringRelationshipModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.AttentionModel; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.AttentionInfo; +import com.mango.core.user.bean.AttentionItem; +import com.mango.core.user.event.LoadLoginUserInfoEvent; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.utils.CommonUtils; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -88,36 +66,9 @@ import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Objects; import io.reactivex.Single; import io.reactivex.functions.BiConsumer; -import io.reactivex.functions.Consumer; - -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_IM_GAME; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUSH_NOTIFIFICATION; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY; /** * 最近聊天列表 diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/TeamExt.java b/app/src/main/java/com/mango/moshen/ui/im/recent/TeamExt.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/im/recent/TeamExt.java rename to app/src/main/java/com/mango/moshen/ui/im/recent/TeamExt.java index ac750f479..8b68ca0a1 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/TeamExt.java +++ b/app/src/main/java/com/mango/moshen/ui/im/recent/TeamExt.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.recent; +package com.mango.moshen.ui.im.recent; import java.io.Serializable; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/adapter/AttentionInRoomAdapter.java b/app/src/main/java/com/mango/moshen/ui/im/recent/adapter/AttentionInRoomAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/ui/im/recent/adapter/AttentionInRoomAdapter.java rename to app/src/main/java/com/mango/moshen/ui/im/recent/adapter/AttentionInRoomAdapter.java index 08f11f42a..ab63816ec 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/adapter/AttentionInRoomAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/im/recent/adapter/AttentionInRoomAdapter.java @@ -1,15 +1,13 @@ -package com.yizhuan.erban.ui.im.recent.adapter; - -import android.graphics.Color; +package com.mango.moshen.ui.im.recent.adapter; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.bean.AttentionItem; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.user.bean.AttentionInfo; +import com.mango.core.user.bean.AttentionItem; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/adapter/RecentContactAdapter.java b/app/src/main/java/com/mango/moshen/ui/im/recent/adapter/RecentContactAdapter.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/im/recent/adapter/RecentContactAdapter.java rename to app/src/main/java/com/mango/moshen/ui/im/recent/adapter/RecentContactAdapter.java index 2fb165113..d1765fa1f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/adapter/RecentContactAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/im/recent/adapter/RecentContactAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.recent.adapter; +package com.mango.moshen.ui.im.recent.adapter; import androidx.recyclerview.widget.RecyclerView; @@ -7,9 +7,9 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemQuickAd import com.netease.nim.uikit.common.ui.recyclerview.holder.BaseViewHolder; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.im.recent.holder.CommonRecentViewHolder; -import com.yizhuan.erban.ui.im.recent.holder.TeamRecentViewHolder; +import com.mango.moshen.R; +import com.mango.moshen.ui.im.recent.holder.CommonRecentViewHolder; +import com.mango.moshen.ui.im.recent.holder.TeamRecentViewHolder; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java b/app/src/main/java/com/mango/moshen/ui/im/recent/holder/CommonRecentViewHolder.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java rename to app/src/main/java/com/mango/moshen/ui/im/recent/holder/CommonRecentViewHolder.java index f39a94d47..0050bef87 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java +++ b/app/src/main/java/com/mango/moshen/ui/im/recent/holder/CommonRecentViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.recent.holder; +package com.mango.moshen.ui.im.recent.holder; import android.annotation.SuppressLint; import android.graphics.drawable.AnimationDrawable; @@ -14,14 +14,12 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseQuickAdapter; import com.netease.nim.uikit.common.ui.recyclerview.holder.BaseViewHolder; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.vip.VipHelper; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.SystemUidUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.vip.VipHelper; +import com.mango.core.level.UserLevelVo; +import com.mango.core.user.UserModel; +import com.mango.core.utils.SystemUidUtil; import static android.view.View.GONE; import static android.view.View.INVISIBLE; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/RecentViewHolder.java b/app/src/main/java/com/mango/moshen/ui/im/recent/holder/RecentViewHolder.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/RecentViewHolder.java rename to app/src/main/java/com/mango/moshen/ui/im/recent/holder/RecentViewHolder.java index 3bddea938..f1643aee2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/RecentViewHolder.java +++ b/app/src/main/java/com/mango/moshen/ui/im/recent/holder/RecentViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.recent.holder; +package com.mango.moshen.ui.im.recent.holder; import static android.view.View.GONE; import static android.view.View.VISIBLE; @@ -23,10 +23,10 @@ import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; import com.netease.nimlib.sdk.team.model.Team; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.im.recent.RecentContactsFragment; -import com.yizhuan.erban.ui.im.recent.adapter.RecentContactAdapter; -import com.yizhuan.xchat_android_core.helper.ImHelperUtils; +import com.mango.moshen.R; +import com.mango.moshen.ui.im.recent.RecentContactsFragment; +import com.mango.moshen.ui.im.recent.adapter.RecentContactAdapter; +import com.mango.core.helper.ImHelperUtils; public abstract class RecentViewHolder extends RecyclerViewHolder { diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/TeamRecentViewHolder.java b/app/src/main/java/com/mango/moshen/ui/im/recent/holder/TeamRecentViewHolder.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/TeamRecentViewHolder.java rename to app/src/main/java/com/mango/moshen/ui/im/recent/holder/TeamRecentViewHolder.java index af0071da2..cf75445ec 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/TeamRecentViewHolder.java +++ b/app/src/main/java/com/mango/moshen/ui/im/recent/holder/TeamRecentViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.im.recent.holder; +package com.mango.moshen.ui.im.recent.holder; import android.graphics.drawable.AnimationDrawable; import android.os.Handler; @@ -12,7 +12,6 @@ import com.netease.nim.uikit.business.recent.TeamMemberAitHelper; import com.netease.nim.uikit.business.team.helper.TeamHelper; import com.netease.nim.uikit.common.ui.draggablebubbles.BubbleMessageTouchListener; import com.netease.nim.uikit.common.ui.draggablebubbles.MessageBubbleView; -import com.netease.nim.uikit.common.ui.drop.DropFake; import com.netease.nim.uikit.common.ui.drop.DropManager; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseQuickAdapter; import com.netease.nim.uikit.common.ui.recyclerview.holder.BaseViewHolder; @@ -24,11 +23,10 @@ import com.netease.nimlib.sdk.msg.model.RecentContact; import com.netease.nimlib.sdk.team.TeamService; import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum; import com.netease.nimlib.sdk.team.model.Team; -import com.trello.rxlifecycle3.LifecycleProvider; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.im.recent.TeamExt; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.mango.moshen.R; +import com.mango.moshen.ui.im.recent.TeamExt; +import com.mango.core.im.custom.bean.LuckyMoneyAttachment; +import com.mango.core.im.custom.bean.LuckyMoneyTipsAttachment; import static android.view.View.GONE; import static android.view.View.VISIBLE; diff --git a/app/src/main/java/com/yizhuan/erban/ui/indicator_impl/IndicatorHelper.java b/app/src/main/java/com/mango/moshen/ui/indicator_impl/IndicatorHelper.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/ui/indicator_impl/IndicatorHelper.java rename to app/src/main/java/com/mango/moshen/ui/indicator_impl/IndicatorHelper.java index 7097ae839..dc9970385 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/indicator_impl/IndicatorHelper.java +++ b/app/src/main/java/com/mango/moshen/ui/indicator_impl/IndicatorHelper.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.ui.indicator_impl; +package com.mango.moshen.ui.indicator_impl; import android.content.Context; import androidx.viewpager.widget.ViewPager; import android.widget.LinearLayout; -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.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/indicator_impl/JustColorIndicatorAdapter.java b/app/src/main/java/com/mango/moshen/ui/indicator_impl/JustColorIndicatorAdapter.java similarity index 81% rename from app/src/main/java/com/yizhuan/erban/ui/indicator_impl/JustColorIndicatorAdapter.java rename to app/src/main/java/com/mango/moshen/ui/indicator_impl/JustColorIndicatorAdapter.java index 06255fbea..4c23d5451 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/indicator_impl/JustColorIndicatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/indicator_impl/JustColorIndicatorAdapter.java @@ -1,17 +1,17 @@ -package com.yizhuan.erban.ui.indicator_impl; +package com.mango.moshen.ui.indicator_impl; import android.content.Context; import androidx.core.content.ContextCompat; 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.mango.moshen.R; +import com.mango.moshen.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/indicator_impl/OnItemSelectListener.java b/app/src/main/java/com/mango/moshen/ui/indicator_impl/OnItemSelectListener.java similarity index 79% rename from app/src/main/java/com/yizhuan/erban/ui/indicator_impl/OnItemSelectListener.java rename to app/src/main/java/com/mango/moshen/ui/indicator_impl/OnItemSelectListener.java index e8894f5d7..00a14eacc 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/indicator_impl/OnItemSelectListener.java +++ b/app/src/main/java/com/mango/moshen/ui/indicator_impl/OnItemSelectListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.indicator_impl; +package com.mango.moshen.ui.indicator_impl; import android.widget.TextView; diff --git a/app/src/main/java/com/yizhuan/erban/ui/keepalive/OnePiexlActivity.java b/app/src/main/java/com/mango/moshen/ui/keepalive/OnePiexlActivity.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/keepalive/OnePiexlActivity.java rename to app/src/main/java/com/mango/moshen/ui/keepalive/OnePiexlActivity.java index e0e19b6fb..a22ed0405 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/keepalive/OnePiexlActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/keepalive/OnePiexlActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.keepalive; +package com.mango.moshen.ui.keepalive; import android.content.BroadcastReceiver; import android.content.Context; @@ -10,7 +10,7 @@ import android.view.Gravity; import android.view.Window; import android.view.WindowManager; -import com.yizhuan.erban.base.BaseActivity; +import com.mango.moshen.base.BaseActivity; /** * Created by chenran on 2017/11/16. diff --git a/app/src/main/java/com/yizhuan/erban/ui/list/BaseListAdapter.java b/app/src/main/java/com/mango/moshen/ui/list/BaseListAdapter.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/list/BaseListAdapter.java rename to app/src/main/java/com/mango/moshen/ui/list/BaseListAdapter.java index c9d8fb9de..41ed6be62 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/list/BaseListAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/list/BaseListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.list; +package com.mango.moshen.ui.list; import android.content.Context; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/AccountValidator.java b/app/src/main/java/com/mango/moshen/ui/login/AccountValidator.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/login/AccountValidator.java rename to app/src/main/java/com/mango/moshen/ui/login/AccountValidator.java index 3665476c3..0033d7d7d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/AccountValidator.java +++ b/app/src/main/java/com/mango/moshen/ui/login/AccountValidator.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.ui.login; +package com.mango.moshen.ui.login; import androidx.annotation.NonNull; import android.text.TextUtils; -import com.yizhuan.xchat_android_library.utils.StringUtils; -import com.yizhuan.xchat_android_library.utils.net.MobileNumberUtils; +import com.mango.xchat_android_library.utils.StringUtils; +import com.mango.xchat_android_library.utils.net.MobileNumberUtils; import java.util.regex.Pattern; diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java b/app/src/main/java/com/mango/moshen/ui/login/AddUserInfoActivity.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java rename to app/src/main/java/com/mango/moshen/ui/login/AddUserInfoActivity.java index d92af4382..9e8886f50 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/login/AddUserInfoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.login; +package com.mango.moshen.ui.login; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -6,9 +6,9 @@ import androidx.fragment.app.FragmentTransaction; import android.view.KeyEvent; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.ui.login.fragment.AddUserInfoFragment; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.ui.login.fragment.AddUserInfoFragment; /** * @author zhouxiangfeng diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/BindCodeActivity.java b/app/src/main/java/com/mango/moshen/ui/login/BindCodeActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/login/BindCodeActivity.java rename to app/src/main/java/com/mango/moshen/ui/login/BindCodeActivity.java index 385afe49d..a18cfa2b6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/BindCodeActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/login/BindCodeActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.login; +package com.mango.moshen.ui.login; import android.annotation.SuppressLint; import android.app.Activity; @@ -19,17 +19,17 @@ import androidx.core.content.ContextCompat; import com.coorchice.library.utils.LogUtils; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseLoginAct; -import com.yizhuan.erban.ui.login.ui.CodeEditText; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.exception.BanAccountException; -import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException; -import com.yizhuan.xchat_android_core.code.CodeType; -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.event.NeedCompleteInfoEvent; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseLoginAct; +import com.mango.moshen.ui.login.ui.CodeEditText; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.exception.BanAccountException; +import com.mango.core.auth.exception.IsSuperAdminException; +import com.mango.core.code.CodeType; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.user.event.NeedCompleteInfoEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/BindPhoneActivity.java b/app/src/main/java/com/mango/moshen/ui/login/BindPhoneActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/login/BindPhoneActivity.java rename to app/src/main/java/com/mango/moshen/ui/login/BindPhoneActivity.java index cc3f6bb86..75a7ae071 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/BindPhoneActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/login/BindPhoneActivity.java @@ -1,6 +1,5 @@ -package com.yizhuan.erban.ui.login; +package com.mango.moshen.ui.login; -import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -15,11 +14,11 @@ import android.widget.EditText; import android.widget.ImageView; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.ui.login.helper.LogoutHelper; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.ui.login.helper.LogoutHelper; +import com.mango.xchat_android_library.utils.NetworkUtils; +import com.mango.xchat_android_library.utils.TextWatcherWrapper; /** * 由于所有用户都需要强制绑定手机,所以理论上这里只有MainActivity会调用到这个界面 diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/BindSuccessDialog.java b/app/src/main/java/com/mango/moshen/ui/login/BindSuccessDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/login/BindSuccessDialog.java rename to app/src/main/java/com/mango/moshen/ui/login/BindSuccessDialog.java index 466665a43..4be732842 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/BindSuccessDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/login/BindSuccessDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.login; +package com.mango.moshen.ui.login; import android.os.Bundle; import androidx.annotation.NonNull; @@ -9,8 +9,8 @@ import android.view.View; import android.view.ViewGroup; import android.view.Window; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.SizeUtils; public class BindSuccessDialog extends DialogFragment implements View.OnClickListener { diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownDescTimer.java b/app/src/main/java/com/mango/moshen/ui/login/CodeDownDescTimer.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/login/CodeDownDescTimer.java rename to app/src/main/java/com/mango/moshen/ui/login/CodeDownDescTimer.java index 7c5628eb0..a92342abf 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownDescTimer.java +++ b/app/src/main/java/com/mango/moshen/ui/login/CodeDownDescTimer.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.login; +package com.mango.moshen.ui.login; import android.os.CountDownTimer; import android.text.Html; diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownTimer.java b/app/src/main/java/com/mango/moshen/ui/login/CodeDownTimer.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/login/CodeDownTimer.java rename to app/src/main/java/com/mango/moshen/ui/login/CodeDownTimer.java index 944d2f136..120e706aa 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownTimer.java +++ b/app/src/main/java/com/mango/moshen/ui/login/CodeDownTimer.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.login; +package com.mango.moshen.ui.login; import android.graphics.Color; import android.os.CountDownTimer; @@ -7,7 +7,7 @@ import android.text.SpannableString; import android.text.style.ForegroundColorSpan; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java b/app/src/main/java/com/mango/moshen/ui/login/LoginCodeActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java rename to app/src/main/java/com/mango/moshen/ui/login/LoginCodeActivity.java index ea29c6685..06e6cd196 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/login/LoginCodeActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.login; +package com.mango.moshen.ui.login; import android.annotation.SuppressLint; import android.app.Activity; @@ -20,17 +20,17 @@ import androidx.core.content.ContextCompat; import com.coorchice.library.utils.LogUtils; import com.netease.nim.uikit.StatusBarUtil; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseLoginAct; -import com.yizhuan.erban.ui.login.ui.CodeEditText; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.auth.exception.AccountCancelException; -import com.yizhuan.xchat_android_core.auth.exception.BanAccountException; -import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException; -import com.yizhuan.xchat_android_core.code.CodeType; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseLoginAct; +import com.mango.moshen.ui.login.ui.CodeEditText; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.event.LoginEvent; +import com.mango.core.auth.exception.AccountCancelException; +import com.mango.core.auth.exception.BanAccountException; +import com.mango.core.auth.exception.IsSuperAdminException; +import com.mango.core.code.CodeType; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java b/app/src/main/java/com/mango/moshen/ui/login/LoginPasswordActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java rename to app/src/main/java/com/mango/moshen/ui/login/LoginPasswordActivity.java index 2472ab4fa..02e21e9eb 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/login/LoginPasswordActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.login; +package com.mango.moshen.ui.login; import android.content.Context; import android.content.Intent; @@ -14,19 +14,17 @@ import android.widget.EditText; import androidx.core.content.ContextCompat; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseLoginAct; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.quick_pass.QuickPassLoginAct; -import com.yizhuan.erban.ui.setting.ResetPasswordActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.auth.exception.AccountCancelException; -import com.yizhuan.xchat_android_core.auth.exception.BanAccountException; -import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseLoginAct; +import com.mango.moshen.ui.setting.ResetPasswordActivity; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.event.LoginEvent; +import com.mango.core.auth.exception.AccountCancelException; +import com.mango.core.auth.exception.BanAccountException; +import com.mango.core.auth.exception.IsSuperAdminException; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.utils.TextWatcherWrapper; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginPhoneActivity.java b/app/src/main/java/com/mango/moshen/ui/login/LoginPhoneActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/login/LoginPhoneActivity.java rename to app/src/main/java/com/mango/moshen/ui/login/LoginPhoneActivity.java index b4be8ad54..3c66e0267 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginPhoneActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/login/LoginPhoneActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.login; +package com.mango.moshen.ui.login; import android.app.Activity; import android.content.Context; @@ -15,11 +15,11 @@ import android.widget.EditText; import android.widget.ImageView; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.core.auth.event.LoginEvent; +import com.mango.xchat_android_library.utils.NetworkUtils; +import com.mango.xchat_android_library.utils.TextWatcherWrapper; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/ModifyInfoActivity.java b/app/src/main/java/com/mango/moshen/ui/login/ModifyInfoActivity.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/login/ModifyInfoActivity.java rename to app/src/main/java/com/mango/moshen/ui/login/ModifyInfoActivity.java index eb7622b94..c2ff5723c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/ModifyInfoActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/login/ModifyInfoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.login; +package com.mango.moshen.ui.login; import android.content.Intent; import android.os.Bundle; @@ -17,11 +17,11 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; /** * Created by zhouxiangfeng on 2017/5/13. diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/PasswordValidator.java b/app/src/main/java/com/mango/moshen/ui/login/PasswordValidator.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/login/PasswordValidator.java rename to app/src/main/java/com/mango/moshen/ui/login/PasswordValidator.java index d1cda034c..94a36c0a2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/PasswordValidator.java +++ b/app/src/main/java/com/mango/moshen/ui/login/PasswordValidator.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.login; +package com.mango.moshen.ui.login; import android.text.TextUtils; diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/ShowBindPhoneActivity.java b/app/src/main/java/com/mango/moshen/ui/login/ShowBindPhoneActivity.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/ui/login/ShowBindPhoneActivity.java rename to app/src/main/java/com/mango/moshen/ui/login/ShowBindPhoneActivity.java index e28895a08..f16d27356 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/ShowBindPhoneActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/login/ShowBindPhoneActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.login; +package com.mango.moshen.ui.login; import android.content.Context; import android.content.Intent; @@ -7,11 +7,11 @@ import android.text.TextUtils; import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.ui.setting.VerifyPhoneActivity; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.ui.setting.VerifyPhoneActivity; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; public class ShowBindPhoneActivity extends BaseActivity { diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/mango/moshen/ui/login/fragment/AddUserInfoFragment.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java rename to app/src/main/java/com/mango/moshen/ui/login/fragment/AddUserInfoFragment.java index 51cd60aa7..90cb16dd5 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/login/fragment/AddUserInfoFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.login.fragment; +package com.mango.moshen.ui.login.fragment; import android.os.Bundle; import android.text.InputFilter; @@ -14,21 +14,20 @@ import com.google.android.material.textfield.TextInputEditText; import com.sleepbot.datetimepicker.time.RadialPickerLayout; import com.sleepbot.datetimepicker.time.TimePickerDialog; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.entity.ThirdUserInfo; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.linked.LinkedModel; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -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.mango.moshen.R; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.entity.ThirdUserInfo; +import com.mango.core.initial.InitialModel; +import com.mango.core.initial.bean.InitInfo; +import com.mango.core.linked.LinkedModel; +import com.mango.core.linked.bean.LinkedInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.DontWarnObserver; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java b/app/src/main/java/com/mango/moshen/ui/login/helper/LogoutHelper.java similarity index 57% rename from app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java rename to app/src/main/java/com/mango/moshen/ui/login/helper/LogoutHelper.java index cbda8a319..3b3803505 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java +++ b/app/src/main/java/com/mango/moshen/ui/login/helper/LogoutHelper.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.ui.login.helper; +package com.mango.moshen.ui.login.helper; -import com.yizhuan.xchat_android_core.PreferencesUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; +import com.mango.core.PreferencesUtils; +import com.mango.core.auth.AuthModel; /** * create by lvzebiao @2019/12/9 diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/ui/CodeEditText.java b/app/src/main/java/com/mango/moshen/ui/login/ui/CodeEditText.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/login/ui/CodeEditText.java rename to app/src/main/java/com/mango/moshen/ui/login/ui/CodeEditText.java index 72acea681..51e1dc258 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/ui/CodeEditText.java +++ b/app/src/main/java/com/mango/moshen/ui/login/ui/CodeEditText.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.login.ui; +package com.mango.moshen.ui.login.ui; import android.content.Context; import android.content.res.TypedArray; @@ -11,7 +11,7 @@ import android.text.TextPaint; import android.util.AttributeSet; import android.view.inputmethod.InputMethodManager; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * 验证码输入框,重写EditText的绘制方法实现。 diff --git a/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchModeActivity.java b/app/src/main/java/com/mango/moshen/ui/patriarch/PatriarchModeActivity.java similarity index 75% rename from app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchModeActivity.java rename to app/src/main/java/com/mango/moshen/ui/patriarch/PatriarchModeActivity.java index df09e66b7..a7719036d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchModeActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/patriarch/PatriarchModeActivity.java @@ -1,19 +1,18 @@ -package com.yizhuan.erban.ui.patriarch; +package com.mango.moshen.ui.patriarch; import android.content.Context; import android.content.Intent; import android.graphics.Paint; -import android.os.Bundle; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.databinding.ActivityPatriarchModeBinding; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.databinding.ActivityPatriarchModeBinding; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.core.UriProvider; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.activity_patriarch_mode) public class PatriarchModeActivity extends BaseBindingActivity { diff --git a/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchModeDialog.java b/app/src/main/java/com/mango/moshen/ui/patriarch/PatriarchModeDialog.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchModeDialog.java rename to app/src/main/java/com/mango/moshen/ui/patriarch/PatriarchModeDialog.java index 0025d11c7..1ebf9f8b6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchModeDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/patriarch/PatriarchModeDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.patriarch; +package com.mango.moshen.ui.patriarch; import android.content.Context; import android.content.Intent; @@ -12,9 +12,9 @@ import android.view.WindowManager; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseSdDialog; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseSdDialog; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java b/app/src/main/java/com/mango/moshen/ui/patriarch/PatriarchPwdActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java rename to app/src/main/java/com/mango/moshen/ui/patriarch/PatriarchPwdActivity.java index 87e88dbe2..473919a1b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/patriarch/PatriarchPwdActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.patriarch; +package com.mango.moshen.ui.patriarch; import android.annotation.SuppressLint; import android.text.Editable; @@ -9,12 +9,12 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.databinding.ActivityPatriarchPwdBinding; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.databinding.ActivityPatriarchPwdBinding; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.activity_patriarch_pwd) diff --git a/app/src/main/java/com/yizhuan/erban/ui/patriarch/help/LimitEnterRoomHelper.java b/app/src/main/java/com/mango/moshen/ui/patriarch/help/LimitEnterRoomHelper.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/ui/patriarch/help/LimitEnterRoomHelper.java rename to app/src/main/java/com/mango/moshen/ui/patriarch/help/LimitEnterRoomHelper.java index 1c467add8..55e997af2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/patriarch/help/LimitEnterRoomHelper.java +++ b/app/src/main/java/com/mango/moshen/ui/patriarch/help/LimitEnterRoomHelper.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.ui.patriarch.help; +package com.mango.moshen.ui.patriarch.help; import android.app.Dialog; import android.content.Context; import android.text.TextUtils; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.utils.ActivityUtil; /** * 进房限制的一些处理，因为main和avroom 基本一样，所以写一起减少冗余 diff --git a/app/src/main/java/com/yizhuan/erban/ui/patriarch/help/PmDialogShowMrg.java b/app/src/main/java/com/mango/moshen/ui/patriarch/help/PmDialogShowMrg.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/ui/patriarch/help/PmDialogShowMrg.java rename to app/src/main/java/com/mango/moshen/ui/patriarch/help/PmDialogShowMrg.java index 737fa2b25..2d43a469a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/patriarch/help/PmDialogShowMrg.java +++ b/app/src/main/java/com/mango/moshen/ui/patriarch/help/PmDialogShowMrg.java @@ -1,20 +1,20 @@ -package com.yizhuan.erban.ui.patriarch.help; +package com.mango.moshen.ui.patriarch.help; import android.content.Context; import android.text.TextUtils; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.erban.ui.patriarch.PatriarchModeDialog; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.ui.patriarch.PatriarchModeDialog; +import com.mango.core.auth.AuthModel; +import com.mango.core.initial.InitialModel; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.ActivityUtil; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.TimeUtils; import java.lang.ref.WeakReference; import java.util.HashMap; diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java b/app/src/main/java/com/mango/moshen/ui/pay/ChargeActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java rename to app/src/main/java/com/mango/moshen/ui/pay/ChargeActivity.java index 83b92dbe9..5f7a24d87 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/pay/ChargeActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.pay; +package com.mango.moshen.ui.pay; import android.content.Context; import android.content.Intent; @@ -13,36 +13,36 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bank_card.activity.AddBankCardAgreementActivity; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.setting.ModifyPwdActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.password.PassWordFragment; -import com.yizhuan.erban.ui.widget.password.PasswordEvent; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.ChargeListResult; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.PaymentActivity; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; -import com.yizhuan.xchat_android_core.pay.bean.PaymentResult; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.pay.bean.unionpay.UnionPayOrder; -import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent; -import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent; -import com.yizhuan.xchat_android_core.pay.model.unionpay.UnionPayModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.CheckUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.web.event.WebViewRefreshEvent; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.bank_card.activity.AddBankCardAgreementActivity; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.ui.setting.ModifyPwdActivity; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.ui.widget.password.PassWordFragment; +import com.mango.moshen.ui.widget.password.PasswordEvent; +import com.mango.core.Constants; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.bean.response.result.ChargeListResult; +import com.mango.core.pay.PayModel; +import com.mango.core.pay.PaymentActivity; +import com.mango.core.pay.bean.ChargeBean; +import com.mango.core.pay.bean.PaymentResult; +import com.mango.core.pay.bean.WalletInfo; +import com.mango.core.pay.bean.unionpay.UnionPayOrder; +import com.mango.core.pay.event.GetWalletInfoEvent; +import com.mango.core.pay.event.UpdateWalletInfoEvent; +import com.mango.core.pay.model.unionpay.UnionPayModel; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.CheckUtils; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.web.event.WebViewRefreshEvent; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeAdapter.java b/app/src/main/java/com/mango/moshen/ui/pay/ChargeAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/pay/ChargeAdapter.java rename to app/src/main/java/com/mango/moshen/ui/pay/ChargeAdapter.java index e73868ba7..57b65c771 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/pay/ChargeAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.pay; +package com.mango.moshen.ui.pay; import android.text.TextUtils; import android.widget.LinearLayout; @@ -8,8 +8,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; +import com.mango.moshen.R; +import com.mango.core.pay.bean.ChargeBean; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeDialog.java b/app/src/main/java/com/mango/moshen/ui/pay/ChargeDialog.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/pay/ChargeDialog.java rename to app/src/main/java/com/mango/moshen/ui/pay/ChargeDialog.java index f60bf4396..586cf6b58 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/pay/ChargeDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.pay; +package com.mango.moshen.ui.pay; import android.content.Context; import android.content.Intent; @@ -16,36 +16,35 @@ import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bank_card.activity.AddBankCardAgreementActivity; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.setting.ModifyPwdActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.password.PassWordFragment; -import com.yizhuan.erban.ui.widget.password.PasswordEvent; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.ChargeListResult; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.PaymentActivity; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; -import com.yizhuan.xchat_android_core.pay.bean.PaymentResult; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.pay.bean.unionpay.UnionPayOrder; -import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent; -import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent; -import com.yizhuan.xchat_android_core.pay.model.unionpay.UnionPayModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.CheckUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.web.event.WebViewRefreshEvent; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.bank_card.activity.AddBankCardAgreementActivity; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.ui.setting.ModifyPwdActivity; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.ui.widget.password.PassWordFragment; +import com.mango.moshen.ui.widget.password.PasswordEvent; +import com.mango.core.Constants; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.bean.response.result.ChargeListResult; +import com.mango.core.pay.PayModel; +import com.mango.core.pay.PaymentActivity; +import com.mango.core.pay.bean.ChargeBean; +import com.mango.core.pay.bean.PaymentResult; +import com.mango.core.pay.bean.WalletInfo; +import com.mango.core.pay.bean.unionpay.UnionPayOrder; +import com.mango.core.pay.event.GetWalletInfoEvent; +import com.mango.core.pay.event.UpdateWalletInfoEvent; +import com.mango.core.pay.model.unionpay.UnionPayModel; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.CheckUtils; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.web.event.WebViewRefreshEvent; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ConfirmPaymentDialog.java b/app/src/main/java/com/mango/moshen/ui/pay/ConfirmPaymentDialog.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/pay/ConfirmPaymentDialog.java rename to app/src/main/java/com/mango/moshen/ui/pay/ConfirmPaymentDialog.java index 390a7fdf9..b5415c20e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/ConfirmPaymentDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/pay/ConfirmPaymentDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.pay; +package com.mango.moshen.ui.pay; import android.animation.ObjectAnimator; import android.app.Dialog; @@ -26,13 +26,13 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.pay.adapter.ConfirmPaymentSelectBankAdapter; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.bank_card.bean.BankCardBean; -import com.yizhuan.xchat_android_core.pay.model.unionpay.UnionPayModel; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.ui.pay.adapter.ConfirmPaymentSelectBankAdapter; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.bank_card.bean.BankCardBean; +import com.mango.core.pay.model.unionpay.UnionPayModel; +import com.mango.xchat_android_library.utils.ListUtils; import com.zyyoona7.lib.EasyPopup; import com.zyyoona7.lib.HorizontalGravity; import com.zyyoona7.lib.VerticalGravity; diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/adapter/ConfirmPaymentSelectBankAdapter.java b/app/src/main/java/com/mango/moshen/ui/pay/adapter/ConfirmPaymentSelectBankAdapter.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/ui/pay/adapter/ConfirmPaymentSelectBankAdapter.java rename to app/src/main/java/com/mango/moshen/ui/pay/adapter/ConfirmPaymentSelectBankAdapter.java index ad26a5cb3..b18cd5c7f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/adapter/ConfirmPaymentSelectBankAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/pay/adapter/ConfirmPaymentSelectBankAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.pay.adapter; +package com.mango.moshen.ui.pay.adapter; import androidx.annotation.Nullable; import android.text.TextUtils; @@ -7,9 +7,9 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bank_card.bean.BankCardBean; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.bank_card.bean.BankCardBean; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/BezierEvaluator.java b/app/src/main/java/com/mango/moshen/ui/praise/BezierEvaluator.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/praise/BezierEvaluator.java rename to app/src/main/java/com/mango/moshen/ui/praise/BezierEvaluator.java index 1ed4befaa..edb6f5e79 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/praise/BezierEvaluator.java +++ b/app/src/main/java/com/mango/moshen/ui/praise/BezierEvaluator.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.praise; +package com.mango.moshen.ui.praise; import android.animation.TypeEvaluator; import android.graphics.PointF; diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/HiPraise.java b/app/src/main/java/com/mango/moshen/ui/praise/HiPraise.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/ui/praise/HiPraise.java rename to app/src/main/java/com/mango/moshen/ui/praise/HiPraise.java index ee98a2b80..07edfb4ba 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/praise/HiPraise.java +++ b/app/src/main/java/com/mango/moshen/ui/praise/HiPraise.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.ui.praise; +package com.mango.moshen.ui.praise; import android.graphics.Bitmap; -import com.yizhuan.erban.ui.praise.base.IDrawable; -import com.yizhuan.erban.ui.praise.base.IPraise; +import com.mango.moshen.ui.praise.base.IDrawable; +import com.mango.moshen.ui.praise.base.IPraise; import java.util.Random; diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/HiPraiseAnimationView.java b/app/src/main/java/com/mango/moshen/ui/praise/HiPraiseAnimationView.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/praise/HiPraiseAnimationView.java rename to app/src/main/java/com/mango/moshen/ui/praise/HiPraiseAnimationView.java index 0cfbc3ef8..953a4d55d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/praise/HiPraiseAnimationView.java +++ b/app/src/main/java/com/mango/moshen/ui/praise/HiPraiseAnimationView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.praise; +package com.mango.moshen.ui.praise; import android.content.Context; import android.graphics.Canvas; @@ -11,10 +11,10 @@ import android.util.AttributeSet; import android.view.SurfaceHolder; import android.view.SurfaceView; -import com.yizhuan.erban.ui.praise.base.IDrawTask; -import com.yizhuan.erban.ui.praise.base.IDrawable; -import com.yizhuan.erban.ui.praise.base.IPraise; -import com.yizhuan.erban.ui.praise.base.IPraiseView; +import com.mango.moshen.ui.praise.base.IDrawTask; +import com.mango.moshen.ui.praise.base.IDrawable; +import com.mango.moshen.ui.praise.base.IPraise; +import com.mango.moshen.ui.praise.base.IPraiseView; public class HiPraiseAnimationView extends SurfaceView implements IPraiseView, SurfaceHolder.Callback { diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/HiPraiseWithCallback.java b/app/src/main/java/com/mango/moshen/ui/praise/HiPraiseWithCallback.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/ui/praise/HiPraiseWithCallback.java rename to app/src/main/java/com/mango/moshen/ui/praise/HiPraiseWithCallback.java index 065033e70..83dbbb9cf 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/praise/HiPraiseWithCallback.java +++ b/app/src/main/java/com/mango/moshen/ui/praise/HiPraiseWithCallback.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.ui.praise; +package com.mango.moshen.ui.praise; import android.graphics.Bitmap; -import com.yizhuan.erban.ui.praise.base.IDrawable; +import com.mango.moshen.ui.praise.base.IDrawable; public class HiPraiseWithCallback extends HiPraise { diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/OnDrawCallback.java b/app/src/main/java/com/mango/moshen/ui/praise/OnDrawCallback.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/ui/praise/OnDrawCallback.java rename to app/src/main/java/com/mango/moshen/ui/praise/OnDrawCallback.java index b5a517f5f..f9aa2acc7 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/praise/OnDrawCallback.java +++ b/app/src/main/java/com/mango/moshen/ui/praise/OnDrawCallback.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.praise; +package com.mango.moshen.ui.praise; /** * Created by apple on 16/10/20. diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/PraiseDrawable.java b/app/src/main/java/com/mango/moshen/ui/praise/PraiseDrawable.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/praise/PraiseDrawable.java rename to app/src/main/java/com/mango/moshen/ui/praise/PraiseDrawable.java index ed147e327..8d7f56458 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/praise/PraiseDrawable.java +++ b/app/src/main/java/com/mango/moshen/ui/praise/PraiseDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.praise; +package com.mango.moshen.ui.praise; import android.animation.FloatEvaluator; import android.animation.TimeInterpolator; @@ -13,7 +13,7 @@ import android.view.animation.DecelerateInterpolator; import android.view.animation.LinearInterpolator; -import com.yizhuan.erban.ui.praise.base.IDrawable; +import com.mango.moshen.ui.praise.base.IDrawable; import java.util.Random; diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/PraiseWithCallbackDrawable.java b/app/src/main/java/com/mango/moshen/ui/praise/PraiseWithCallbackDrawable.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/praise/PraiseWithCallbackDrawable.java rename to app/src/main/java/com/mango/moshen/ui/praise/PraiseWithCallbackDrawable.java index 8c2660b9a..dc29bf345 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/praise/PraiseWithCallbackDrawable.java +++ b/app/src/main/java/com/mango/moshen/ui/praise/PraiseWithCallbackDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.praise; +package com.mango.moshen.ui.praise; import android.graphics.Bitmap; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/SimpleDrawTask.java b/app/src/main/java/com/mango/moshen/ui/praise/SimpleDrawTask.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/praise/SimpleDrawTask.java rename to app/src/main/java/com/mango/moshen/ui/praise/SimpleDrawTask.java index 4765cbcaf..b731b4ba7 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/praise/SimpleDrawTask.java +++ b/app/src/main/java/com/mango/moshen/ui/praise/SimpleDrawTask.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.praise; +package com.mango.moshen.ui.praise; import android.graphics.Canvas; import android.graphics.Color; @@ -11,8 +11,8 @@ import android.os.HandlerThread; import android.os.SystemClock; -import com.yizhuan.erban.ui.praise.base.IDrawTask; -import com.yizhuan.erban.ui.praise.base.IDrawable; +import com.mango.moshen.ui.praise.base.IDrawTask; +import com.mango.moshen.ui.praise.base.IDrawable; import java.util.Iterator; import java.util.concurrent.ArrayBlockingQueue; diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/UpdateThread.java b/app/src/main/java/com/mango/moshen/ui/praise/UpdateThread.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/praise/UpdateThread.java rename to app/src/main/java/com/mango/moshen/ui/praise/UpdateThread.java index d126c2eb6..b61bf593f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/praise/UpdateThread.java +++ b/app/src/main/java/com/mango/moshen/ui/praise/UpdateThread.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.praise; +package com.mango.moshen.ui.praise; /** * @author lim lee 2017/3/10 diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/Utils.java b/app/src/main/java/com/mango/moshen/ui/praise/Utils.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/ui/praise/Utils.java rename to app/src/main/java/com/mango/moshen/ui/praise/Utils.java index a17ed7cd5..ab4b162c4 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/praise/Utils.java +++ b/app/src/main/java/com/mango/moshen/ui/praise/Utils.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.praise; +package com.mango.moshen.ui.praise; import java.util.Random; diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/base/IDrawTask.java b/app/src/main/java/com/mango/moshen/ui/praise/base/IDrawTask.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/ui/praise/base/IDrawTask.java rename to app/src/main/java/com/mango/moshen/ui/praise/base/IDrawTask.java index 386cadd50..ac43106d8 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/praise/base/IDrawTask.java +++ b/app/src/main/java/com/mango/moshen/ui/praise/base/IDrawTask.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.praise.base; +package com.mango.moshen.ui.praise.base; import android.graphics.Canvas; diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/base/IDrawable.java b/app/src/main/java/com/mango/moshen/ui/praise/base/IDrawable.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/praise/base/IDrawable.java rename to app/src/main/java/com/mango/moshen/ui/praise/base/IDrawable.java index de42669dc..0ef1cb4d6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/praise/base/IDrawable.java +++ b/app/src/main/java/com/mango/moshen/ui/praise/base/IDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.praise.base; +package com.mango.moshen.ui.praise.base; import android.graphics.Canvas; diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/base/IPraise.java b/app/src/main/java/com/mango/moshen/ui/praise/base/IPraise.java similarity index 76% rename from app/src/main/java/com/yizhuan/erban/ui/praise/base/IPraise.java rename to app/src/main/java/com/mango/moshen/ui/praise/base/IPraise.java index e8dd58d3d..5627a08b4 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/praise/base/IPraise.java +++ b/app/src/main/java/com/mango/moshen/ui/praise/base/IPraise.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.praise.base; +package com.mango.moshen.ui.praise.base; public interface IPraise { diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/base/IPraiseView.java b/app/src/main/java/com/mango/moshen/ui/praise/base/IPraiseView.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/ui/praise/base/IPraiseView.java rename to app/src/main/java/com/mango/moshen/ui/praise/base/IPraiseView.java index 304592b1f..369f937ad 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/praise/base/IPraiseView.java +++ b/app/src/main/java/com/mango/moshen/ui/praise/base/IPraiseView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.praise.base; +package com.mango.moshen.ui.praise.base; public interface IPraiseView { diff --git a/app/src/main/java/com/yizhuan/erban/ui/radish/RadishRecordFragment.java b/app/src/main/java/com/mango/moshen/ui/radish/RadishRecordFragment.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/ui/radish/RadishRecordFragment.java rename to app/src/main/java/com/mango/moshen/ui/radish/RadishRecordFragment.java index bdf444a64..83bf1ceea 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/radish/RadishRecordFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/radish/RadishRecordFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.radish; +package com.mango.moshen.ui.radish; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -6,19 +6,19 @@ import androidx.core.content.ContextCompat; import android.text.TextUtils; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bills.adapter.BillBaseAdapter; -import com.yizhuan.erban.bills.fragmemt.BaseBillsFragment; -import com.yizhuan.erban.radish.adapter.RadishRecordAdapter; -import com.yizhuan.erban.radish.presenter.RadishRecordFrgPresenter; -import com.yizhuan.erban.radish.view.IRadishRecordFrgView; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordInfo; -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordListInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.bills.adapter.BillBaseAdapter; +import com.mango.moshen.bills.fragmemt.BaseBillsFragment; +import com.mango.moshen.radish.adapter.RadishRecordAdapter; +import com.mango.moshen.radish.presenter.RadishRecordFrgPresenter; +import com.mango.moshen.radish.view.IRadishRecordFrgView; +import com.mango.moshen.ui.widget.RecyclerViewNoBugLinearLayoutManager; +import com.mango.core.Constants; +import com.mango.core.bills.bean.BillItemEntity; +import com.mango.core.bills.bean.RadishRecordInfo; +import com.mango.core.bills.bean.RadishRecordListInfo; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/AttentionListActivity.java b/app/src/main/java/com/mango/moshen/ui/relation/AttentionListActivity.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/relation/AttentionListActivity.java rename to app/src/main/java/com/mango/moshen/ui/relation/AttentionListActivity.java index 557f1611e..aec683c74 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/relation/AttentionListActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/relation/AttentionListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.relation; +package com.mango.moshen.ui.relation; import android.annotation.SuppressLint; import android.content.Context; @@ -11,18 +11,18 @@ import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.ui.relation.adapter.AttentionListAdapter; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.ui.relation.adapter.AttentionListAdapter; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.praise.event.PraiseEvent; +import com.mango.core.user.AttentionModel; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.core.user.bean.AttentionInfo; import org.greenrobot.eventbus.EventBus; @@ -35,7 +35,7 @@ import java.util.List; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; -import static com.yizhuan.erban.R.id.swipe_refresh; +import static com.mango.moshen.R.id.swipe_refresh; /** * 关注列表 diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/FansListActivity.kt b/app/src/main/java/com/mango/moshen/ui/relation/FansListActivity.kt similarity index 89% rename from app/src/main/java/com/yizhuan/erban/ui/relation/FansListActivity.kt rename to app/src/main/java/com/mango/moshen/ui/relation/FansListActivity.kt index 6b0b1d5ae..44d13cbef 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/relation/FansListActivity.kt +++ b/app/src/main/java/com/mango/moshen/ui/relation/FansListActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.relation +package com.mango.moshen.ui.relation import android.content.Context import android.content.Intent @@ -8,13 +8,13 @@ import android.view.ViewGroup import android.widget.TextView import androidx.fragment.app.Fragment import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseActivity -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction -import com.yizhuan.erban.home.fragment.AttentionFragment -import com.yizhuan.erban.ui.im.friend.FriendListFragment -import com.yizhuan.erban.ui.search.SearchActivity -import com.yizhuan.xchat_android_core.Constants +import com.mango.moshen.R +import com.mango.moshen.base.BaseActivity +import com.mango.moshen.friend.action.AbstractSelectFriendAction +import com.mango.moshen.home.fragment.AttentionFragment +import com.mango.moshen.ui.im.friend.FriendListFragment +import com.mango.moshen.ui.search.SearchActivity +import com.mango.core.Constants /** * 粉丝列表 diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/FansListFragment.java b/app/src/main/java/com/mango/moshen/ui/relation/FansListFragment.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/relation/FansListFragment.java rename to app/src/main/java/com/mango/moshen/ui/relation/FansListFragment.java index bdac39f96..8d106c7e2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/relation/FansListFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/relation/FansListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.relation; +package com.mango.moshen.ui.relation; import android.annotation.SuppressLint; import android.app.Activity; @@ -11,25 +11,25 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.ui.relation.adapter.FansViewAdapter; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.SystemUidUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.friend.view.SelectFriendActivity; +import com.mango.moshen.ui.relation.adapter.FansViewAdapter; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.moshen.room_chat.activity.NimRoomP2PMessageActivity; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.im.friend.IMFriendModel; +import com.mango.core.praise.PraiseModel; +import com.mango.core.praise.event.PraiseEvent; +import com.mango.core.user.AttentionModel; +import com.mango.core.user.bean.FansInfo; +import com.mango.core.user.bean.FansListInfo; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.core.utils.SystemUidUtil; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -41,7 +41,7 @@ import java.util.List; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; -import static com.yizhuan.erban.friend.action.AbstractSelectFriendAction.ROOM_MSG; +import static com.mango.moshen.friend.action.AbstractSelectFriendAction.ROOM_MSG; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java b/app/src/main/java/com/mango/moshen/ui/relation/adapter/AttentionListAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java rename to app/src/main/java/com/mango/moshen/ui/relation/adapter/AttentionListAdapter.java index 60d781754..eeea75622 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/relation/adapter/AttentionListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.relation.adapter; +package com.mango.moshen.ui.relation.adapter; import androidx.appcompat.widget.AppCompatImageView; @@ -7,15 +7,15 @@ import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.NobleAvatarView; -import com.yizhuan.erban.vip.VipHelper; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; +import com.mango.moshen.R; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.NobleAvatarView; +import com.mango.moshen.vip.VipHelper; +import com.mango.core.Constants; +import com.mango.core.noble.NobleUtil; +import com.mango.core.user.bean.AttentionInfo; +import com.mango.core.utils.StringExtensionKt; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java b/app/src/main/java/com/mango/moshen/ui/relation/adapter/FansViewAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java rename to app/src/main/java/com/mango/moshen/ui/relation/adapter/FansViewAdapter.java index 0f18a314f..5270e7c49 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/relation/adapter/FansViewAdapter.java @@ -1,6 +1,5 @@ -package com.yizhuan.erban.ui.relation.adapter; +package com.mango.moshen.ui.relation.adapter; -import android.graphics.drawable.GradientDrawable; import androidx.appcompat.widget.AppCompatImageView; import android.text.TextUtils; import android.view.View; @@ -8,15 +7,15 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.NobleAvatarView; -import com.yizhuan.erban.vip.VipHelper; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; +import com.mango.moshen.R; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.NobleAvatarView; +import com.mango.moshen.vip.VipHelper; +import com.mango.core.im.friend.IMFriendModel; +import com.mango.core.noble.NobleUtil; +import com.mango.core.user.bean.FansInfo; +import com.mango.core.utils.StringExtensionKt; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/RoomHistoryAdapter.java b/app/src/main/java/com/mango/moshen/ui/search/RoomHistoryAdapter.java similarity index 79% rename from app/src/main/java/com/yizhuan/erban/ui/search/RoomHistoryAdapter.java rename to app/src/main/java/com/mango/moshen/ui/search/RoomHistoryAdapter.java index 9c62ae994..b826d135b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/RoomHistoryAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/search/RoomHistoryAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.search; +package com.mango.moshen.ui.search; import android.content.Context; @@ -6,11 +6,11 @@ import androidx.annotation.Nullable; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.bean.RoomHistoryInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java b/app/src/main/java/com/mango/moshen/ui/search/SearchActivity.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java rename to app/src/main/java/com/mango/moshen/ui/search/SearchActivity.java index a400fe696..c1292048a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/search/SearchActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.search; +package com.mango.moshen.ui.search; import android.app.Activity; import android.content.Context; @@ -23,44 +23,41 @@ import androidx.viewpager.widget.ViewPager; import com.chad.library.adapter.base.BaseQuickAdapter; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.common.ViewPagerAdapter; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.decoration.helper.DecorationDialogHelper; -import com.yizhuan.erban.decoration.helper.DecorationSaleType; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.home.adapter.ContactsIndicatorAdapter; -import com.yizhuan.erban.home.adapter.FragmentViewPagerAdapter; -import com.yizhuan.erban.ui.search.event.SearchEvent; -import com.yizhuan.erban.ui.search.presenter.SearchPresenter; -import com.yizhuan.erban.ui.search.view.ISearchView; -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.erban.ui.widget.recyclerview.decoration.VerticalDecoration; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.community.im.DynamicImMsg; -import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.relation.cp.CpBindUnbindEvent; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -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.utils.ImeUtil; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.common.ViewPagerAdapter; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.decoration.helper.DecorationDialogHelper; +import com.mango.moshen.decoration.helper.DecorationSaleType; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.friend.view.SelectFriendActivity; +import com.mango.moshen.home.adapter.ContactsIndicatorAdapter; +import com.mango.moshen.ui.search.presenter.SearchPresenter; +import com.mango.moshen.ui.search.view.ISearchView; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.moshen.ui.widget.recyclerview.decoration.VerticalDecoration; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.RoomHistoryInfo; +import com.mango.core.community.dynamic.DynamicModel; +import com.mango.core.community.im.DynamicImMsg; +import com.mango.core.community.im.WorldDynamicAttachment; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.relation.cp.CpBindUnbindEvent; +import com.mango.core.room.bean.SearchRoomInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ImeUtil; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.SizeUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java b/app/src/main/java/com/mango/moshen/ui/search/SearchAdapter.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java rename to app/src/main/java/com/mango/moshen/ui/search/SearchAdapter.java index ae07cbec9..a8e7b71ba 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/search/SearchAdapter.java @@ -1,7 +1,6 @@ -package com.yizhuan.erban.ui.search; +package com.mango.moshen.ui.search; import android.content.Context; -import android.text.TextUtils; import android.view.View; import android.widget.ImageView; import android.widget.RelativeLayout; @@ -10,17 +9,16 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.coorchice.library.SuperTextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.NobleAvatarView; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -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.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.moshen.ui.widget.NobleAvatarView; +import com.mango.moshen.utils.RegexUtil; +import com.mango.core.room.bean.SearchRoomInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; /** * @author chenran diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/SearchDetailFragment.java b/app/src/main/java/com/mango/moshen/ui/search/SearchDetailFragment.java similarity index 75% rename from app/src/main/java/com/yizhuan/erban/ui/search/SearchDetailFragment.java rename to app/src/main/java/com/mango/moshen/ui/search/SearchDetailFragment.java index 204fbf13a..ba37fe43c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/SearchDetailFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/search/SearchDetailFragment.java @@ -1,54 +1,33 @@ -package com.yizhuan.erban.ui.search; +package com.mango.moshen.ui.search; -import android.app.Activity; -import android.content.Intent; import android.os.Bundle; import android.text.style.ForegroundColorSpan; -import android.view.View; import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.erban.MainActivity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.widget.MessageView; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.decoration.helper.DecorationHelper; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.module_hall.HallDataManager; -import com.yizhuan.erban.module_hall.hall.activity.HallSearchActivity; -import com.yizhuan.erban.ui.im.friend.FriendFragmentCpDelegate; -import com.yizhuan.erban.ui.search.presenter.SearchPresenter; -import com.yizhuan.erban.ui.search.view.ISearchView; -import com.yizhuan.erban.ui.widget.dialog.CommonTipDialog; -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.community.im.DynamicImMsg; -import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment; -import com.yizhuan.xchat_android_core.decoration.DecorationInfoEvent; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.DirectoryHelper; -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.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; - -import org.greenrobot.eventbus.EventBus; +import com.mango.moshen.R; +import com.mango.moshen.avroom.widget.MessageView; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.decoration.helper.DecorationHelper; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.module_hall.HallDataManager; +import com.mango.moshen.module_hall.hall.activity.HallSearchActivity; +import com.mango.moshen.ui.im.friend.FriendFragmentCpDelegate; +import com.mango.moshen.ui.search.presenter.SearchPresenter; +import com.mango.moshen.ui.search.view.ISearchView; +import com.mango.core.bean.RoomHistoryInfo; +import com.mango.core.module_hall.hall.HallModel; +import com.mango.core.room.bean.SearchRoomInfo; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.JavaUtil; import java.util.List; -import io.reactivex.android.schedulers.AndroidSchedulers; - @CreatePresenter(SearchPresenter.class) public class SearchDetailFragment extends BaseMvpFragment implements ISearchView { diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/SearchHallActivity.java b/app/src/main/java/com/mango/moshen/ui/search/SearchHallActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/search/SearchHallActivity.java rename to app/src/main/java/com/mango/moshen/ui/search/SearchHallActivity.java index 1660f538a..baa1179da 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/SearchHallActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/search/SearchHallActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.search; +package com.mango.moshen.ui.search; import android.content.Context; import android.content.Intent; @@ -18,22 +18,22 @@ import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.common.ViewPagerAdapter; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.home.adapter.ContactsIndicatorAdapter; -import com.yizhuan.erban.ui.search.presenter.SearchPresenter; -import com.yizhuan.erban.ui.search.view.ISearchView; -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.bean.RoomHistoryInfo; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ImeUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.common.ViewPagerAdapter; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.friend.view.SelectFriendActivity; +import com.mango.moshen.home.adapter.ContactsIndicatorAdapter; +import com.mango.moshen.ui.search.presenter.SearchPresenter; +import com.mango.moshen.ui.search.view.ISearchView; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.core.bean.RoomHistoryInfo; +import com.mango.core.room.bean.SearchRoomInfo; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ImeUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/SearchHistoryAdapter.java b/app/src/main/java/com/mango/moshen/ui/search/SearchHistoryAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/search/SearchHistoryAdapter.java rename to app/src/main/java/com/mango/moshen/ui/search/SearchHistoryAdapter.java index 8b2dbb477..77519e635 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/SearchHistoryAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/search/SearchHistoryAdapter.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.ui.search; +package com.mango.moshen.ui.search; import androidx.annotation.Nullable; import android.text.TextUtils; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/event/SearchEvent.java b/app/src/main/java/com/mango/moshen/ui/search/event/SearchEvent.java similarity index 75% rename from app/src/main/java/com/yizhuan/erban/ui/search/event/SearchEvent.java rename to app/src/main/java/com/mango/moshen/ui/search/event/SearchEvent.java index a95c6ea62..39e85619f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/event/SearchEvent.java +++ b/app/src/main/java/com/mango/moshen/ui/search/event/SearchEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.search.event; +package com.mango.moshen.ui.search.event; public class SearchEvent { public String inPutText; diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/presenter/SearchPresenter.java b/app/src/main/java/com/mango/moshen/ui/search/presenter/SearchPresenter.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/ui/search/presenter/SearchPresenter.java rename to app/src/main/java/com/mango/moshen/ui/search/presenter/SearchPresenter.java index 60bcf1a3a..091975948 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/presenter/SearchPresenter.java +++ b/app/src/main/java/com/mango/moshen/ui/search/presenter/SearchPresenter.java @@ -1,16 +1,16 @@ -package com.yizhuan.erban.ui.search.presenter; +package com.mango.moshen.ui.search.presenter; import android.annotation.SuppressLint; import android.os.Bundle; import androidx.annotation.Nullable; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.ui.search.view.ISearchView; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.ui.search.view.ISearchView; +import com.mango.core.room.bean.SearchRoomInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.user.UserModel; +import com.mango.xchat_android_library.utils.NetworkUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/view/ISearchView.java b/app/src/main/java/com/mango/moshen/ui/search/view/ISearchView.java similarity index 67% rename from app/src/main/java/com/yizhuan/erban/ui/search/view/ISearchView.java rename to app/src/main/java/com/mango/moshen/ui/search/view/ISearchView.java index 7c100f89e..edb66cbad 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/view/ISearchView.java +++ b/app/src/main/java/com/mango/moshen/ui/search/view/ISearchView.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.ui.search.view; +package com.mango.moshen.ui.search.view; -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.bean.RoomHistoryInfo; +import com.mango.core.room.bean.SearchRoomInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/FeedbackActivity.java b/app/src/main/java/com/mango/moshen/ui/setting/FeedbackActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/setting/FeedbackActivity.java rename to app/src/main/java/com/mango/moshen/ui/setting/FeedbackActivity.java index 8179193b8..dee337e63 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/FeedbackActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/setting/FeedbackActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.setting; +package com.mango.moshen.ui.setting; import android.content.Context; import android.content.Intent; @@ -8,10 +8,10 @@ import android.widget.EditText; import com.netease.nim.uikit.StatusBarUtil; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.home.model.HomeModel; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.core.auth.AuthModel; +import com.mango.core.home.model.HomeModel; import io.reactivex.SingleObserver; diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/GrantedPermissionsActivity.kt b/app/src/main/java/com/mango/moshen/ui/setting/GrantedPermissionsActivity.kt similarity index 89% rename from app/src/main/java/com/yizhuan/erban/ui/setting/GrantedPermissionsActivity.kt rename to app/src/main/java/com/mango/moshen/ui/setting/GrantedPermissionsActivity.kt index 6e5995420..ff8a5f072 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/GrantedPermissionsActivity.kt +++ b/app/src/main/java/com/mango/moshen/ui/setting/GrantedPermissionsActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.setting +package com.mango.moshen.ui.setting import android.content.Context import android.content.Intent @@ -11,14 +11,14 @@ import androidx.recyclerview.widget.RecyclerView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.trello.rxlifecycle3.android.ActivityEvent -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseActivity -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.ui.setting.bean.PermissionEntity -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.erban.ui.widget.DividerItemDecoration -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.erban.utils.PermissionUtil +import com.mango.moshen.R +import com.mango.moshen.base.BaseActivity +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.ui.setting.bean.PermissionEntity +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.moshen.ui.widget.DividerItemDecoration +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil +import com.mango.moshen.utils.PermissionUtil import io.reactivex.Completable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/LabActivity.java b/app/src/main/java/com/mango/moshen/ui/setting/LabActivity.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/ui/setting/LabActivity.java rename to app/src/main/java/com/mango/moshen/ui/setting/LabActivity.java index 70bb5e772..a1d13270b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/LabActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/setting/LabActivity.java @@ -1,15 +1,15 @@ -package com.yizhuan.erban.ui.setting; +package com.mango.moshen.ui.setting; import android.os.Bundle; import android.view.View; import android.widget.RadioButton; import android.widget.RadioGroup; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.ui.utils.ImageLoadKt; -import com.yizhuan.xchat_android_core.Env; -import com.yizhuan.xchat_android_core.auth.AuthModel; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.ui.utils.ImageLoadKt; +import com.mango.core.Env; +import com.mango.core.auth.AuthModel; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/ModifyPwdActivity.java b/app/src/main/java/com/mango/moshen/ui/setting/ModifyPwdActivity.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/setting/ModifyPwdActivity.java rename to app/src/main/java/com/mango/moshen/ui/setting/ModifyPwdActivity.java index b9d0f1373..8fc8a5063 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/ModifyPwdActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/setting/ModifyPwdActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.setting; +package com.mango.moshen.ui.setting; import android.annotation.SuppressLint; import android.content.Context; @@ -10,18 +10,18 @@ import android.view.View; import com.coorchice.library.utils.LogUtils; import com.netease.nim.uikit.StatusBarUtil; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.databinding.ActivityModifyPwdBinding; -import com.yizhuan.erban.ui.login.CodeDownTimer; -import com.yizhuan.erban.ui.login.PasswordValidator; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.code.CodeType; -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.BeanObserver; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.databinding.ActivityModifyPwdBinding; +import com.mango.moshen.ui.login.CodeDownTimer; +import com.mango.moshen.ui.login.PasswordValidator; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.event.LogoutEvent; +import com.mango.core.code.CodeType; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.annatation.ActLayoutRes; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/NoticeSettingActivity.java b/app/src/main/java/com/mango/moshen/ui/setting/NoticeSettingActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/setting/NoticeSettingActivity.java rename to app/src/main/java/com/mango/moshen/ui/setting/NoticeSettingActivity.java index 0b25d8952..9f37f3c02 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/NoticeSettingActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/setting/NoticeSettingActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.setting; +package com.mango.moshen.ui.setting; import android.annotation.SuppressLint; import android.content.Context; @@ -12,14 +12,14 @@ import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.common.widget.TutuSwitchView; -import com.yizhuan.xchat_android_core.settings.SettingsModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.common.widget.TutuSwitchView; +import com.mango.core.settings.SettingsModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.widget.IOSSwitchView; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/PermissionGuideActivity.kt b/app/src/main/java/com/mango/moshen/ui/setting/PermissionGuideActivity.kt similarity index 87% rename from app/src/main/java/com/yizhuan/erban/ui/setting/PermissionGuideActivity.kt rename to app/src/main/java/com/mango/moshen/ui/setting/PermissionGuideActivity.kt index 32432a48b..e7d6a3eb5 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/PermissionGuideActivity.kt +++ b/app/src/main/java/com/mango/moshen/ui/setting/PermissionGuideActivity.kt @@ -1,13 +1,13 @@ -package com.yizhuan.erban.ui.setting +package com.mango.moshen.ui.setting import android.content.Context import android.content.Intent import android.view.View -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.databinding.ActivityPermissionGuideBinding -import com.yizhuan.erban.ui.webview.CommonWebViewActivity -import com.yizhuan.xchat_android_core.UriProvider +import com.mango.moshen.R +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.databinding.ActivityPermissionGuideBinding +import com.mango.moshen.ui.webview.CommonWebViewActivity +import com.mango.core.UriProvider class PermissionGuideActivity : BaseViewBindingActivity(), View.OnClickListener { diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/PrivacySettingActivity.java b/app/src/main/java/com/mango/moshen/ui/setting/PrivacySettingActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/setting/PrivacySettingActivity.java rename to app/src/main/java/com/mango/moshen/ui/setting/PrivacySettingActivity.java index f2d45ed65..b2af5120b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/PrivacySettingActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/setting/PrivacySettingActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.setting; +package com.mango.moshen.ui.setting; import android.Manifest; import android.annotation.SuppressLint; @@ -12,17 +12,17 @@ import android.text.TextUtils; import com.netease.nim.uikit.StatusBarUtil; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.common.widget.TutuSwitchView; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.settings.SettingsModel; -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.RxHelper; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.common.widget.TutuSwitchView; +import com.mango.core.auth.AuthModel; +import com.mango.core.settings.SettingsModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.widget.IOSSwitchView; import java.util.concurrent.CancellationException; diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/ResetPasswordActivity.java b/app/src/main/java/com/mango/moshen/ui/setting/ResetPasswordActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/setting/ResetPasswordActivity.java rename to app/src/main/java/com/mango/moshen/ui/setting/ResetPasswordActivity.java index 68f205971..d7ba05794 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/ResetPasswordActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/setting/ResetPasswordActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.setting; +package com.mango.moshen.ui.setting; import android.annotation.SuppressLint; import android.content.Context; @@ -11,16 +11,16 @@ import android.view.View; import com.coorchice.library.utils.LogUtils; import com.netease.nim.uikit.StatusBarUtil; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.databinding.ActivityResetLoginPwdBinding; -import com.yizhuan.erban.ui.login.CodeDownTimer; -import com.yizhuan.erban.ui.login.helper.LogoutHelper; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.code.CodeType; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.databinding.ActivityResetLoginPwdBinding; +import com.mango.moshen.ui.login.CodeDownTimer; +import com.mango.moshen.ui.login.helper.LogoutHelper; +import com.mango.core.auth.AuthModel; +import com.mango.core.code.CodeType; +import com.mango.core.user.UserModel; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.TextWatcherWrapper; import io.reactivex.SingleObserver; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java b/app/src/main/java/com/mango/moshen/ui/setting/SettingActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java rename to app/src/main/java/com/mango/moshen/ui/setting/SettingActivity.java index 77bbaa869..bea9f561e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/setting/SettingActivity.java @@ -1,44 +1,42 @@ -package com.yizhuan.erban.ui.setting; +package com.mango.moshen.ui.setting; import android.annotation.SuppressLint; import android.content.Intent; -import android.graphics.Color; import android.os.Bundle; import android.os.Environment; import android.text.SpannableString; import android.text.TextUtils; import android.view.View; -import androidx.core.content.ContextCompat; import androidx.databinding.DataBindingUtil; import com.netease.nim.uikit.StatusBarUtil; import com.tencent.bugly.beta.Beta; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.application.XChatApplication; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.databinding.ActivitySettingBinding; -import com.yizhuan.erban.ui.im.avtivity.BlackListManageActivity; -import com.yizhuan.erban.ui.login.BindPhoneActivity; -import com.yizhuan.erban.ui.login.ShowBindPhoneActivity; -import com.yizhuan.erban.ui.login.helper.LogoutHelper; -import com.yizhuan.erban.ui.user.AboutActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.withdraw.BinderAlipayActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.withdraw.WithdrawModel; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.file.JXFileUtils; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.application.XChatApplication; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.databinding.ActivitySettingBinding; +import com.mango.moshen.ui.im.avtivity.BlackListManageActivity; +import com.mango.moshen.ui.login.BindPhoneActivity; +import com.mango.moshen.ui.login.ShowBindPhoneActivity; +import com.mango.moshen.ui.login.helper.LogoutHelper; +import com.mango.moshen.ui.user.AboutActivity; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.ui.withdraw.BinderAlipayActivity; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.event.LogoutEvent; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.withdraw.WithdrawModel; +import com.mango.core.withdraw.bean.WithdrawInfo; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.file.JXFileUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/VerifyPhoneActivity.java b/app/src/main/java/com/mango/moshen/ui/setting/VerifyPhoneActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/setting/VerifyPhoneActivity.java rename to app/src/main/java/com/mango/moshen/ui/setting/VerifyPhoneActivity.java index 0c0e9913c..f7a50fc25 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/VerifyPhoneActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/setting/VerifyPhoneActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.setting; +package com.mango.moshen.ui.setting; import android.annotation.SuppressLint; import android.app.Activity; @@ -8,18 +8,18 @@ import android.text.TextUtils; import android.view.View; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.databinding.ActivityVerifyPhoneBinding; -import com.yizhuan.erban.ui.login.BindSuccessDialog; -import com.yizhuan.erban.ui.login.CodeDownTimer; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.code.CodeType; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.databinding.ActivityVerifyPhoneBinding; +import com.mango.moshen.ui.login.BindSuccessDialog; +import com.mango.moshen.ui.login.CodeDownTimer; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.code.CodeType; +import com.mango.core.pay.PayModel; +import com.mango.core.user.UserModel; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.annatation.ActLayoutRes; import io.reactivex.Single; import io.reactivex.SingleObserver; diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/bean/PermissionEntity.kt b/app/src/main/java/com/mango/moshen/ui/setting/bean/PermissionEntity.kt similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/setting/bean/PermissionEntity.kt rename to app/src/main/java/com/mango/moshen/ui/setting/bean/PermissionEntity.kt index 19358af4c..8594fabf4 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/bean/PermissionEntity.kt +++ b/app/src/main/java/com/mango/moshen/ui/setting/bean/PermissionEntity.kt @@ -1,8 +1,8 @@ -package com.yizhuan.erban.ui.setting.bean +package com.mango.moshen.ui.setting.bean import android.Manifest -import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.mango.moshen.R +import com.mango.core.utils.TextUtils enum class PermissionEntity( val alias: String, diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/AboutActivity.java b/app/src/main/java/com/mango/moshen/ui/user/AboutActivity.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/ui/user/AboutActivity.java rename to app/src/main/java/com/mango/moshen/ui/user/AboutActivity.java index 6c5c80e2b..97e8383a8 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/AboutActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/user/AboutActivity.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.ui.user; +package com.mango.moshen.ui.user; import android.os.Bundle; import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.xchat_android_library.utils.config.BasicConfig; public class AboutActivity extends BaseActivity { diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/GrandintDrawableCreator.kt b/app/src/main/java/com/mango/moshen/ui/user/GrandintDrawableCreator.kt similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/user/GrandintDrawableCreator.kt rename to app/src/main/java/com/mango/moshen/ui/user/GrandintDrawableCreator.kt index b0e095c24..8a7eec78e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/GrandintDrawableCreator.kt +++ b/app/src/main/java/com/mango/moshen/ui/user/GrandintDrawableCreator.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user +package com.mango.moshen.ui.user import android.graphics.drawable.Drawable import android.graphics.drawable.GradientDrawable diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/PhotoAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/PhotoAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/user/PhotoAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/PhotoAdapter.java index 600b3497f..04d3bf330 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/PhotoAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/PhotoAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user; +package com.mango.moshen.ui.user; import android.content.Context; import androidx.viewpager.widget.PagerAdapter; @@ -6,8 +6,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.user.bean.UserPhoto; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/ShowPhotoActivity.java b/app/src/main/java/com/mango/moshen/ui/user/ShowPhotoActivity.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/user/ShowPhotoActivity.java rename to app/src/main/java/com/mango/moshen/ui/user/ShowPhotoActivity.java index 785b40c13..8c4353b3e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/ShowPhotoActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/user/ShowPhotoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user; +package com.mango.moshen.ui.user; import android.os.Bundle; import androidx.annotation.Nullable; @@ -6,9 +6,9 @@ import androidx.viewpager.widget.ViewPager; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.core.user.bean.UserPhoto; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserGiftActivity.java b/app/src/main/java/com/mango/moshen/ui/user/UserGiftActivity.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/ui/user/UserGiftActivity.java rename to app/src/main/java/com/mango/moshen/ui/user/UserGiftActivity.java index 1ce84eb63..cc9875d53 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserGiftActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/user/UserGiftActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user; +package com.mango.moshen.ui.user; import android.os.Bundle; import android.widget.LinearLayout; @@ -7,13 +7,13 @@ import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.ui.user.adapter.UserInfoIndicatorAdapter; -import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter; -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.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.ui.user.adapter.UserInfoIndicatorAdapter; +import com.mango.moshen.ui.user.adapter.UserInfoPagerAdapter; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java b/app/src/main/java/com/mango/moshen/ui/user/UserInfoActivity.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java rename to app/src/main/java/com/mango/moshen/ui/user/UserInfoActivity.java index 14403796e..8efe8c5f6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/user/UserInfoActivity.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.ui.user; +package com.mango.moshen.ui.user; -import static com.yizhuan.erban.ui.user.UserInfoActivity.IdentityState.OWN; +import static com.mango.moshen.ui.user.UserInfoActivity.IdentityState.OWN; import android.annotation.SuppressLint; import android.content.Context; @@ -23,63 +23,62 @@ import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.impl.cache.NimUserInfoCache; import com.netease.nimlib.sdk.RequestCallbackWrapper; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.audio.helper.AudioPlayerHelper; -import com.yizhuan.erban.audio.helper.OnPlayListener; -import com.yizhuan.erban.avroom.ButtonItemFactory; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.common.widget.dialog.CommonPopupDialog; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.databinding.ActivityUserInfoBinding; -import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; -import com.yizhuan.erban.family.view.activity.FamilyMemberListActivity; -import com.yizhuan.erban.family.view.activity.FamilyMemberSearchActivity; -import com.yizhuan.erban.relation.cp.fragment.UserInfoCpFragment; -import com.yizhuan.erban.ui.im.avtivity.NimFriendModel; -import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.erban.ui.user.adapter.SelfPhotoAdapter; -import com.yizhuan.erban.ui.user.adapter.UserInfoIndicatorAdapter; -import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter; -import com.yizhuan.erban.ui.user.adapter.UserInfoPhotoAdapter; -import com.yizhuan.erban.ui.user.view.UserInfoDynamicFragment; -import com.yizhuan.erban.ui.user.view.UserInfoInfoFragment; -import com.yizhuan.erban.ui.user.viewmodel.UserInfoViewModel; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.erban.ui.widget.ObservableScrollView; -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.erban.ui.widget.rollviewpager.HintView; -import com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView; -import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper; -import com.yizhuan.erban.ui.widget.rollviewpager.hintview.TextHintView; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.erban.vip.VipHelper; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -import com.yizhuan.xchat_android_core.praise.event.IsLikedEvent; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.user.UserInfoUiMgr; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.utils.StarUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -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.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.audio.helper.AudioPlayerHelper; +import com.mango.moshen.audio.helper.OnPlayListener; +import com.mango.moshen.avroom.ButtonItemFactory; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.common.widget.dialog.CommonPopupDialog; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.databinding.ActivityUserInfoBinding; +import com.mango.moshen.family.view.activity.FamilyHomeActivity; +import com.mango.moshen.family.view.activity.FamilyMemberListActivity; +import com.mango.moshen.family.view.activity.FamilyMemberSearchActivity; +import com.mango.moshen.relation.cp.fragment.UserInfoCpFragment; +import com.mango.moshen.ui.im.avtivity.NimFriendModel; +import com.mango.moshen.ui.im.avtivity.NimP2PMessageActivity; +import com.mango.moshen.ui.user.adapter.SelfPhotoAdapter; +import com.mango.moshen.ui.user.adapter.UserInfoIndicatorAdapter; +import com.mango.moshen.ui.user.adapter.UserInfoPagerAdapter; +import com.mango.moshen.ui.user.adapter.UserInfoPhotoAdapter; +import com.mango.moshen.ui.user.view.UserInfoDynamicFragment; +import com.mango.moshen.ui.user.view.UserInfoInfoFragment; +import com.mango.moshen.ui.user.viewmodel.UserInfoViewModel; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.moshen.ui.widget.ObservableScrollView; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.moshen.ui.widget.rollviewpager.HintView; +import com.mango.moshen.ui.widget.rollviewpager.RollPagerView; +import com.mango.moshen.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper; +import com.mango.moshen.utils.RegexUtil; +import com.mango.moshen.vip.VipHelper; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.auth.AuthModel; +import com.mango.core.im.friend.IMFriendModel; +import com.mango.core.level.UserLevelVo; +import com.mango.core.praise.PraiseModel; +import com.mango.core.praise.event.IsLikedEvent; +import com.mango.core.praise.event.PraiseEvent; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserInfoUiMgr; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserDetailInfo; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.user.bean.UserInfoSkillEntity; +import com.mango.core.user.bean.UserPhoto; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.core.utils.LogUtils; +import com.mango.core.utils.StarUtils; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.SizeUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoCarFragment.java b/app/src/main/java/com/mango/moshen/ui/user/UserInfoCarFragment.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/ui/user/UserInfoCarFragment.java rename to app/src/main/java/com/mango/moshen/ui/user/UserInfoCarFragment.java index ebd382b4b..d791e2512 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoCarFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/user/UserInfoCarFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user; +package com.mango.moshen.ui.user; import androidx.lifecycle.Observer; import android.graphics.Rect; @@ -10,24 +10,24 @@ import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingFragment; -import com.yizhuan.erban.databinding.LayoutUserCarStoreBinding; -import com.yizhuan.erban.decoration.view.DecorationStoreActivity; -import com.yizhuan.erban.decoration.view.MyDecorationActivity; -import com.yizhuan.erban.ui.user.adapter.UserInfoCarAdapter; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.CarButtonInfo; -import com.yizhuan.xchat_android_core.bean.GiftTitleInfo; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.CarModel; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.user.UserInfoUiMgr; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingFragment; +import com.mango.moshen.databinding.LayoutUserCarStoreBinding; +import com.mango.moshen.decoration.view.DecorationStoreActivity; +import com.mango.moshen.decoration.view.MyDecorationActivity; +import com.mango.moshen.ui.user.adapter.UserInfoCarAdapter; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.CarButtonInfo; +import com.mango.core.bean.GiftTitleInfo; +import com.mango.core.bean.UserInfoItem; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.car.CarModel; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.core.user.UserInfoUiMgr; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SizeUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoFragment.java b/app/src/main/java/com/mango/moshen/ui/user/UserInfoFragment.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/user/UserInfoFragment.java rename to app/src/main/java/com/mango/moshen/ui/user/UserInfoFragment.java index 2c6162e53..15819d849 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/user/UserInfoFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user; +package com.mango.moshen.ui.user; import android.app.Activity; import android.content.Intent; @@ -13,38 +13,38 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.audio.RecordingVoiceActivity; -import com.yizhuan.erban.audio.helper.AudioPlayerHelper; -import com.yizhuan.erban.audio.helper.OnPlayListener; -import com.yizhuan.erban.avroom.widget.MessageView; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; -import com.yizhuan.erban.module_hall.team.activity.HallTeamMessageActivity; -import com.yizhuan.erban.ui.user.adapter.UserDesAdapter; -import com.yizhuan.xchat_android_core.audio.AudioModel; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldStateChangedEvent; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OwnerHallInfo; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.module_hall.team.event.HteamListChangeEvent; -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.JoinWorldInfo; -import com.yizhuan.xchat_android_core.user.bean.UserGameInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.StringUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.audio.RecordingVoiceActivity; +import com.mango.moshen.audio.helper.AudioPlayerHelper; +import com.mango.moshen.audio.helper.OnPlayListener; +import com.mango.moshen.avroom.widget.MessageView; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.family.view.activity.FamilyHomeActivity; +import com.mango.moshen.module_hall.team.activity.HallTeamMessageActivity; +import com.mango.moshen.ui.user.adapter.UserDesAdapter; +import com.mango.core.audio.AudioModel; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.UserInfoItem; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.miniworld.event.MiniWorldStateChangedEvent; +import com.mango.core.module_hall.hall.HallModel; +import com.mango.core.module_hall.hall.bean.OwnerHallInfo; +import com.mango.core.module_hall.team.HTeamModel; +import com.mango.core.module_hall.team.event.HteamListChangeEvent; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.JoinWorldInfo; +import com.mango.core.user.bean.UserGameInfo; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.core.utils.StringUtils; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.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/ui/user/UserInfoGiftFragment.java b/app/src/main/java/com/mango/moshen/ui/user/UserInfoGiftFragment.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/ui/user/UserInfoGiftFragment.java rename to app/src/main/java/com/mango/moshen/ui/user/UserInfoGiftFragment.java index 83423325a..4dcf86057 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoGiftFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/user/UserInfoGiftFragment.java @@ -1,11 +1,10 @@ -package com.yizhuan.erban.ui.user; +package com.mango.moshen.ui.user; import androidx.lifecycle.Observer; import android.os.Bundle; import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import android.util.Log; @@ -15,26 +14,20 @@ import android.view.ViewGroup; import com.chad.library.adapter.base.BaseQuickAdapter; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingFragment; -import com.yizhuan.erban.databinding.FragmentUserInfoGiftBinding; -import com.yizhuan.erban.ui.user.adapter.UserGiftAdapter; -import com.yizhuan.xchat_android_core.bean.GiftTitleInfo; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.bills.RadishGiftModel; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.user.UserInfoUiMgr; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo; -import com.yizhuan.xchat_android_core.user.bean.RadishWallInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingFragment; +import com.mango.moshen.databinding.FragmentUserInfoGiftBinding; +import com.mango.moshen.ui.user.adapter.UserGiftAdapter; +import com.mango.core.bean.UserInfoItem; +import com.mango.core.user.UserInfoUiMgr; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.GiftWallInfo; +import com.mango.core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -43,9 +36,6 @@ import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; import java.util.List; -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - @ActLayoutRes(R.layout.fragment_user_info_gift) public class UserInfoGiftFragment extends BaseBindingFragment { diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.java b/app/src/main/java/com/mango/moshen/ui/user/UserInfoModifyActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.java rename to app/src/main/java/com/mango/moshen/ui/user/UserInfoModifyActivity.java index 28a925061..653ab908b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/user/UserInfoModifyActivity.java @@ -1,10 +1,9 @@ -package com.yizhuan.erban.ui.user; +package com.mango.moshen.ui.user; import android.Manifest; import android.annotation.SuppressLint; import android.app.Activity; import android.content.Intent; -import android.graphics.drawable.Drawable; import android.os.Bundle; import androidx.recyclerview.widget.LinearLayoutManager; @@ -22,25 +21,23 @@ import com.netease.nim.uikit.common.util.sys.TimeUtil; import com.sleepbot.datetimepicker.time.RadialPickerLayout; import com.sleepbot.datetimepicker.time.TimePickerDialog; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.ErbanTakePhotoActivity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.audio.RecordingVoiceActivity; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.common.permission.PermissionActivity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.login.ModifyInfoActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.erban.ui.widget.dialog.CommonMessageDialog; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.file.FileModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; -import com.yizhuan.xchat_android_library.utils.TimeUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.moshen.ErbanTakePhotoActivity; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.audio.RecordingVoiceActivity; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.common.permission.PermissionActivity; +import com.mango.moshen.ui.login.ModifyInfoActivity; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.moshen.utils.RegexUtil; +import com.mango.core.auth.AuthModel; +import com.mango.core.file.FileModel; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.user.bean.UserPhoto; +import com.mango.xchat_android_library.utils.TimeUtils; +import com.mango.xchat_android_library.utils.log.MLog; import java.util.ArrayList; import java.util.Calendar; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosActivity.java b/app/src/main/java/com/mango/moshen/ui/user/UserModifyPhotosActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosActivity.java rename to app/src/main/java/com/mango/moshen/ui/user/UserModifyPhotosActivity.java index aad950f34..aa23abf4b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/user/UserModifyPhotosActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user; +package com.mango.moshen.ui.user; import android.annotation.SuppressLint; import android.app.Activity; @@ -14,16 +14,16 @@ import com.jph.takephoto.model.TResult; import com.netease.nim.uikit.StatusBarUtil; import com.orhanobut.logger.Logger; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.TitleBar; -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_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.utils.file.JXFileUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.common.permission.PermissionActivity; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.core.file.FileModel; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.user.bean.UserPhoto; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.utils.file.JXFileUtils; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/UserModifyPhotosAdapter.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/UserModifyPhotosAdapter.java index ad4201fb8..2092b8d85 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/UserModifyPhotosAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user; +package com.mango.moshen.ui.user; import android.content.Context; import android.view.LayoutInflater; @@ -9,8 +9,8 @@ import android.widget.ImageView; import com.makeramen.roundedimageview.RoundedImageView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; +import com.mango.moshen.R; +import com.mango.core.user.bean.UserPhoto; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserPhotoAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/UserPhotoAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/user/UserPhotoAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/UserPhotoAdapter.java index 6ec01a309..dc8ad28e8 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserPhotoAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/UserPhotoAdapter.java @@ -1,15 +1,15 @@ -package com.yizhuan.erban.ui.user; +package com.mango.moshen.ui.user; import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.RectRoundImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.RectRoundImageView; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.auth.AuthModel; +import com.mango.core.user.bean.UserPhoto; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/GiftAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/adapter/GiftAdapter.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/user/adapter/GiftAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/adapter/GiftAdapter.java index ca0d09059..dd3bfb238 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/GiftAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/adapter/GiftAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user.adapter; +package com.mango.moshen.ui.user.adapter; import android.content.Context; import android.widget.ImageView; @@ -7,9 +7,9 @@ import androidx.annotation.Nullable; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.user.bean.UserDetailInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/SelfPhotoAdapter.kt b/app/src/main/java/com/mango/moshen/ui/user/adapter/SelfPhotoAdapter.kt similarity index 85% rename from app/src/main/java/com/yizhuan/erban/ui/user/adapter/SelfPhotoAdapter.kt rename to app/src/main/java/com/mango/moshen/ui/user/adapter/SelfPhotoAdapter.kt index 7f26bc75d..f818273e8 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/SelfPhotoAdapter.kt +++ b/app/src/main/java/com/mango/moshen/ui/user/adapter/SelfPhotoAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user.adapter +package com.mango.moshen.ui.user.adapter import android.content.Context import android.view.Gravity @@ -6,10 +6,10 @@ import android.view.View import android.view.ViewGroup import android.widget.FrameLayout import android.widget.ImageView -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo +import com.mango.moshen.R +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil +import com.mango.moshen.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper +import com.mango.core.user.bean.UserDetailInfo class SelfPhotoAdapter( photoBeans: List, diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/SkillCardAdapter.kt b/app/src/main/java/com/mango/moshen/ui/user/adapter/SkillCardAdapter.kt similarity index 84% rename from app/src/main/java/com/yizhuan/erban/ui/user/adapter/SkillCardAdapter.kt rename to app/src/main/java/com/mango/moshen/ui/user/adapter/SkillCardAdapter.kt index ac31cf21c..e4827bddd 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/SkillCardAdapter.kt +++ b/app/src/main/java/com/mango/moshen/ui/user/adapter/SkillCardAdapter.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.ui.user.adapter +package com.mango.moshen.ui.user.adapter import android.content.Context import android.graphics.Color import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.user.GradientDrawableCreator -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity +import com.mango.moshen.R +import com.mango.moshen.ui.user.GradientDrawableCreator +import com.mango.moshen.ui.utils.ImageLoadUtilsV2 +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil +import com.mango.core.user.bean.UserInfoSkillEntity class SkillCardAdapter(private val context: Context) : BaseQuickAdapter(R.layout.item_userinfo_skill) { diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/SkillPicsAdapter.kt b/app/src/main/java/com/mango/moshen/ui/user/adapter/SkillPicsAdapter.kt similarity index 75% rename from app/src/main/java/com/yizhuan/erban/ui/user/adapter/SkillPicsAdapter.kt rename to app/src/main/java/com/mango/moshen/ui/user/adapter/SkillPicsAdapter.kt index cd2242e76..4900368b3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/SkillPicsAdapter.kt +++ b/app/src/main/java/com/mango/moshen/ui/user/adapter/SkillPicsAdapter.kt @@ -1,9 +1,9 @@ -package com.yizhuan.erban.ui.user.adapter +package com.mango.moshen.ui.user.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 +import com.mango.moshen.R +import com.mango.moshen.ui.utils.ImageLoadUtilsV2 class SkillPicsAdapter: BaseQuickAdapter(R.layout.item_userinfo_skill_abspicture) { override fun convert(helper: BaseViewHolder, item: String) { diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserDesAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserDesAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserDesAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/adapter/UserDesAdapter.java index 8c5d1b96e..40a37cac9 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserDesAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserDesAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user.adapter; +package com.mango.moshen.ui.user.adapter; import android.app.Activity; import android.content.Context; @@ -13,30 +13,30 @@ 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.BR; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.audio.widget.VoiceLine; -import com.yizhuan.erban.bindadapter.BaseAdapter; -import com.yizhuan.erban.miniworld.activity.TopicMainActivity; -import com.yizhuan.erban.ui.user.ShowPhotoActivity; -import com.yizhuan.erban.ui.user.UserPhotoAdapter; -import com.yizhuan.erban.ui.widget.SquareImageView; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.VerticalDecoration; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OwnerHallInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.user.bean.JoinWorldInfo; -import com.yizhuan.xchat_android_core.user.bean.UserGameInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; -import com.yizhuan.xchat_android_core.utils.StringUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.audio.widget.VoiceLine; +import com.mango.moshen.bindadapter.BaseAdapter; +import com.mango.moshen.miniworld.activity.TopicMainActivity; +import com.mango.moshen.ui.user.ShowPhotoActivity; +import com.mango.moshen.ui.user.UserPhotoAdapter; +import com.mango.moshen.ui.widget.SquareImageView; +import com.mango.moshen.ui.widget.recyclerview.decoration.VerticalDecoration; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.UserInfoItem; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.module_hall.hall.bean.HTeamInfo; +import com.mango.core.module_hall.hall.bean.OwnerHallInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.bean.JoinWorldInfo; +import com.mango.core.user.bean.UserGameInfo; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.user.bean.UserPhoto; +import com.mango.core.utils.StringUtils; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SizeUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserGiftAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserGiftAdapter.java similarity index 75% rename from app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserGiftAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/adapter/UserGiftAdapter.java index c20c94180..7c09a6ffb 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserGiftAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserGiftAdapter.java @@ -1,23 +1,15 @@ -package com.yizhuan.erban.ui.user.adapter; +package com.mango.moshen.ui.user.adapter; import android.content.Context; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import android.widget.ImageView; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo; -import com.yizhuan.xchat_android_core.user.bean.RadishWallInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.bean.UserInfoItem; +import com.mango.core.user.bean.GiftWallInfo; -import java.util.ArrayList; import java.util.List; public class UserGiftAdapter extends UserTabBaseAdapter { diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoCarAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoCarAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoCarAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoCarAdapter.java index 6474b7ee3..b2f2523fc 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoCarAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoCarAdapter.java @@ -1,18 +1,18 @@ -package com.yizhuan.erban.ui.user.adapter; +package com.mango.moshen.ui.user.adapter; import android.content.Context; import android.widget.ImageView; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bean.CarButtonInfo; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.bean.CarButtonInfo; +import com.mango.core.bean.UserInfoItem; +import com.mango.core.decoration.car.bean.CarInfo; import java.util.List; -import static com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo.STATUS_OFF_SHELF; -import static com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo.STATUS_OUT_OF_DATE; +import static com.mango.core.decoration.car.bean.CarInfo.STATUS_OFF_SHELF; +import static com.mango.core.decoration.car.bean.CarInfo.STATUS_OUT_OF_DATE; public class UserInfoCarAdapter extends UserTabBaseAdapter { diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoDynamicAdapter.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoDynamicAdapter.java index 646c133d2..7d944f865 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoDynamicAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user.adapter; +package com.mango.moshen.ui.user.adapter; import android.app.Activity; @@ -17,28 +17,27 @@ import androidx.recyclerview.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.coorchice.library.utils.LogUtils; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity; -import com.yizhuan.erban.community.helper.CalcSize; -import com.yizhuan.erban.community.helper.DynamicUiHelper; -import com.yizhuan.erban.community.helper.ImageUiHelper; -import com.yizhuan.erban.community.photo.BigPhotoActivity; -import com.yizhuan.erban.community.photo.DynamicImageAdapter; -import com.yizhuan.erban.community.photo.PagerOption; -import com.yizhuan.erban.community.utils.ObjectTypeHelper; -import com.yizhuan.erban.community.widget.ExpandableTextView; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.utils.TimeUiUtils; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.community.dynamic.view.DynamicDetailActivity; +import com.mango.moshen.community.helper.CalcSize; +import com.mango.moshen.community.helper.DynamicUiHelper; +import com.mango.moshen.community.helper.ImageUiHelper; +import com.mango.moshen.community.photo.BigPhotoActivity; +import com.mango.moshen.community.photo.DynamicImageAdapter; +import com.mango.moshen.community.photo.PagerOption; +import com.mango.moshen.community.utils.ObjectTypeHelper; +import com.mango.moshen.community.widget.ExpandableTextView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.utils.TimeUiUtils; +import com.mango.core.community.bean.DynamicMedia; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.core.community.dynamic.DynamicModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoIndicatorAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoIndicatorAdapter.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoIndicatorAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoIndicatorAdapter.java index 2fd2c59df..95a52df9c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoIndicatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user.adapter; +package com.mango.moshen.ui.user.adapter; import android.content.Context; import android.graphics.Color; @@ -9,13 +9,13 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; -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.mango.moshen.R; +import com.mango.moshen.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoPagerAdapter.kt b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoPagerAdapter.kt similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoPagerAdapter.kt rename to app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoPagerAdapter.kt index 52f4c05f8..4c8890027 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoPagerAdapter.kt +++ b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoPagerAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user.adapter +package com.mango.moshen.ui.user.adapter import android.annotation.SuppressLint import androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoPhotoAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoPhotoAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoPhotoAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoPhotoAdapter.java index 02c358744..21b745d75 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoPhotoAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoPhotoAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user.adapter; +package com.mango.moshen.ui.user.adapter; import android.content.Context; import android.content.Intent; @@ -7,12 +7,12 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.user.ShowPhotoActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper; -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; +import com.mango.moshen.R; +import com.mango.moshen.ui.user.ShowPhotoActivity; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper; +import com.mango.core.user.bean.UserDetailInfo; +import com.mango.core.user.bean.UserPhoto; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserJoinWorldAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserJoinWorldAdapter.java similarity index 73% rename from app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserJoinWorldAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/adapter/UserJoinWorldAdapter.java index 0b5bb9b86..7a5d7e34a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserJoinWorldAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserJoinWorldAdapter.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.ui.user.adapter; +package com.mango.moshen.ui.user.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.RectRoundImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.user.bean.JoinWorldInfo; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.RectRoundImageView; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.core.user.bean.JoinWorldInfo; public class UserJoinWorldAdapter extends BaseQuickAdapter { diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserTabBaseAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserTabBaseAdapter.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserTabBaseAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/adapter/UserTabBaseAdapter.java index 5f3527680..2f81a4246 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserTabBaseAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserTabBaseAdapter.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.ui.user.adapter; +package com.mango.moshen.ui.user.adapter; import android.content.Context; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bean.GiftTitleInfo; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; +import com.mango.moshen.R; +import com.mango.core.bean.GiftTitleInfo; +import com.mango.core.bean.UserInfoItem; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSAttentionFragment.java b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSAttentionFragment.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSAttentionFragment.java rename to app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSAttentionFragment.java index 9b1cfa0b8..7c828c6e2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSAttentionFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSAttentionFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user.decorationsend; +package com.mango.moshen.ui.user.decorationsend; import android.app.Activity; import android.os.Bundle; @@ -7,15 +7,15 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseFragment; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.praise.event.PraiseEvent; +import com.mango.core.user.AttentionModel; +import com.mango.core.user.bean.AttentionInfo; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -26,7 +26,7 @@ import java.util.List; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; -import static com.yizhuan.erban.R.id.swipe_refresh; +import static com.mango.moshen.R.id.swipe_refresh; public class DSAttentionFragment extends BaseFragment { public static final String TAG = "AttentionFragment"; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSAttentionListAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSAttentionListAdapter.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSAttentionListAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSAttentionListAdapter.java index a4382bbc1..1b4cce387 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSAttentionListAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSAttentionListAdapter.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.ui.user.decorationsend; +package com.mango.moshen.ui.user.decorationsend; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.noble.NobleInfo; +import com.mango.core.user.bean.AttentionInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSBaseListAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSBaseListAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSBaseListAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSBaseListAdapter.java index db15242db..eb41afcb9 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSBaseListAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSBaseListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user.decorationsend; +package com.mango.moshen.ui.user.decorationsend; import androidx.appcompat.widget.AppCompatImageView; import android.text.TextUtils; @@ -7,12 +7,12 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.NobleAvatarView; +import com.mango.core.level.UserLevelVo; +import com.mango.core.noble.NobleInfo; +import com.mango.core.noble.NobleUtil; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSFansListFragment.java b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSFansListFragment.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSFansListFragment.java rename to app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSFansListFragment.java index 4af533bcb..601877613 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSFansListFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSFansListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user.decorationsend; +package com.mango.moshen.ui.user.decorationsend; import android.app.Activity; import android.content.Context; @@ -8,17 +8,17 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.praise.event.PraiseEvent; +import com.mango.core.user.AttentionModel; +import com.mango.core.user.bean.FansInfo; +import com.mango.core.user.bean.FansListInfo; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSFansViewAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSFansViewAdapter.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSFansViewAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSFansViewAdapter.java index 9665f756f..2cef234fc 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSFansViewAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSFansViewAdapter.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.ui.user.decorationsend; +package com.mango.moshen.ui.user.decorationsend; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.noble.NobleInfo; +import com.mango.core.user.bean.FansInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSFriendListAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSFriendListAdapter.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSFriendListAdapter.java rename to app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSFriendListAdapter.java index b4f5b5f17..649632f5f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSFriendListAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSFriendListAdapter.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.ui.user.decorationsend; +package com.mango.moshen.ui.user.decorationsend; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.noble.NobleInfo; +import com.mango.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSFriendListFragment.java b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSFriendListFragment.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSFriendListFragment.java rename to app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSFriendListFragment.java index 30565b985..40c054115 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DSFriendListFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DSFriendListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user.decorationsend; +package com.mango.moshen.ui.user.decorationsend; import android.app.Activity; import android.os.Bundle; @@ -7,15 +7,15 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RelationShipEvent; -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.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseFragment; +import com.mango.core.im.friend.IMFriendModel; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RelationShipEvent; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DecorationSendActivity.java b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DecorationSendActivity.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DecorationSendActivity.java rename to app/src/main/java/com/mango/moshen/ui/user/decorationsend/DecorationSendActivity.java index dce7e2f6b..61bba65b5 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/DecorationSendActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/DecorationSendActivity.java @@ -1,26 +1,26 @@ -package com.yizhuan.erban.ui.user.decorationsend; +package com.mango.moshen.ui.user.decorationsend; import android.content.Context; import android.content.Intent; import androidx.fragment.app.Fragment; import android.view.View; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.common.ViewPagerAdapter; -import com.yizhuan.erban.databinding.ActivityDecorationSendBinding; -import com.yizhuan.erban.decoration.helper.DecorationDialogHelper; -import com.yizhuan.erban.decoration.helper.DecorationSaleType; -import com.yizhuan.erban.decoration.view.widgets.CarMagicIndicator; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.ui.search.SearchActivity; -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.common.ViewPagerAdapter; +import com.mango.moshen.databinding.ActivityDecorationSendBinding; +import com.mango.moshen.decoration.helper.DecorationDialogHelper; +import com.mango.moshen.decoration.helper.DecorationSaleType; +import com.mango.moshen.decoration.view.widgets.CarMagicIndicator; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.ui.search.SearchActivity; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.home.bean.TabInfo; +import com.mango.xchat_android_library.annatation.ActLayoutRes; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/UserInfoSkillDecoration.kt b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/UserInfoSkillDecoration.kt similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/UserInfoSkillDecoration.kt rename to app/src/main/java/com/mango/moshen/ui/user/decorationsend/UserInfoSkillDecoration.kt index 77d1b1f65..202daea6a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/decorationsend/UserInfoSkillDecoration.kt +++ b/app/src/main/java/com/mango/moshen/ui/user/decorationsend/UserInfoSkillDecoration.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.ui.user.decorationsend +package com.mango.moshen.ui.user.decorationsend import android.content.Context import android.graphics.Rect import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil class UserInfoSkillDecoration(context: Context, space: Int) : RecyclerView.ItemDecoration() { private val spaceDp = UIUtil.dip2px(context, space.toDouble()) diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoDynamicFragment.kt b/app/src/main/java/com/mango/moshen/ui/user/view/UserInfoDynamicFragment.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoDynamicFragment.kt rename to app/src/main/java/com/mango/moshen/ui/user/view/UserInfoDynamicFragment.kt index 3d04c940c..dcc87205b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoDynamicFragment.kt +++ b/app/src/main/java/com/mango/moshen/ui/user/view/UserInfoDynamicFragment.kt @@ -1,30 +1,30 @@ -package com.yizhuan.erban.ui.user.view +package com.mango.moshen.ui.user.view import android.view.View import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager import com.trello.rxlifecycle3.android.FragmentEvent -import com.yizhuan.erban.R -import com.yizhuan.erban.UIHelper -import com.yizhuan.erban.base.BaseViewBindingFragment -import com.yizhuan.erban.common.widget.dialog.DialogManager.OkCancelDialogListener -import com.yizhuan.erban.community.helper.ShareDynamicHelper -import com.yizhuan.erban.databinding.FragmentUserinfoDynamicBinding -import com.yizhuan.erban.ui.user.adapter.UserInfoDynamicAdapter -import com.yizhuan.erban.ui.user.viewmodel.UserInfoViewModel -import com.yizhuan.erban.ui.widget.ButtonItem -import com.yizhuan.xchat_android_constants.XChatConstants -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel -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.UserDetailInfo -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.UIHelper +import com.mango.moshen.base.BaseViewBindingFragment +import com.mango.moshen.common.widget.dialog.DialogManager.OkCancelDialogListener +import com.mango.moshen.community.helper.ShareDynamicHelper +import com.mango.moshen.databinding.FragmentUserinfoDynamicBinding +import com.mango.moshen.ui.user.adapter.UserInfoDynamicAdapter +import com.mango.moshen.ui.user.viewmodel.UserInfoViewModel +import com.mango.moshen.ui.widget.ButtonItem +import com.mango.xchat_android_constants.XChatConstants +import com.mango.core.community.bean.WorldDynamicBean +import com.mango.core.community.dynamic.DynamicModel +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.core.user.UserModel +import com.mango.core.user.bean.UserDetailInfo +import com.mango.core.utils.net.DontWarnObserver +import com.mango.xchat_android_library.annatation.ActLayoutRes import java.util.ArrayList -import com.yizhuan.xchat_android_core.auth.AuthModel +import com.mango.core.auth.AuthModel @ActLayoutRes(R.layout.fragment_userinfo_dynamic) class UserInfoDynamicFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoInfoFragment.kt b/app/src/main/java/com/mango/moshen/ui/user/view/UserInfoInfoFragment.kt similarity index 81% rename from app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoInfoFragment.kt rename to app/src/main/java/com/mango/moshen/ui/user/view/UserInfoInfoFragment.kt index 54c36aa35..993a0c973 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoInfoFragment.kt +++ b/app/src/main/java/com/mango/moshen/ui/user/view/UserInfoInfoFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.user.view +package com.mango.moshen.ui.user.view import android.annotation.SuppressLint import android.content.Intent @@ -16,38 +16,37 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.viewpager.widget.ViewPager import androidx.viewpager.widget.ViewPager.OnPageChangeListener import com.netease.nim.uikit.support.glide.GlideApp -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseViewBindingFragment -import com.yizhuan.erban.databinding.FragmentUserinfoUserinfoBinding -import com.yizhuan.erban.module_hall.HallDataManager -import com.yizhuan.erban.module_hall.hall.activity.ModuleClanActivity -import com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity -import com.yizhuan.erban.skill.activity.SkillHomeActivity -import com.yizhuan.erban.skill.activity.SkillHomeActivity.Companion.PAGE_TYPE_CUSTOM -import com.yizhuan.erban.skill.activity.SkillHomeActivity.Companion.PAGE_TYPE_SELF -import com.yizhuan.erban.ui.user.UserGiftActivity -import com.yizhuan.erban.ui.user.UserInfoActivity -import com.yizhuan.erban.ui.user.UserInfoGiftFragment -import com.yizhuan.erban.ui.user.adapter.GiftAdapter -import com.yizhuan.erban.ui.user.adapter.SkillCardAdapter -import com.yizhuan.erban.ui.user.adapter.UserInfoIndicatorAdapter -import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter -import com.yizhuan.erban.ui.user.decorationsend.UserInfoSkillDecoration -import com.yizhuan.erban.ui.user.viewmodel.UserInfoViewModel -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.auth.AuthModel -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo.DataBean.UserGiftWallBean -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity -import com.yizhuan.xchat_android_core.utils.net.BeanObserver -import com.yizhuan.xchat_android_core.utils.net.RxHelper -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.base.BaseViewBindingFragment +import com.mango.moshen.databinding.FragmentUserinfoUserinfoBinding +import com.mango.moshen.module_hall.HallDataManager +import com.mango.moshen.module_hall.hall.activity.ModuleClanActivity +import com.mango.moshen.module_hall.hall.activity.ModuleHallActivity +import com.mango.moshen.skill.activity.SkillHomeActivity +import com.mango.moshen.skill.activity.SkillHomeActivity.Companion.PAGE_TYPE_CUSTOM +import com.mango.moshen.skill.activity.SkillHomeActivity.Companion.PAGE_TYPE_SELF +import com.mango.moshen.ui.user.UserGiftActivity +import com.mango.moshen.ui.user.UserInfoActivity +import com.mango.moshen.ui.user.UserInfoGiftFragment +import com.mango.moshen.ui.user.adapter.GiftAdapter +import com.mango.moshen.ui.user.adapter.SkillCardAdapter +import com.mango.moshen.ui.user.adapter.UserInfoIndicatorAdapter +import com.mango.moshen.ui.user.adapter.UserInfoPagerAdapter +import com.mango.moshen.ui.user.decorationsend.UserInfoSkillDecoration +import com.mango.moshen.ui.user.viewmodel.UserInfoViewModel +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.mango.core.auth.AuthModel +import com.mango.core.module_hall.hall.HallModel +import com.mango.core.module_hall.hall.bean.ClanAndHallInfo +import com.mango.core.module_hall.hall.bean.ClanInfo +import com.mango.core.module_hall.hall.bean.HallInfo +import com.mango.core.user.bean.UserInfoSkillEntity +import com.mango.core.utils.net.BeanObserver +import com.mango.core.utils.net.RxHelper +import com.mango.xchat_android_library.annatation.ActLayoutRes @ActLayoutRes(R.layout.fragment_userinfo_userinfo) diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/viewmodel/UserInfoViewModel.kt b/app/src/main/java/com/mango/moshen/ui/user/viewmodel/UserInfoViewModel.kt similarity index 80% rename from app/src/main/java/com/yizhuan/erban/ui/user/viewmodel/UserInfoViewModel.kt rename to app/src/main/java/com/mango/moshen/ui/user/viewmodel/UserInfoViewModel.kt index c4329609d..aaf4f510e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/viewmodel/UserInfoViewModel.kt +++ b/app/src/main/java/com/mango/moshen/ui/user/viewmodel/UserInfoViewModel.kt @@ -1,18 +1,18 @@ -package com.yizhuan.erban.ui.user.viewmodel +package com.mango.moshen.ui.user.viewmodel import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import com.yizhuan.erban.skill.repository.SkillModel -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo -import com.yizhuan.xchat_android_core.user.UserInfoUiMgr -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity -import com.yizhuan.xchat_android_core.utils.net.BeanObserver -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.skill.repository.SkillModel +import com.mango.core.module_hall.hall.HallModel +import com.mango.core.module_hall.hall.bean.ClanAndHallInfo +import com.mango.core.user.UserInfoUiMgr +import com.mango.core.user.UserModel +import com.mango.core.user.bean.UserDetailInfo +import com.mango.core.user.bean.UserInfoSkillEntity +import com.mango.core.utils.net.BeanObserver +import com.mango.core.utils.toast import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/erban/ui/utils/ArrayUtils.java b/app/src/main/java/com/mango/moshen/ui/utils/ArrayUtils.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/utils/ArrayUtils.java rename to app/src/main/java/com/mango/moshen/ui/utils/ArrayUtils.java index cb3498997..269056934 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/utils/ArrayUtils.java +++ b/app/src/main/java/com/mango/moshen/ui/utils/ArrayUtils.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.ui.utils; +package com.mango.moshen.ui.utils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.log.MLog; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/yizhuan/erban/ui/utils/DesignUtils.java b/app/src/main/java/com/mango/moshen/ui/utils/DesignUtils.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/utils/DesignUtils.java rename to app/src/main/java/com/mango/moshen/ui/utils/DesignUtils.java index 4edcd3f34..d48ef0b54 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/utils/DesignUtils.java +++ b/app/src/main/java/com/mango/moshen/ui/utils/DesignUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.utils; +package com.mango.moshen.ui.utils; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/ui/utils/GlideCacheUtil.java b/app/src/main/java/com/mango/moshen/ui/utils/GlideCacheUtil.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/utils/GlideCacheUtil.java rename to app/src/main/java/com/mango/moshen/ui/utils/GlideCacheUtil.java index 6cda46dfb..675e7452f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/utils/GlideCacheUtil.java +++ b/app/src/main/java/com/mango/moshen/ui/utils/GlideCacheUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.utils; +package com.mango.moshen.ui.utils; import android.content.Context; import android.os.Looper; diff --git a/app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoad.kt b/app/src/main/java/com/mango/moshen/ui/utils/ImageLoad.kt similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoad.kt rename to app/src/main/java/com/mango/moshen/ui/utils/ImageLoad.kt index 6ec8958ce..55471c118 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoad.kt +++ b/app/src/main/java/com/mango/moshen/ui/utils/ImageLoad.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.utils +package com.mango.moshen.ui.utils import android.app.Activity import android.app.Application @@ -24,8 +24,8 @@ import com.opensource.svgaplayer.SVGAParser import com.opensource.svgaplayer.SVGAVideoEntity import com.tencent.qgame.animplayer.AnimView import com.tencent.qgame.animplayer.util.ScaleType -import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.utils.LogUtils +import com.mango.moshen.R +import com.mango.core.utils.LogUtils import java.io.File import java.net.MalformedURLException import java.net.URL diff --git a/app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoadUtils.java b/app/src/main/java/com/mango/moshen/ui/utils/ImageLoadUtils.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoadUtils.java rename to app/src/main/java/com/mango/moshen/ui/utils/ImageLoadUtils.java index 0a09b658d..50c1d6626 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoadUtils.java +++ b/app/src/main/java/com/mango/moshen/ui/utils/ImageLoadUtils.java @@ -1,11 +1,7 @@ -package com.yizhuan.erban.ui.utils; +package com.mango.moshen.ui.utils; import android.content.Context; import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.NinePatch; -import android.graphics.Rect; -import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import androidx.annotation.DrawableRes; @@ -14,7 +10,6 @@ import androidx.annotation.Nullable; import android.graphics.drawable.NinePatchDrawable; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.ImageView; @@ -27,31 +22,20 @@ import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.CustomTarget; -import com.bumptech.glide.request.target.CustomViewTarget; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.target.Target; -import com.bumptech.glide.request.target.ViewTarget; import com.bumptech.glide.request.transition.Transition; import com.netease.nim.uikit.common.util.string.StringUtil; import com.netease.nim.uikit.support.glide.GlideApp; -import com.tencent.qgame.animplayer.AnimConfig; import com.tencent.qgame.animplayer.AnimView; -import com.tencent.qgame.animplayer.inter.IAnimListener; import com.tencent.qgame.animplayer.util.ScaleType; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.utils.BlurTransformation; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.utils.SystemUtils; -import com.yizhuan.xchat_android_library.utils.codec.MD5Utils; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.utils.BlurTransformation; +import com.mango.core.utils.LogUtils; +import com.mango.core.utils.SystemUtils; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.concurrent.ExecutionException; import io.reactivex.Single; diff --git a/app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoadUtilsV2.java b/app/src/main/java/com/mango/moshen/ui/utils/ImageLoadUtilsV2.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoadUtilsV2.java rename to app/src/main/java/com/mango/moshen/ui/utils/ImageLoadUtilsV2.java index 4210342c2..2893039de 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoadUtilsV2.java +++ b/app/src/main/java/com/mango/moshen/ui/utils/ImageLoadUtilsV2.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.utils; +package com.mango.moshen.ui.utils; import android.app.Activity; import android.content.Context; @@ -13,8 +13,8 @@ import com.bumptech.glide.request.RequestOptions; import com.netease.nim.uikit.support.glide.GlideApp; import com.netease.nim.uikit.support.glide.GlideRequest; import com.netease.nim.uikit.support.glide.GlideRequests; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; /** * create by lvzebiao @2019/7/26 diff --git a/app/src/main/java/com/yizhuan/erban/ui/utils/NinePatchBitmapFactory.java b/app/src/main/java/com/mango/moshen/ui/utils/NinePatchBitmapFactory.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/utils/NinePatchBitmapFactory.java rename to app/src/main/java/com/mango/moshen/ui/utils/NinePatchBitmapFactory.java index b29027e7d..a296258f0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/utils/NinePatchBitmapFactory.java +++ b/app/src/main/java/com/mango/moshen/ui/utils/NinePatchBitmapFactory.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.utils; +package com.mango.moshen.ui.utils; import android.content.res.Resources; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/yizhuan/erban/ui/utils/RVDelegate.java b/app/src/main/java/com/mango/moshen/ui/utils/RVDelegate.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/utils/RVDelegate.java rename to app/src/main/java/com/mango/moshen/ui/utils/RVDelegate.java index 6f144f630..15c11b4be 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/utils/RVDelegate.java +++ b/app/src/main/java/com/mango/moshen/ui/utils/RVDelegate.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.utils; +package com.mango.moshen.ui.utils; import android.view.View; @@ -8,11 +8,11 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.common.util.sys.NetworkUtil; -import com.yizhuan.erban.base.IDataStatus; -import com.yizhuan.erban.common.EmptyViewHelper; -import com.yizhuan.xchat_android_core.bean.response.ListResult; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.base.IDataStatus; +import com.mango.moshen.common.EmptyViewHelper; +import com.mango.core.bean.response.ListResult; +import com.mango.core.utils.LogUtils; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/utils/SurfaceViewAnimation.java b/app/src/main/java/com/mango/moshen/ui/utils/SurfaceViewAnimation.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/utils/SurfaceViewAnimation.java rename to app/src/main/java/com/mango/moshen/ui/utils/SurfaceViewAnimation.java index 44d5d2f7b..a2596a5e3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/utils/SurfaceViewAnimation.java +++ b/app/src/main/java/com/mango/moshen/ui/utils/SurfaceViewAnimation.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.utils; +package com.mango.moshen.ui.utils; import android.content.res.AssetManager; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/yizhuan/erban/ui/utils/sys/InstallUtil.java b/app/src/main/java/com/mango/moshen/ui/utils/sys/InstallUtil.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/utils/sys/InstallUtil.java rename to app/src/main/java/com/mango/moshen/ui/utils/sys/InstallUtil.java index 49d00ad50..934989b9b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/utils/sys/InstallUtil.java +++ b/app/src/main/java/com/mango/moshen/ui/utils/sys/InstallUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.utils.sys; +package com.mango.moshen.ui.utils.sys; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/com/mango/moshen/ui/utils/sys/PermissionUtil.kt b/app/src/main/java/com/mango/moshen/ui/utils/sys/PermissionUtil.kt new file mode 100644 index 000000000..3d6e791a7 --- /dev/null +++ b/app/src/main/java/com/mango/moshen/ui/utils/sys/PermissionUtil.kt @@ -0,0 +1,4 @@ +package com.mango.moshen.ui.utils.sys + +class PermissionUtil { +} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/ui/wallet/ExchangeGoldActivity.java b/app/src/main/java/com/mango/moshen/ui/wallet/ExchangeGoldActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/wallet/ExchangeGoldActivity.java rename to app/src/main/java/com/mango/moshen/ui/wallet/ExchangeGoldActivity.java index 23db312b0..ef8276906 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/wallet/ExchangeGoldActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/wallet/ExchangeGoldActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.wallet; +package com.mango.moshen.ui.wallet; import android.content.Context; import android.content.Intent; @@ -12,14 +12,14 @@ import android.widget.EditText; import android.widget.TextView; import com.netease.nim.uikit.common.util.string.StringUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.ui.widget.password.PassWordFragment; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.utils.FormatUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.ui.widget.password.PassWordFragment; +import com.mango.core.pay.PayModel; +import com.mango.core.pay.bean.WalletInfo; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.utils.FormatUtils; /** * @author chenran diff --git a/app/src/main/java/com/yizhuan/erban/ui/wallet/adapter/WithdrawJewelAdapter.java b/app/src/main/java/com/mango/moshen/ui/wallet/adapter/WithdrawJewelAdapter.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/wallet/adapter/WithdrawJewelAdapter.java rename to app/src/main/java/com/mango/moshen/ui/wallet/adapter/WithdrawJewelAdapter.java index 55bd91fa2..10741d00e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/wallet/adapter/WithdrawJewelAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/wallet/adapter/WithdrawJewelAdapter.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.ui.wallet.adapter; +package com.mango.moshen.ui.wallet.adapter; import android.widget.LinearLayout; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrwaListInfo; +import com.mango.moshen.R; +import com.mango.core.withdraw.bean.WithdrwaListInfo; /** *

钻石提现界面

diff --git a/app/src/main/java/com/yizhuan/erban/ui/wallet/adapter/WithdrawRedListAdapter.java b/app/src/main/java/com/mango/moshen/ui/wallet/adapter/WithdrawRedListAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/ui/wallet/adapter/WithdrawRedListAdapter.java rename to app/src/main/java/com/mango/moshen/ui/wallet/adapter/WithdrawRedListAdapter.java index e9522f6ae..280ec9c8a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/wallet/adapter/WithdrawRedListAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/wallet/adapter/WithdrawRedListAdapter.java @@ -1,13 +1,12 @@ -package com.yizhuan.erban.ui.wallet.adapter; +package com.mango.moshen.ui.wallet.adapter; -import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedListInfo; +import com.mango.moshen.R; +import com.mango.core.redPacket.bean.WithdrawRedListInfo; /** *

红包提现展示列表

diff --git a/app/src/main/java/com/yizhuan/erban/ui/wallet/sendgold/SendGoldActivity.java b/app/src/main/java/com/mango/moshen/ui/wallet/sendgold/SendGoldActivity.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/wallet/sendgold/SendGoldActivity.java rename to app/src/main/java/com/mango/moshen/ui/wallet/sendgold/SendGoldActivity.java index ef2471a6d..fe8dfe52e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/wallet/sendgold/SendGoldActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/wallet/sendgold/SendGoldActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.wallet.sendgold; +package com.mango.moshen.ui.wallet.sendgold; import android.content.Context; import android.content.Intent; @@ -17,30 +17,30 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.bills.activities.ChargeBillsActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.TextWatcherSimple; -import com.yizhuan.erban.ui.widget.password.PassWordFragment; -import com.yizhuan.erban.ui.widget.password.PasswordEvent; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.GridSpacingItemDecoration; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.erban.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.pay.GoldGiveModel; -import com.yizhuan.xchat_android_core.pay.IGoldGiveModel; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.GiveInfo; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent; -import com.yizhuan.xchat_android_core.pay.event.SendGoldSuccessEvent; -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_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.bills.activities.ChargeBillsActivity; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.TextWatcherSimple; +import com.mango.moshen.ui.widget.password.PassWordFragment; +import com.mango.moshen.ui.widget.password.PasswordEvent; +import com.mango.moshen.ui.widget.recyclerview.decoration.GridSpacingItemDecoration; +import com.mango.moshen.utils.RegexUtil; +import com.mango.moshen.utils.SpannableBuilder; +import com.mango.core.auth.AuthModel; +import com.mango.core.pay.GoldGiveModel; +import com.mango.core.pay.IGoldGiveModel; +import com.mango.core.pay.PayModel; +import com.mango.core.pay.bean.GiveInfo; +import com.mango.core.pay.bean.WalletInfo; +import com.mango.core.pay.event.GetWalletInfoEvent; +import com.mango.core.pay.event.SendGoldSuccessEvent; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/wallet/sendgold/SendGoldListAdpater.java b/app/src/main/java/com/mango/moshen/ui/wallet/sendgold/SendGoldListAdpater.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/wallet/sendgold/SendGoldListAdpater.java rename to app/src/main/java/com/mango/moshen/ui/wallet/sendgold/SendGoldListAdpater.java index c59cd918a..21339c162 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/wallet/sendgold/SendGoldListAdpater.java +++ b/app/src/main/java/com/mango/moshen/ui/wallet/sendgold/SendGoldListAdpater.java @@ -1,14 +1,12 @@ -package com.yizhuan.erban.ui.wallet.sendgold; - -import androidx.annotation.Nullable; +package com.mango.moshen.ui.wallet.sendgold; import android.widget.ImageView; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.pay.bean.GiveInfo; +import com.mango.moshen.R; +import com.mango.core.pay.bean.GiveInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java b/app/src/main/java/com/mango/moshen/ui/webview/CommonWebViewActivity.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java rename to app/src/main/java/com/mango/moshen/ui/webview/CommonWebViewActivity.java index 8275c3c63..4e310d1df 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/webview/CommonWebViewActivity.java @@ -1,9 +1,8 @@ -package com.yizhuan.erban.ui.webview; +package com.mango.moshen.ui.webview; import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.Activity; -import android.app.AlertDialog; import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; @@ -34,22 +33,22 @@ import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.common.util.string.StringUtil; import com.orhanobut.logger.Logger; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.application.XChatApplication; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.common.widget.dialog.BaseAlertDialogBuilder; -import com.yizhuan.erban.ui.im.RouterHandler; -import com.yizhuan.erban.ui.webview.event.ShowNavEvent; -import com.yizhuan.erban.ui.webview.event.TaroPayResultEvent; -import com.yizhuan.erban.ui.widget.ShareDialog; -import com.yizhuan.erban.utils.WebViewUtils; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.certification.event.CertificationResultEvent; -import com.yizhuan.xchat_android_core.share.ShareModel; -import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo; -import com.yizhuan.xchat_android_core.web.event.WebViewRefreshEvent; -import com.yizhuan.xchat_android_library.rxbus.RxBus; +import com.mango.moshen.R; +import com.mango.moshen.application.XChatApplication; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.common.widget.dialog.BaseAlertDialogBuilder; +import com.mango.moshen.ui.im.RouterHandler; +import com.mango.moshen.ui.webview.event.ShowNavEvent; +import com.mango.moshen.ui.webview.event.TaroPayResultEvent; +import com.mango.moshen.ui.widget.ShareDialog; +import com.mango.moshen.utils.WebViewUtils; +import com.mango.core.Constants; +import com.mango.core.UriProvider; +import com.mango.core.certification.event.CertificationResultEvent; +import com.mango.core.share.ShareModel; +import com.mango.core.web.bean.WebJsBeanInfo; +import com.mango.core.web.event.WebViewRefreshEvent; +import com.mango.xchat_android_library.rxbus.RxBus; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewFragment.java b/app/src/main/java/com/mango/moshen/ui/webview/CommonWebViewFragment.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewFragment.java rename to app/src/main/java/com/mango/moshen/ui/webview/CommonWebViewFragment.java index 0eec5fd5c..82d02fe4c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/webview/CommonWebViewFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.webview; +package com.mango.moshen.ui.webview; import android.content.Intent; import android.net.Uri; @@ -11,11 +11,11 @@ import android.webkit.WebView; import android.webkit.WebViewClient; import com.orhanobut.logger.Logger; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingFragment; -import com.yizhuan.erban.common.widget.dialog.BaseAlertDialogBuilder; -import com.yizhuan.erban.databinding.FragmentCommonWebViewBinding; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingFragment; +import com.mango.moshen.common.widget.dialog.BaseAlertDialogBuilder; +import com.mango.moshen.databinding.FragmentCommonWebViewBinding; +import com.mango.xchat_android_library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.fragment_common_web_view) public class CommonWebViewFragment extends BaseBindingFragment { diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/DatingRuleWebViewActivity.java b/app/src/main/java/com/mango/moshen/ui/webview/DatingRuleWebViewActivity.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/webview/DatingRuleWebViewActivity.java rename to app/src/main/java/com/mango/moshen/ui/webview/DatingRuleWebViewActivity.java index d59b42961..fcaeb5fc8 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/DatingRuleWebViewActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/webview/DatingRuleWebViewActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.webview; +package com.mango.moshen.ui.webview; import android.content.Context; import android.content.Intent; @@ -7,7 +7,7 @@ import android.view.Gravity; import android.view.WindowManager; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; +import com.mango.moshen.R; public class DatingRuleWebViewActivity extends CommonWebViewActivity { diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/DialogWebViewActivity.java b/app/src/main/java/com/mango/moshen/ui/webview/DialogWebViewActivity.java similarity index 80% rename from app/src/main/java/com/yizhuan/erban/ui/webview/DialogWebViewActivity.java rename to app/src/main/java/com/mango/moshen/ui/webview/DialogWebViewActivity.java index b24d5b09f..3ca5ebf49 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/DialogWebViewActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/webview/DialogWebViewActivity.java @@ -1,22 +1,14 @@ -package com.yizhuan.erban.ui.webview; +package com.mango.moshen.ui.webview; import android.content.Context; import android.content.Intent; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.text.TextUtils; import android.view.Gravity; import android.view.View; import android.view.WindowManager; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.Constants; - -import java.util.HashMap; -import java.util.Map; +import com.mango.moshen.R; public class DialogWebViewActivity extends CommonWebViewActivity { diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java b/app/src/main/java/com/mango/moshen/ui/webview/JSInterface.java similarity index 87% rename from app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java rename to app/src/main/java/com/mango/moshen/ui/webview/JSInterface.java index c5f341ed6..80d85cdf0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java +++ b/app/src/main/java/com/mango/moshen/ui/webview/JSInterface.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.webview; +package com.mango.moshen.ui.webview; import android.content.ClipData; import android.content.ClipboardManager; @@ -20,41 +20,41 @@ import com.alibaba.security.realidentity.RPVerify; import com.netease.nim.uikit.common.util.log.LogUtil; import com.orhanobut.logger.Logger; import com.umeng.commonsdk.statistics.common.DeviceConfig; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.decoration.view.DecorationStoreActivity; -import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; -import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity; -import com.yizhuan.erban.ui.im.RouterHandler; -import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.erban.ui.webview.event.H5NotifyClientEvent; -import com.yizhuan.erban.ui.webview.event.ShowNavEvent; -import com.yizhuan.erban.ui.webview.event.TaroPayResultEvent; -import com.yizhuan.erban.ui.widget.ShareDialog; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.certification.event.CertificationResultEvent; -import com.yizhuan.xchat_android_core.decoration.bean.DecorationStoreRouterType; -import com.yizhuan.xchat_android_core.file.FileModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -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.web.bean.WebJsBeanInfo; -import com.yizhuan.xchat_android_library.record.AuditRecorderConfiguration; -import com.yizhuan.xchat_android_library.record.ExtAudioRecorder; -import com.yizhuan.xchat_android_library.rxbus.RxBus; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.AppUtils; -import com.yizhuan.xchat_android_library.utils.DeviceUuidFactory; -import com.yizhuan.xchat_android_library.utils.SystemUtils; -import com.yizhuan.xchat_android_library.utils.VersionUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.UIHelper; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.decoration.view.DecorationStoreActivity; +import com.mango.moshen.family.view.activity.FamilyHomeActivity; +import com.mango.moshen.public_chat_hall.activity.PublicChatHallHomeActivity; +import com.mango.moshen.ui.im.RouterHandler; +import com.mango.moshen.ui.im.avtivity.NimP2PMessageActivity; +import com.mango.moshen.ui.pay.ChargeActivity; +import com.mango.moshen.ui.webview.event.H5NotifyClientEvent; +import com.mango.moshen.ui.webview.event.ShowNavEvent; +import com.mango.moshen.ui.webview.event.TaroPayResultEvent; +import com.mango.moshen.ui.widget.ShareDialog; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.auth.AuthModel; +import com.mango.core.certification.event.CertificationResultEvent; +import com.mango.core.decoration.bean.DecorationStoreRouterType; +import com.mango.core.file.FileModel; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.market_verify.MarketVerifyModel; +import com.mango.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.web.bean.WebJsBeanInfo; +import com.mango.xchat_android_library.record.AuditRecorderConfiguration; +import com.mango.xchat_android_library.record.ExtAudioRecorder; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_library.utils.AppMetaDataUtil; +import com.mango.xchat_android_library.utils.AppUtils; +import com.mango.xchat_android_library.utils.DeviceUuidFactory; +import com.mango.xchat_android_library.utils.SystemUtils; +import com.mango.xchat_android_library.utils.VersionUtil; +import com.mango.xchat_android_library.utils.config.BasicConfig; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/ShareH5Event.java b/app/src/main/java/com/mango/moshen/ui/webview/ShareH5Event.java similarity index 77% rename from app/src/main/java/com/yizhuan/erban/ui/webview/ShareH5Event.java rename to app/src/main/java/com/mango/moshen/ui/webview/ShareH5Event.java index 1f65511f9..6e3d2ff11 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/ShareH5Event.java +++ b/app/src/main/java/com/mango/moshen/ui/webview/ShareH5Event.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.ui.webview; +package com.mango.moshen.ui.webview; -import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo; +import com.mango.core.web.bean.WebJsBeanInfo; /** * Created by MadisonRong on 26/06/2018. diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/SimpleJSInterface.java b/app/src/main/java/com/mango/moshen/ui/webview/SimpleJSInterface.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/ui/webview/SimpleJSInterface.java rename to app/src/main/java/com/mango/moshen/ui/webview/SimpleJSInterface.java index 70a70716e..e53774cd4 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/SimpleJSInterface.java +++ b/app/src/main/java/com/mango/moshen/ui/webview/SimpleJSInterface.java @@ -1,9 +1,7 @@ -package com.yizhuan.erban.ui.webview; +package com.mango.moshen.ui.webview; import android.app.Activity; import android.content.Context; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; import android.text.TextUtils; import android.util.Log; import android.webkit.JavascriptInterface; @@ -11,12 +9,10 @@ import android.webkit.JavascriptInterface; import com.alibaba.fastjson.JSONObject; import com.orhanobut.logger.Logger; import com.tencent.vasdolly.helper.ChannelReaderUtil; -import com.yizhuan.erban.application.XChatApplication; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.AppUtils; -import com.yizhuan.xchat_android_library.utils.VersionUtil; +import com.mango.moshen.application.XChatApplication; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.xchat_android_library.utils.AppUtils; +import com.mango.xchat_android_library.utils.VersionUtil; /** *

html js 与webview 交互接口

diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/SimpleWebViewActivity.java b/app/src/main/java/com/mango/moshen/ui/webview/SimpleWebViewActivity.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/webview/SimpleWebViewActivity.java rename to app/src/main/java/com/mango/moshen/ui/webview/SimpleWebViewActivity.java index 3d584e91e..223c95982 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/SimpleWebViewActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/webview/SimpleWebViewActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.webview; +package com.mango.moshen.ui.webview; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -27,8 +27,8 @@ import androidx.appcompat.app.AppCompatActivity; import com.netease.nim.uikit.StatusBarUtil; import com.orhanobut.logger.Logger; -import com.yizhuan.erban.R; -import com.yizhuan.erban.utils.WebViewUtils; +import com.mango.moshen.R; +import com.mango.moshen.utils.WebViewUtils; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/TarotPayWebViewActivity.java b/app/src/main/java/com/mango/moshen/ui/webview/TarotPayWebViewActivity.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/webview/TarotPayWebViewActivity.java rename to app/src/main/java/com/mango/moshen/ui/webview/TarotPayWebViewActivity.java index 526da642a..352f2f56d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/TarotPayWebViewActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/webview/TarotPayWebViewActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.webview; +package com.mango.moshen.ui.webview; import android.content.Context; import android.content.Intent; @@ -8,7 +8,7 @@ import android.view.View; import android.view.WindowManager; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/event/CloseDialogWebViewEvent.java b/app/src/main/java/com/mango/moshen/ui/webview/event/CloseDialogWebViewEvent.java similarity index 65% rename from app/src/main/java/com/yizhuan/erban/ui/webview/event/CloseDialogWebViewEvent.java rename to app/src/main/java/com/mango/moshen/ui/webview/event/CloseDialogWebViewEvent.java index 7e36ea85c..3c4495c3a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/event/CloseDialogWebViewEvent.java +++ b/app/src/main/java/com/mango/moshen/ui/webview/event/CloseDialogWebViewEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.webview.event; +package com.mango.moshen.ui.webview.event; /** * create by lvzebiao @2019/12/3 diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/event/H5NotifyClientEvent.java b/app/src/main/java/com/mango/moshen/ui/webview/event/H5NotifyClientEvent.java similarity index 68% rename from app/src/main/java/com/yizhuan/erban/ui/webview/event/H5NotifyClientEvent.java rename to app/src/main/java/com/mango/moshen/ui/webview/event/H5NotifyClientEvent.java index 9d68f9e32..23738542e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/event/H5NotifyClientEvent.java +++ b/app/src/main/java/com/mango/moshen/ui/webview/event/H5NotifyClientEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.ui.webview.event; +package com.mango.moshen.ui.webview.event; -import com.yizhuan.xchat_android_core.base.BaseBusEvent; +import com.mango.core.base.BaseBusEvent; /** * h5通知客户端的事件 diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/event/ShowNavEvent.java b/app/src/main/java/com/mango/moshen/ui/webview/event/ShowNavEvent.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/ui/webview/event/ShowNavEvent.java rename to app/src/main/java/com/mango/moshen/ui/webview/event/ShowNavEvent.java index 49a8d4f85..f7ee7a42e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/event/ShowNavEvent.java +++ b/app/src/main/java/com/mango/moshen/ui/webview/event/ShowNavEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.webview.event; +package com.mango.moshen.ui.webview.event; import lombok.Data; diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/event/TaroPayResultEvent.java b/app/src/main/java/com/mango/moshen/ui/webview/event/TaroPayResultEvent.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/ui/webview/event/TaroPayResultEvent.java rename to app/src/main/java/com/mango/moshen/ui/webview/event/TaroPayResultEvent.java index 8f14d8e03..ee014b6dd 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/event/TaroPayResultEvent.java +++ b/app/src/main/java/com/mango/moshen/ui/webview/event/TaroPayResultEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.webview.event; +package com.mango.moshen.ui.webview.event; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/Anticlockwise.java b/app/src/main/java/com/mango/moshen/ui/widget/Anticlockwise.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/Anticlockwise.java rename to app/src/main/java/com/mango/moshen/ui/widget/Anticlockwise.java index b50c164de..5255e72e9 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/Anticlockwise.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/Anticlockwise.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/AppBarLayoutBehavior.java b/app/src/main/java/com/mango/moshen/ui/widget/AppBarLayoutBehavior.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/AppBarLayoutBehavior.java rename to app/src/main/java/com/mango/moshen/ui/widget/AppBarLayoutBehavior.java index 06f00f429..4a2b79272 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/AppBarLayoutBehavior.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/AppBarLayoutBehavior.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ButtonItem.java b/app/src/main/java/com/mango/moshen/ui/widget/ButtonItem.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/ButtonItem.java rename to app/src/main/java/com/mango/moshen/ui/widget/ButtonItem.java index c2a59c13d..58421df1d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/ButtonItem.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/ButtonItem.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; -import com.yizhuan.erban.R; +import com.mango.moshen.R; public class ButtonItem { public static final int BUTTON_TYPE_NORMAL = 0; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/CharAlignTextView.java b/app/src/main/java/com/mango/moshen/ui/widget/CharAlignTextView.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/CharAlignTextView.java rename to app/src/main/java/com/mango/moshen/ui/widget/CharAlignTextView.java index 3c31629a5..0c1c52381 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/CharAlignTextView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/CharAlignTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/CustomExpandableText.java b/app/src/main/java/com/mango/moshen/ui/widget/CustomExpandableText.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/CustomExpandableText.java rename to app/src/main/java/com/mango/moshen/ui/widget/CustomExpandableText.java index be3c59d42..2768f0be6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/CustomExpandableText.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/CustomExpandableText.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.annotation.TargetApi; import android.content.Context; @@ -19,7 +19,7 @@ import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; public class CustomExpandableText extends LinearLayout implements View.OnClickListener { protected TextView mTv; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/DatingSelectDialog.kt b/app/src/main/java/com/mango/moshen/ui/widget/DatingSelectDialog.kt similarity index 76% rename from app/src/main/java/com/yizhuan/erban/ui/widget/DatingSelectDialog.kt rename to app/src/main/java/com/mango/moshen/ui/widget/DatingSelectDialog.kt index b0b7c5535..cc5704182 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/DatingSelectDialog.kt +++ b/app/src/main/java/com/mango/moshen/ui/widget/DatingSelectDialog.kt @@ -1,9 +1,9 @@ -package com.yizhuan.erban.ui.widget +package com.mango.moshen.ui.widget import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogDatingSelectBinding -import com.yizhuan.xchat_android_core.room.event.DatingSelectUserEvent +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogDatingSelectBinding +import com.mango.core.room.event.DatingSelectUserEvent import org.greenrobot.eventbus.EventBus class DatingSelectDialog(val position: Int, val uid: Long, private val myUid: Long, val roomUid: Long) : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/DefaultToolBar.java b/app/src/main/java/com/mango/moshen/ui/widget/DefaultToolBar.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/DefaultToolBar.java rename to app/src/main/java/com/mango/moshen/ui/widget/DefaultToolBar.java index 0de44b319..609447cc0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/DefaultToolBar.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/DefaultToolBar.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import androidx.annotation.Nullable; @@ -10,7 +10,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** *

默认工具toolbar 界面

diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/DividerItemDecoration.java b/app/src/main/java/com/mango/moshen/ui/widget/DividerItemDecoration.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/DividerItemDecoration.java rename to app/src/main/java/com/mango/moshen/ui/widget/DividerItemDecoration.java index b8f05c053..572b7c221 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/DividerItemDecoration.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/DividerItemDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/DividerUtil.java b/app/src/main/java/com/mango/moshen/ui/widget/DividerUtil.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/DividerUtil.java rename to app/src/main/java/com/mango/moshen/ui/widget/DividerUtil.java index e2213a8a1..0481cc667 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/DividerUtil.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/DividerUtil.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.graphics.Rect; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import android.view.View; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.xchat_android_library.utils.SizeUtils; public class DividerUtil { public static void addhorizontalDivider(RecyclerView recyclerView, float dp) { diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/EdgeTransparentView.java b/app/src/main/java/com/mango/moshen/ui/widget/EdgeTransparentView.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/EdgeTransparentView.java rename to app/src/main/java/com/mango/moshen/ui/widget/EdgeTransparentView.java index 932d50e45..64eb6505e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/EdgeTransparentView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/EdgeTransparentView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.content.res.TypedArray; @@ -28,7 +28,7 @@ import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/FixedTouchViewPager.java b/app/src/main/java/com/mango/moshen/ui/widget/FixedTouchViewPager.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/widget/FixedTouchViewPager.java rename to app/src/main/java/com/mango/moshen/ui/widget/FixedTouchViewPager.java index 923dc2c6b..1152061c6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/FixedTouchViewPager.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/FixedTouchViewPager.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.log.MLog; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/FlickerAvatarView.java b/app/src/main/java/com/mango/moshen/ui/widget/FlickerAvatarView.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/FlickerAvatarView.java rename to app/src/main/java/com/mango/moshen/ui/widget/FlickerAvatarView.java index 5aefcc954..3dad73e02 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/FlickerAvatarView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/FlickerAvatarView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.animation.Animator; import android.animation.ObjectAnimator; @@ -11,8 +11,8 @@ import android.view.View; import android.view.animation.AccelerateInterpolator; import android.widget.FrameLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.databinding.LayoutFlickerAvatarBinding; +import com.mango.moshen.R; +import com.mango.moshen.databinding.LayoutFlickerAvatarBinding; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftAvatarAdapter.java b/app/src/main/java/com/mango/moshen/ui/widget/GiftAvatarAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/GiftAvatarAdapter.java rename to app/src/main/java/com/mango/moshen/ui/widget/GiftAvatarAdapter.java index c895a749d..3dc7fe0e3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftAvatarAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/GiftAvatarAdapter.java @@ -1,7 +1,6 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; -import android.graphics.drawable.GradientDrawable; import androidx.recyclerview.widget.RecyclerView; @@ -13,13 +12,13 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.coorchice.library.SuperTextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.pk.bean.PKTeamInfo; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.room.queue.bean.MicMemberInfo; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/GiftDialog.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/GiftDialog.java index 61e01eb4b..be683ca71 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/GiftDialog.java @@ -1,11 +1,9 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; import android.graphics.Color; -import android.graphics.LinearGradient; -import android.graphics.Shader; import android.os.Bundle; import android.text.Editable; import android.text.TextUtils; @@ -39,58 +37,58 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.yizhuan.erban.BR; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.firstcharge.FirstChargeDialog; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.radish.task.activity.TaskCenterActivity; -import com.yizhuan.erban.ui.gift.dialog.GiftInfoVm; -import com.yizhuan.erban.ui.gift.dialog.PageIndicatorView; -import com.yizhuan.erban.ui.pay.ChargeDialog; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.webview.DialogWebViewActivity; -import com.yizhuan.erban.ui.widget.dialog.GiftManualQuantityDialog; -import com.yizhuan.erban.ui.widget.drawgift.DrawGiftHelper; -import com.yizhuan.erban.ui.widget.drawgift.DrawGiftView; -import com.yizhuan.erban.ui.widget.magicindicator.GiftIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.VerticalDecoration; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.erban.utils.SpannableBuilder; -import com.yizhuan.erban.vip.VipMainActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftTab; -import com.yizhuan.xchat_android_core.gift.bean.GiftType; -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo; -import com.yizhuan.xchat_android_core.gift.event.UpdateKnapEvent; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent; -import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent; -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -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.StringExtensionKt; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.bindinglist.IItem; -import com.yizhuan.xchat_android_library.bindinglist.MultiTypeAdapter; -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.TextWatcherWrapper; +import com.mango.moshen.BR; +import com.mango.moshen.R; +import com.mango.moshen.avroom.firstcharge.FirstChargeDialog; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.radish.task.activity.TaskCenterActivity; +import com.mango.moshen.ui.gift.dialog.GiftInfoVm; +import com.mango.moshen.ui.gift.dialog.PageIndicatorView; +import com.mango.moshen.ui.pay.ChargeDialog; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.webview.DialogWebViewActivity; +import com.mango.moshen.ui.widget.dialog.GiftManualQuantityDialog; +import com.mango.moshen.ui.widget.drawgift.DrawGiftHelper; +import com.mango.moshen.ui.widget.drawgift.DrawGiftView; +import com.mango.moshen.ui.widget.magicindicator.GiftIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.recyclerview.decoration.VerticalDecoration; +import com.mango.moshen.utils.RegexUtil; +import com.mango.moshen.utils.SpannableBuilder; +import com.mango.moshen.vip.VipMainActivity; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.gift.GiftModel; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.GiftTab; +import com.mango.core.gift.bean.GiftType; +import com.mango.core.gift.bean.SimpleUserInfo; +import com.mango.core.gift.event.UpdateKnapEvent; +import com.mango.core.initial.InitialModel; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.pay.PayModel; +import com.mango.core.pay.bean.WalletInfo; +import com.mango.core.pay.event.FirstChargeEvent; +import com.mango.core.pay.event.UpdateWalletInfoEvent; +import com.mango.core.room.anotherroompk.ShowUserInfoDialogEvent; +import com.mango.core.room.pk.model.PkModel; +import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.StringExtensionKt; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.bindinglist.IItem; +import com.mango.xchat_android_library.bindinglist.MultiTypeAdapter; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.TextWatcherWrapper; import com.zyyoona7.lib.EasyPopup; import com.zyyoona7.lib.HorizontalGravity; import com.zyyoona7.lib.VerticalGravity; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftRecyclerView.java b/app/src/main/java/com/mango/moshen/ui/widget/GiftRecyclerView.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/GiftRecyclerView.java rename to app/src/main/java/com/mango/moshen/ui/widget/GiftRecyclerView.java index 2a4ee762e..f5952ed3f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftRecyclerView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/GiftRecyclerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GridViewWithoutScroll.java b/app/src/main/java/com/mango/moshen/ui/widget/GridViewWithoutScroll.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/GridViewWithoutScroll.java rename to app/src/main/java/com/mango/moshen/ui/widget/GridViewWithoutScroll.java index 85b1a32fd..2e43c5cd6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/GridViewWithoutScroll.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/GridViewWithoutScroll.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.annotation.TargetApi; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/InterceptTouchLayout.java b/app/src/main/java/com/mango/moshen/ui/widget/InterceptTouchLayout.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/InterceptTouchLayout.java rename to app/src/main/java/com/mango/moshen/ui/widget/InterceptTouchLayout.java index 44c089862..204121034 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/InterceptTouchLayout.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/InterceptTouchLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.annotation.TargetApi; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/LeftNotiDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/LeftNotiDialog.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/LeftNotiDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/LeftNotiDialog.java index 7ff2c395b..8099b59ec 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/LeftNotiDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/LeftNotiDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.app.Dialog; import android.content.Context; @@ -9,7 +9,7 @@ import android.view.Window; import android.view.WindowManager; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * Created by zhouxiangfeng on 2017/5/13. diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/LevelHeadView.java b/app/src/main/java/com/mango/moshen/ui/widget/LevelHeadView.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/widget/LevelHeadView.java rename to app/src/main/java/com/mango/moshen/ui/widget/LevelHeadView.java index cf83ab0a2..f992eee52 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/LevelHeadView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/LevelHeadView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.util.AttributeSet; @@ -9,9 +9,9 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.core.user.bean.UserInfo; /** * Created by zhouxiangfeng on 2017/6/3. diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/LevelUpDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/LevelUpDialog.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/ui/widget/LevelUpDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/LevelUpDialog.java index 263885ff3..9ecd1ceb4 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/LevelUpDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/LevelUpDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.content.Intent; @@ -6,10 +6,10 @@ import android.os.Bundle; import android.view.Window; import android.view.WindowManager; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.databinding.DialogLevelUpBinding; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.databinding.DialogLevelUpBinding; +import com.mango.xchat_android_library.annatation.ActLayoutRes; /** * Created by huangmeng1 on 2018/6/21. diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/LinearLayoutManagerWrapper.java b/app/src/main/java/com/mango/moshen/ui/widget/LinearLayoutManagerWrapper.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/LinearLayoutManagerWrapper.java rename to app/src/main/java/com/mango/moshen/ui/widget/LinearLayoutManagerWrapper.java index 4127c7d42..08755b211 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/LinearLayoutManagerWrapper.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/LinearLayoutManagerWrapper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import androidx.recyclerview.widget.LinearLayoutManager; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ListViewWithoutScroll.java b/app/src/main/java/com/mango/moshen/ui/widget/ListViewWithoutScroll.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/ListViewWithoutScroll.java rename to app/src/main/java/com/mango/moshen/ui/widget/ListViewWithoutScroll.java index 9ea4b61f8..04a9dcdb5 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/ListViewWithoutScroll.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/ListViewWithoutScroll.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.annotation.TargetApi; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/LivingIconView.java b/app/src/main/java/com/mango/moshen/ui/widget/LivingIconView.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/LivingIconView.java rename to app/src/main/java/com/mango/moshen/ui/widget/LivingIconView.java index f7d3284c2..7d7b88b8e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/LivingIconView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/LivingIconView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.content.res.TypedArray; @@ -11,8 +11,8 @@ import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import android.view.ViewGroup; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingAdapter.java b/app/src/main/java/com/mango/moshen/ui/widget/LoadingAdapter.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/LoadingAdapter.java rename to app/src/main/java/com/mango/moshen/ui/widget/LoadingAdapter.java index ff00e834e..9c667dae1 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/LoadingAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import androidx.annotation.IntDef; import androidx.recyclerview.widget.GridLayoutManager; @@ -8,7 +8,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/LoadingDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/widget/LoadingDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/LoadingDialog.java index 6f1d8f798..ed16b5703 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/LoadingDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.graphics.drawable.AnimationDrawable; @@ -10,7 +10,7 @@ import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.widget.ImageView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * @author xiaoyu diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MagicAdapter.java b/app/src/main/java/com/mango/moshen/ui/widget/MagicAdapter.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/MagicAdapter.java rename to app/src/main/java/com/mango/moshen/ui/widget/MagicAdapter.java index a4056e0e7..39ba251f1 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/MagicAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/MagicAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import androidx.recyclerview.widget.RecyclerView; @@ -9,9 +9,9 @@ import android.widget.ImageView; import android.widget.TextView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.core.magic.bean.MagicInfo; import java.util.List; import java.util.Locale; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MagicRecyclerView.java b/app/src/main/java/com/mango/moshen/ui/widget/MagicRecyclerView.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/MagicRecyclerView.java rename to app/src/main/java/com/mango/moshen/ui/widget/MagicRecyclerView.java index 47319e5d7..52e121a46 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/MagicRecyclerView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/MagicRecyclerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MainRedPointTab.java b/app/src/main/java/com/mango/moshen/ui/widget/MainRedPointTab.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/widget/MainRedPointTab.java rename to app/src/main/java/com/mango/moshen/ui/widget/MainRedPointTab.java index 0045166e8..680155973 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/MainRedPointTab.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/MainRedPointTab.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.annotation.SuppressLint; import android.content.Context; @@ -16,12 +16,12 @@ 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.common.svga.SimpleSvgaCallback; -import com.yizhuan.xchat_android_core.home.bean.MainTabInfo; -import com.yizhuan.xchat_android_core.home.bean.MainTabType; -import com.yizhuan.xchat_android_core.utils.CheckUtils; -import com.yizhuan.xchat_android_core.utils.TextUtils; +import com.mango.moshen.R; +import com.mango.moshen.common.svga.SimpleSvgaCallback; +import com.mango.core.home.bean.MainTabInfo; +import com.mango.core.home.bean.MainTabType; +import com.mango.core.utils.CheckUtils; +import com.mango.core.utils.TextUtils; import java.net.MalformedURLException; import java.net.URL; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MainTab.java b/app/src/main/java/com/mango/moshen/ui/widget/MainTab.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/MainTab.java rename to app/src/main/java/com/mango/moshen/ui/widget/MainTab.java index 88419e1f4..cfd4d1928 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/MainTab.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/MainTab.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.content.res.TypedArray; @@ -10,7 +10,7 @@ import android.util.AttributeSet; import android.view.Gravity; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** *

main tab 控件

diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MainTabLayout.java b/app/src/main/java/com/mango/moshen/ui/widget/MainTabLayout.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/MainTabLayout.java rename to app/src/main/java/com/mango/moshen/ui/widget/MainTabLayout.java index da72094db..316e70bcd 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/MainTabLayout.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/MainTabLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.util.AttributeSet; @@ -9,12 +9,12 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.Size; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.home.bean.MainTabInfo; -import com.yizhuan.xchat_android_core.home.bean.MainTabType; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.core.home.bean.MainTabInfo; +import com.mango.core.home.bean.MainTabType; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MarqueeLayout.java b/app/src/main/java/com/mango/moshen/ui/widget/MarqueeLayout.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/MarqueeLayout.java rename to app/src/main/java/com/mango/moshen/ui/widget/MarqueeLayout.java index 9755b7e04..047a57239 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/MarqueeLayout.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/MarqueeLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -13,9 +13,9 @@ import android.view.animation.LinearInterpolator; import android.widget.HorizontalScrollView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.ScreenUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.ScreenUtils; +import com.mango.xchat_android_library.utils.log.MLog; /** * @author xxf-kaede diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MarqueeTextView.kt b/app/src/main/java/com/mango/moshen/ui/widget/MarqueeTextView.kt similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/MarqueeTextView.kt rename to app/src/main/java/com/mango/moshen/ui/widget/MarqueeTextView.kt index ae385c98d..9a03cb95a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/MarqueeTextView.kt +++ b/app/src/main/java/com/mango/moshen/ui/widget/MarqueeTextView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget +package com.mango.moshen.ui.widget import android.content.Context import android.graphics.Canvas @@ -13,7 +13,7 @@ import android.view.View import androidx.annotation.ColorInt import androidx.annotation.FloatRange import androidx.annotation.Px -import com.yizhuan.erban.R +import com.mango.moshen.R import java.lang.ref.WeakReference import kotlin.math.abs import kotlin.math.ceil diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MultipleGraduallyTextView.kt b/app/src/main/java/com/mango/moshen/ui/widget/MultipleGraduallyTextView.kt similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/MultipleGraduallyTextView.kt rename to app/src/main/java/com/mango/moshen/ui/widget/MultipleGraduallyTextView.kt index 9c82962a6..c711e2c94 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/MultipleGraduallyTextView.kt +++ b/app/src/main/java/com/mango/moshen/ui/widget/MultipleGraduallyTextView.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.ui.widget +package com.mango.moshen.ui.widget import android.content.Context import android.graphics.* import android.util.AttributeSet import androidx.appcompat.widget.AppCompatTextView -import com.yizhuan.erban.R +import com.mango.moshen.R class MultipleGraduallyTextView(context: Context, attr: AttributeSet?, def: Int) : AppCompatTextView(context, attr, def) { diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MyItemAnimator.java b/app/src/main/java/com/mango/moshen/ui/widget/MyItemAnimator.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/MyItemAnimator.java rename to app/src/main/java/com/mango/moshen/ui/widget/MyItemAnimator.java index 16ed93f33..2f45113ba 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/MyItemAnimator.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/MyItemAnimator.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/NobleAvatarView.java b/app/src/main/java/com/mango/moshen/ui/widget/NobleAvatarView.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/ui/widget/NobleAvatarView.java rename to app/src/main/java/com/mango/moshen/ui/widget/NobleAvatarView.java index bb0a28c05..47afcbbbf 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/NobleAvatarView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/NobleAvatarView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import androidx.annotation.Nullable; @@ -8,14 +8,13 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.SizeUtils; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -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.UserInfo; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.noble.NobleInfo; +import com.mango.core.noble.NobleResourceType; +import com.mango.core.noble.NobleUtil; +import com.mango.core.user.bean.UserInfo; /** *

贵族头像

diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/NobleOpenNoticeView.java b/app/src/main/java/com/mango/moshen/ui/widget/NobleOpenNoticeView.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/NobleOpenNoticeView.java rename to app/src/main/java/com/mango/moshen/ui/widget/NobleOpenNoticeView.java index 9701f1dab..41168254b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/NobleOpenNoticeView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/NobleOpenNoticeView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.graphics.Color; @@ -18,9 +18,9 @@ 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.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.mango.moshen.R; +import com.mango.core.noble.NobleInfo; +import com.mango.core.noble.NobleUtil; import java.net.MalformedURLException; import java.net.URL; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/NumView.java b/app/src/main/java/com/mango/moshen/ui/widget/NumView.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/widget/NumView.java rename to app/src/main/java/com/mango/moshen/ui/widget/NumView.java index 960ed836e..902f01d1c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/NumView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/NumView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import androidx.annotation.Nullable; @@ -6,8 +6,8 @@ import android.util.AttributeSet; import android.widget.ImageView; import android.widget.LinearLayout; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.JavaUtil; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.JavaUtil; public class NumView extends LinearLayout { diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ObservableScrollView.java b/app/src/main/java/com/mango/moshen/ui/widget/ObservableScrollView.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/ObservableScrollView.java rename to app/src/main/java/com/mango/moshen/ui/widget/ObservableScrollView.java index 3e20a615b..98c07f7c8 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/ObservableScrollView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/ObservableScrollView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; /** * Created by chenran on 2017/10/17. diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/OnPageSelectedListener.java b/app/src/main/java/com/mango/moshen/ui/widget/OnPageSelectedListener.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/widget/OnPageSelectedListener.java rename to app/src/main/java/com/mango/moshen/ui/widget/OnPageSelectedListener.java index e527e014a..437606fb3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/OnPageSelectedListener.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/OnPageSelectedListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import androidx.viewpager.widget.ViewPager; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ParentClickHorizontalScrollView.java b/app/src/main/java/com/mango/moshen/ui/widget/ParentClickHorizontalScrollView.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/ParentClickHorizontalScrollView.java rename to app/src/main/java/com/mango/moshen/ui/widget/ParentClickHorizontalScrollView.java index 21dfc1625..bf90a47b2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/ParentClickHorizontalScrollView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/ParentClickHorizontalScrollView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/PinEntryEditText.java b/app/src/main/java/com/mango/moshen/ui/widget/PinEntryEditText.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/PinEntryEditText.java rename to app/src/main/java/com/mango/moshen/ui/widget/PinEntryEditText.java index 41e6efd7a..55f7b84ae 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/PinEntryEditText.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/PinEntryEditText.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.animation.Animator; import android.animation.AnimatorSet; @@ -42,7 +42,7 @@ import android.view.View; import android.view.animation.OvershootInterpolator; import android.view.inputmethod.InputMethodManager; -import com.yizhuan.erban.R; +import com.mango.moshen.R; public class PinEntryEditText extends AppCompatEditText { diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RecallDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/RecallDialog.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/ui/widget/RecallDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/RecallDialog.java index 4e22af354..2426966d4 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/RecallDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/RecallDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.content.Intent; @@ -10,23 +10,22 @@ import android.widget.EditText; import android.widget.TextView; import com.netease.nim.uikit.common.util.string.StringUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.recall.RecallModel; -import com.yizhuan.xchat_android_core.recall.bean.GoBackInfo; -import com.yizhuan.xchat_android_core.recall.event.GoBackEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.core.auth.AuthModel; +import com.mango.core.recall.RecallModel; +import com.mango.core.recall.bean.GoBackInfo; +import com.mango.core.recall.event.GoBackEvent; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import io.reactivex.functions.Consumer; -import retrofit2.http.HEAD; public class RecallDialog extends BaseActivity implements View.OnClickListener { /** 一个设备只能领取一次老用户回归礼物 */ diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RectLayout.java b/app/src/main/java/com/mango/moshen/ui/widget/RectLayout.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/RectLayout.java rename to app/src/main/java/com/mango/moshen/ui/widget/RectLayout.java index 27ba938bb..8077ada80 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/RectLayout.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/RectLayout.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; import android.widget.RelativeLayout; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * Created by jack diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerRefreshLayout.java b/app/src/main/java/com/mango/moshen/ui/widget/RecyclerRefreshLayout.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerRefreshLayout.java rename to app/src/main/java/com/mango/moshen/ui/widget/RecyclerRefreshLayout.java index 5bc6e3fa1..2466162df 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerRefreshLayout.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/RecyclerRefreshLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -11,7 +11,7 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewConfiguration; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoBugLinearLayoutManager.java b/app/src/main/java/com/mango/moshen/ui/widget/RecyclerViewNoBugLinearLayoutManager.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoBugLinearLayoutManager.java rename to app/src/main/java/com/mango/moshen/ui/widget/RecyclerViewNoBugLinearLayoutManager.java index 2bfdf89e9..aa131d409 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoBugLinearLayoutManager.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/RecyclerViewNoBugLinearLayoutManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import androidx.recyclerview.widget.LinearLayoutManager; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoViewpagerScroll.java b/app/src/main/java/com/mango/moshen/ui/widget/RecyclerViewNoViewpagerScroll.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoViewpagerScroll.java rename to app/src/main/java/com/mango/moshen/ui/widget/RecyclerViewNoViewpagerScroll.java index 4a843eea5..3b4ee3002 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoViewpagerScroll.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/RecyclerViewNoViewpagerScroll.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RedPointView.java b/app/src/main/java/com/mango/moshen/ui/widget/RedPointView.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/RedPointView.java rename to app/src/main/java/com/mango/moshen/ui/widget/RedPointView.java index 4da1bdcb3..5a8bb43e9 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/RedPointView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/RedPointView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.content.res.TypedArray; @@ -11,8 +11,8 @@ import android.text.TextPaint; import android.text.TextUtils; import android.util.AttributeSet; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; /** * 本来是继承View，但是发现new出来的paint和textview不一样，（暂时没找到原因） diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/ShareDialog.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/ShareDialog.java index ff0d6b17a..2dc9ab57d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/ShareDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.os.Bundle; @@ -12,10 +12,9 @@ import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.StringUtils; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.StringUtils; import cn.sharesdk.framework.Platform; import cn.sharesdk.framework.ShareSDK; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareRedBagDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/ShareRedBagDialog.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/ShareRedBagDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/ShareRedBagDialog.java index ee5b04923..1b4cf95d8 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareRedBagDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/ShareRedBagDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.app.Dialog; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/SimpleAnimListener.java b/app/src/main/java/com/mango/moshen/ui/widget/SimpleAnimListener.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/SimpleAnimListener.java rename to app/src/main/java/com/mango/moshen/ui/widget/SimpleAnimListener.java index 72d236fb9..36f5fc8fb 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/SimpleAnimListener.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/SimpleAnimListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/SquareImageView.java b/app/src/main/java/com/mango/moshen/ui/widget/SquareImageView.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/SquareImageView.java rename to app/src/main/java/com/mango/moshen/ui/widget/SquareImageView.java index d3563300e..7f4bea08c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/SquareImageView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/SquareImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/SquareLayout.java b/app/src/main/java/com/mango/moshen/ui/widget/SquareLayout.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/SquareLayout.java rename to app/src/main/java/com/mango/moshen/ui/widget/SquareLayout.java index b5cc93cba..079d979db 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/SquareLayout.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/SquareLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java b/app/src/main/java/com/mango/moshen/ui/widget/SuperEditText.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java rename to app/src/main/java/com/mango/moshen/ui/widget/SuperEditText.java index 235bfc2a8..fa7cd1e8f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/SuperEditText.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.content.res.TypedArray; @@ -16,7 +16,7 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * Created by huangmeng1 on 2018/6/27. diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/TextWatcherSimple.java b/app/src/main/java/com/mango/moshen/ui/widget/TextWatcherSimple.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/widget/TextWatcherSimple.java rename to app/src/main/java/com/mango/moshen/ui/widget/TextWatcherSimple.java index 50758665a..3158b4264 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/TextWatcherSimple.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/TextWatcherSimple.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.text.TextWatcher; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/TopRoundLinearLayout.java b/app/src/main/java/com/mango/moshen/ui/widget/TopRoundLinearLayout.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/TopRoundLinearLayout.java rename to app/src/main/java/com/mango/moshen/ui/widget/TopRoundLinearLayout.java index db433b2b8..86911c139 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/TopRoundLinearLayout.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/TopRoundLinearLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/UserInfoDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/UserInfoDialog.java index e51f197e5..4390fe886 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/UserInfoDialog.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR_CANCEL; -import static com.yizhuan.xchat_android_core.manager.RoomEvent.DRAGON_BAR_CANCEL; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR_CANCEL; +import static com.mango.core.manager.RoomEvent.DRAGON_BAR_CANCEL; import android.annotation.SuppressLint; import android.content.Context; @@ -29,65 +29,65 @@ import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.avroom.ButtonItemFactory; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.avroom.adapter.UpMicAdapter; -import com.yizhuan.erban.avroom.giftvalue.GiftValueDialogUiHelper; -import com.yizhuan.erban.avroom.ktv.KtvMusicManager; -import com.yizhuan.erban.avroom.widget.ViewItem; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.erban.ui.user.adapter.SkillPicsAdapter; -import com.yizhuan.erban.ui.user.decorationsend.UserInfoSkillDecoration; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.erban.vip.VipHelper; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomMicInfo; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.im.custom.bean.FaceAttachment; -import com.yizhuan.xchat_android_core.kick.KickModel; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -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.dragonball.DragonBallModel; -import com.yizhuan.xchat_android_core.room.event.DatingSelectUserEvent; -import com.yizhuan.xchat_android_core.room.event.RoomAtEvent; -import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.GiftValueModel; -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.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.HomePartyModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel; -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; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.StringUtils; -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.net.rxnet.callback.CallBack; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.avroom.ButtonItemFactory; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.avroom.adapter.UpMicAdapter; +import com.mango.moshen.avroom.giftvalue.GiftValueDialogUiHelper; +import com.mango.moshen.avroom.ktv.KtvMusicManager; +import com.mango.moshen.avroom.widget.ViewItem; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.moshen.ui.user.adapter.SkillPicsAdapter; +import com.mango.moshen.ui.user.decorationsend.UserInfoSkillDecoration; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.utils.RegexUtil; +import com.mango.moshen.vip.VipHelper; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.RoomMicInfo; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.model.FamilyModel; +import com.mango.core.im.custom.bean.FaceAttachment; +import com.mango.core.kick.KickModel; +import com.mango.core.level.UserLevelVo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.market_verify.MarketVerifyModel; +import com.mango.core.noble.NobleInfo; +import com.mango.core.noble.NobleUtil; +import com.mango.core.praise.PraiseModel; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomResult; +import com.mango.core.room.dragonball.DragonBallModel; +import com.mango.core.room.event.DatingSelectUserEvent; +import com.mango.core.room.event.RoomAtEvent; +import com.mango.core.room.face.FaceReceiveInfo; +import com.mango.core.room.giftvalue.GiftValueModel; +import com.mango.core.room.giftvalue.bean.RoomGiftValue; +import com.mango.core.room.giftvalue.helper.GiftValueMrg; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.room.model.HomePartyModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.super_admin.model.SuperAdminModel; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.BaseInfo; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.StringUtils; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.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/ui/widget/UserInfoView.java b/app/src/main/java/com/mango/moshen/ui/widget/UserInfoView.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoView.java rename to app/src/main/java/com/mango/moshen/ui/widget/UserInfoView.java index 0c40deb13..acc57fffd 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/UserInfoView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import androidx.annotation.Nullable; @@ -10,10 +10,10 @@ import android.view.View; import android.widget.LinearLayout; 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.user.bean.SimpleUserInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.utils.RegexUtil; +import com.mango.core.user.bean.SimpleUserInfo; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoWrapContentPager.java b/app/src/main/java/com/mango/moshen/ui/widget/UserInfoWrapContentPager.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoWrapContentPager.java rename to app/src/main/java/com/mango/moshen/ui/widget/UserInfoWrapContentPager.java index e4303b3a5..80a77c78d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoWrapContentPager.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/UserInfoWrapContentPager.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserMagicIndicator.java b/app/src/main/java/com/mango/moshen/ui/widget/UserMagicIndicator.java similarity index 80% rename from app/src/main/java/com/yizhuan/erban/ui/widget/UserMagicIndicator.java rename to app/src/main/java/com/mango/moshen/ui/widget/UserMagicIndicator.java index 4ebb92d1b..41947b268 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserMagicIndicator.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/UserMagicIndicator.java @@ -1,18 +1,18 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; import androidx.core.content.ContextCompat; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -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 com.mango.moshen.R; +import com.mango.moshen.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.mango.core.home.bean.TabInfo; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/WrapContentViewPager.java b/app/src/main/java/com/mango/moshen/ui/widget/WrapContentViewPager.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/WrapContentViewPager.java rename to app/src/main/java/com/mango/moshen/ui/widget/WrapContentViewPager.java index fd25d6699..81a42b016 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/WrapContentViewPager.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/WrapContentViewPager.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget; +package com.mango.moshen.ui.widget; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java b/app/src/main/java/com/mango/moshen/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java rename to app/src/main/java/com/mango/moshen/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java index 5139d60b3..f4eb061e6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/XRecyclerView/ScaleTransitionPagerTitleView.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.ui.widget.XRecyclerView; +package com.mango.moshen.ui.widget.XRecyclerView; import android.content.Context; import android.text.TextPaint; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleTextView.java b/app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleTextView.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleTextView.java rename to app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleTextView.java index 0a5b85248..6b9a3d8d2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleTextView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.bubble; +package com.mango.moshen.ui.widget.bubble; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleTextViewHelper.java b/app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleTextViewHelper.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleTextViewHelper.java rename to app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleTextViewHelper.java index 645dd46fc..16fa98424 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleTextViewHelper.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleTextViewHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.bubble; +package com.mango.moshen.ui.widget.bubble; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleTextViews.java b/app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleTextViews.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleTextViews.java rename to app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleTextViews.java index dde419e86..f5900a79f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleTextViews.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleTextViews.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.bubble; +package com.mango.moshen.ui.widget.bubble; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleTitleTextView.java b/app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleTitleTextView.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleTitleTextView.java rename to app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleTitleTextView.java index 044accd25..cde693ac4 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleTitleTextView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleTitleTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.bubble; +package com.mango.moshen.ui.widget.bubble; import android.content.Context; import android.content.res.TypedArray; @@ -13,7 +13,7 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleView.java b/app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleView.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleView.java rename to app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleView.java index e7f0deadd..05488b4a4 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeBubbleView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/bubble/LeBubbleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.bubble; +package com.mango.moshen.ui.widget.bubble; import android.content.Context; import android.content.res.ColorStateList; @@ -12,7 +12,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.RelativeLayout; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeRoundRectDrawable2.java b/app/src/main/java/com/mango/moshen/ui/widget/bubble/LeRoundRectDrawable2.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeRoundRectDrawable2.java rename to app/src/main/java/com/mango/moshen/ui/widget/bubble/LeRoundRectDrawable2.java index e5161c400..9e126321a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeRoundRectDrawable2.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/bubble/LeRoundRectDrawable2.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.erban.ui.widget.bubble; +package com.mango.moshen.ui.widget.bubble; import android.graphics.Canvas; import android.graphics.ColorFilter; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeStateColorDrawable.java b/app/src/main/java/com/mango/moshen/ui/widget/bubble/LeStateColorDrawable.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeStateColorDrawable.java rename to app/src/main/java/com/mango/moshen/ui/widget/bubble/LeStateColorDrawable.java index 9b08c3c4b..3de1a17c0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/LeStateColorDrawable.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/bubble/LeStateColorDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.bubble; +package com.mango.moshen.ui.widget.bubble; import android.graphics.drawable.ColorDrawable; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/TintedBitmapDrawable.java b/app/src/main/java/com/mango/moshen/ui/widget/bubble/TintedBitmapDrawable.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/bubble/TintedBitmapDrawable.java rename to app/src/main/java/com/mango/moshen/ui/widget/bubble/TintedBitmapDrawable.java index 6529b1a25..43faad5a0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/bubble/TintedBitmapDrawable.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/bubble/TintedBitmapDrawable.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.bubble; +package com.mango.moshen.ui.widget.bubble; import android.content.res.Resources; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceGiftDialog.java similarity index 88% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceGiftDialog.java index cbd3f9ca4..2f0641f0a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceGiftDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dialog; +package com.mango.moshen.ui.widget.dialog; import android.content.Context; import androidx.databinding.DataBindingUtil; @@ -11,11 +11,11 @@ import android.view.View; import android.view.Window; import android.view.WindowManager; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.databinding.DialogGiftAllServiceBinding; -import com.yizhuan.xchat_android_library.utils.SizeUtils; -import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.databinding.DialogGiftAllServiceBinding; +import com.mango.xchat_android_library.utils.SizeUtils; +import com.mango.core.noble.AllServiceGiftProtocol; /** * Created by huangmeng1 on 2018/3/29. diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceGiftLevelOneDialog.java similarity index 83% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceGiftLevelOneDialog.java index 4bfdefa8a..8eaa22a62 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceGiftLevelOneDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dialog; +package com.mango.moshen.ui.widget.dialog; import android.content.Context; import androidx.databinding.DataBindingUtil; @@ -11,15 +11,15 @@ import android.view.View; import android.view.Window; import android.view.WindowManager; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelOneBinding; -import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_library.utils.JavaUtil; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.databinding.DialogGiftAllServiceLevelOneBinding; +import com.mango.moshen.public_chat_hall.activity.PublicChatHallHomeActivity; +import com.mango.core.initial.InitialModel; +import com.mango.core.noble.AllServiceGiftProtocol; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.utils.JavaUtil; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java similarity index 80% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java index 250d78682..22ff3220e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dialog; +package com.mango.moshen.ui.widget.dialog; import android.content.Context; @@ -13,20 +13,17 @@ import android.view.LayoutInflater; import android.view.View; import android.view.Window; import android.view.WindowManager; -import android.view.animation.LinearInterpolator; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelThreeBinding; -import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_library.utils.JavaUtil; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.databinding.DialogGiftAllServiceLevelThreeBinding; +import com.mango.moshen.public_chat_hall.activity.PublicChatHallHomeActivity; +import com.mango.core.initial.InitialModel; +import com.mango.core.noble.AllServiceGiftProtocol; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.utils.JavaUtil; -import java.util.Objects; import java.util.concurrent.TimeUnit; import io.reactivex.Observable; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java similarity index 79% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java index 26356e12a..41f9f2de3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dialog; +package com.mango.moshen.ui.widget.dialog; import android.content.Context; import androidx.databinding.DataBindingUtil; @@ -11,20 +11,17 @@ import android.view.LayoutInflater; import android.view.View; import android.view.Window; import android.view.WindowManager; -import android.view.animation.LinearInterpolator; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelTwoBinding; -import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_library.utils.JavaUtil; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.databinding.DialogGiftAllServiceLevelTwoBinding; +import com.mango.moshen.public_chat_hall.activity.PublicChatHallHomeActivity; +import com.mango.core.initial.InitialModel; +import com.mango.core.noble.AllServiceGiftProtocol; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.utils.JavaUtil; -import java.util.Objects; import java.util.concurrent.TimeUnit; import io.reactivex.Observable; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceVipLevelUPDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceVipLevelUPDialog.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceVipLevelUPDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceVipLevelUPDialog.java index e317673b3..3c514578d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceVipLevelUPDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dialog/AllServiceVipLevelUPDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dialog; +package com.mango.moshen.ui.widget.dialog; import android.content.Context; import android.graphics.Color; @@ -16,19 +16,18 @@ import android.widget.FrameLayout; import androidx.annotation.NonNull; -import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGADynamicEntity; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.svga.SimpleSvgaCallback; -import com.yizhuan.erban.common.widget.CircleImageSpan; -import com.yizhuan.erban.databinding.DialogVipAllServiceLevelUpBinding; -import com.yizhuan.erban.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; -import com.yizhuan.xchat_android_core.vip.VipMessageInfo; +import com.mango.moshen.R; +import com.mango.moshen.common.svga.SimpleSvgaCallback; +import com.mango.moshen.common.widget.CircleImageSpan; +import com.mango.moshen.databinding.DialogVipAllServiceLevelUpBinding; +import com.mango.moshen.utils.SpannableBuilder; +import com.mango.core.utils.StringExtensionKt; +import com.mango.core.vip.VipMessageInfo; import java.net.URL; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/BaseDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/dialog/BaseDialog.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dialog/BaseDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/dialog/BaseDialog.java index 6232ffd3d..b066e8914 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/BaseDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dialog/BaseDialog.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.ui.widget.dialog; +package com.mango.moshen.ui.widget.dialog; import android.content.Context; import androidx.appcompat.app.AppCompatDialog; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; /** * Created by huangmeng1 on 2018/4/11. diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/CommonLoadingDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/dialog/CommonLoadingDialog.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dialog/CommonLoadingDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/dialog/CommonLoadingDialog.java index 60eb8b15c..8337ec70f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/CommonLoadingDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dialog/CommonLoadingDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dialog; +package com.mango.moshen.ui.widget.dialog; import android.content.Context; import android.graphics.drawable.AnimationDrawable; @@ -8,7 +8,7 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/CommonMessageDialog.kt b/app/src/main/java/com/mango/moshen/ui/widget/dialog/CommonMessageDialog.kt similarity index 55% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dialog/CommonMessageDialog.kt rename to app/src/main/java/com/mango/moshen/ui/widget/dialog/CommonMessageDialog.kt index 2c213a230..c0a3fe786 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/CommonMessageDialog.kt +++ b/app/src/main/java/com/mango/moshen/ui/widget/dialog/CommonMessageDialog.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.ui.widget.dialog +package com.mango.moshen.ui.widget.dialog import android.content.Context -import com.yizhuan.erban.R -import com.yizhuan.erban.databinding.DialogCommonMessageBinding -import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.mango.moshen.R +import com.mango.moshen.databinding.DialogCommonMessageBinding +import com.mango.moshen.treasure_box.widget.dialog.BaseBindingDialog +import com.mango.xchat_android_library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_common_message) class CommonMessageDialog(context: Context, theme: Int) : diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/CommonTipDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/dialog/CommonTipDialog.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dialog/CommonTipDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/dialog/CommonTipDialog.java index 0359675ac..b42dcf8c0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/CommonTipDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dialog/CommonTipDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dialog; +package com.mango.moshen.ui.widget.dialog; import static android.graphics.Typeface.BOLD; @@ -12,8 +12,8 @@ import android.widget.TextView; import androidx.annotation.ColorRes; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.utils.TextUtils; +import com.mango.moshen.R; +import com.mango.core.utils.TextUtils; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/GiftManualQuantityDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/dialog/GiftManualQuantityDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dialog/GiftManualQuantityDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/dialog/GiftManualQuantityDialog.java index 53d84837b..8b26955ca 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/GiftManualQuantityDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dialog/GiftManualQuantityDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dialog; +package com.mango.moshen.ui.widget.dialog; import android.app.Dialog; import android.content.Context; @@ -13,9 +13,9 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; -import com.yizhuan.erban.R; -import com.yizhuan.erban.utils.KeyBoardUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.utils.KeyBoardUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; /** * @author jack diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/MonsterDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/dialog/MonsterDialog.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dialog/MonsterDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/dialog/MonsterDialog.java index d2442dd64..b07730854 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/MonsterDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dialog/MonsterDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dialog; +package com.mango.moshen.ui.widget.dialog; import android.content.Context; import androidx.databinding.DataBindingUtil; @@ -13,14 +13,14 @@ import android.view.View; import android.view.Window; import android.view.WindowManager; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.databinding.DialogMonsterBinding; -import com.yizhuan.xchat_android_library.utils.SizeUtils; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.databinding.DialogMonsterBinding; +import com.mango.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.core.UriProvider; +import com.mango.core.monsterhunting.bean.MonsterInfo; +import com.mango.core.monsterhunting.bean.MonsterProtocol; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/dialog/OpenNobleDialog.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/dialog/OpenNobleDialog.java index 78e7305f8..ff15921ec 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dialog/OpenNobleDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dialog; +package com.mango.moshen.ui.widget.dialog; import android.content.Context; import android.os.Bundle; @@ -8,10 +8,10 @@ import android.text.TextUtils; import android.view.View; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.core.UriProvider; +import com.mango.core.noble.NobleUtil; /** *

开通贵族弹窗提示

diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java index cacc03bf7..104fd9f18 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dialog; +package com.mango.moshen.ui.widget.dialog; import android.animation.Animator; import android.content.Context; @@ -11,9 +11,9 @@ import android.view.Gravity; import android.view.Window; import android.view.WindowManager; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.SizeUtils; -import com.yizhuan.erban.ui.widget.MarqueeLayout; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.ui.widget.MarqueeLayout; /** *

diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftHelper.java b/app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftHelper.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftHelper.java rename to app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftHelper.java index f39c25e3b..65daf1986 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftHelper.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.drawgift; +package com.mango.moshen.ui.widget.drawgift; import android.app.Activity; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftModel.java b/app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftModel.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftModel.java rename to app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftModel.java index ac8f5aa90..9ae6e3860 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftModel.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.drawgift; +package com.mango.moshen.ui.widget.drawgift; import android.graphics.Bitmap; import android.graphics.Matrix; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftPlayHelper.java b/app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftPlayHelper.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftPlayHelper.java rename to app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftPlayHelper.java index 8154599a0..ba25c2e1e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftPlayHelper.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftPlayHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.drawgift; +package com.mango.moshen.ui.widget.drawgift; import android.app.Activity; import android.content.Context; @@ -16,10 +16,10 @@ import android.widget.FrameLayout; import com.bumptech.glide.Glide; import com.bumptech.glide.request.FutureTarget; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.core.gift.GiftModel; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.xchat_android_library.utils.ListUtils; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftPlayView.java b/app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftPlayView.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftPlayView.java rename to app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftPlayView.java index 8f8c5accb..56ae8a75e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftPlayView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftPlayView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.drawgift; +package com.mango.moshen.ui.widget.drawgift; import android.animation.Animator; import android.animation.ValueAnimator; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftView.java b/app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftView.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftView.java rename to app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftView.java index 285f6319d..ff48c3b27 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/drawgift/DrawGiftView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/drawgift/DrawGiftView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.drawgift; +package com.mango.moshen.ui.widget.drawgift; import android.app.Activity; import android.content.Context; @@ -17,7 +17,7 @@ import android.view.View; import android.view.WindowManager; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceAdapter.java b/app/src/main/java/com/mango/moshen/ui/widget/dynamicface/DynamicFaceAdapter.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceAdapter.java rename to app/src/main/java/com/mango/moshen/ui/widget/dynamicface/DynamicFaceAdapter.java index 6270f5ad7..9bd067dc3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dynamicface/DynamicFaceAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dynamicface; +package com.mango.moshen.ui.widget.dynamicface; import android.content.Context; import android.view.LayoutInflater; @@ -8,13 +8,13 @@ import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.vip.VipHelper; -import com.yizhuan.xchat_android_core.gift.bean.SimpleVipInfo; -import com.yizhuan.xchat_android_core.room.face.FaceInfo; -import com.yizhuan.xchat_android_core.utils.TextUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.vip.VipHelper; +import com.mango.core.gift.bean.SimpleVipInfo; +import com.mango.core.room.face.FaceInfo; +import com.mango.core.utils.TextUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.io.File; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceBuilder.java b/app/src/main/java/com/mango/moshen/ui/widget/dynamicface/DynamicFaceBuilder.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceBuilder.java rename to app/src/main/java/com/mango/moshen/ui/widget/dynamicface/DynamicFaceBuilder.java index 5ad2a4c85..1c8a55f4b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceBuilder.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dynamicface/DynamicFaceBuilder.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.ui.widget.dynamicface; +package com.mango.moshen.ui.widget.dynamicface; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** * Created by chenran on 2017/9/9. diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/dynamicface/DynamicFaceDialog.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java rename to app/src/main/java/com/mango/moshen/ui/widget/dynamicface/DynamicFaceDialog.java index c038856d3..05c69c830 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dynamicface/DynamicFaceDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dynamicface; +package com.mango.moshen.ui.widget.dynamicface; import android.content.Context; import android.os.Bundle; @@ -20,22 +20,19 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.widget.dialog.OpenNobleDialog; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.erban.vip.VipMainActivity; -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; -import com.yizhuan.xchat_android_core.room.face.FaceInfo; -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.LogUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.moshen.vip.VipMainActivity; +import com.mango.core.market_verify.MarketVerifyModel; +import com.mango.core.room.event.FaceIsReadyEvent; +import com.mango.core.room.face.DynamicFaceModel; +import com.mango.core.room.face.FaceInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.LogUtils; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/FaceItem.java b/app/src/main/java/com/mango/moshen/ui/widget/dynamicface/FaceItem.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/FaceItem.java rename to app/src/main/java/com/mango/moshen/ui/widget/dynamicface/FaceItem.java index 119658472..c9340c95c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/FaceItem.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dynamicface/FaceItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dynamicface; +package com.mango.moshen.ui.widget.dynamicface; /** * Created by chenran on 2017/9/9. diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/FaceResultItem.java b/app/src/main/java/com/mango/moshen/ui/widget/dynamicface/FaceResultItem.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/FaceResultItem.java rename to app/src/main/java/com/mango/moshen/ui/widget/dynamicface/FaceResultItem.java index 8eac9f3f5..41b1a2436 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/FaceResultItem.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/dynamicface/FaceResultItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.dynamicface; +package com.mango.moshen.ui.widget.dynamicface; /** * Created by chenran on 2017/9/9. diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/GuideUtils.java b/app/src/main/java/com/mango/moshen/ui/widget/higuide/GuideUtils.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/higuide/GuideUtils.java rename to app/src/main/java/com/mango/moshen/ui/widget/higuide/GuideUtils.java index 099b343f9..9c7268ecb 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/GuideUtils.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/higuide/GuideUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.higuide; +package com.mango.moshen.ui.widget.higuide; import android.content.Context; import android.graphics.Point; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/GuideView.java b/app/src/main/java/com/mango/moshen/ui/widget/higuide/GuideView.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/higuide/GuideView.java rename to app/src/main/java/com/mango/moshen/ui/widget/higuide/GuideView.java index fe9dea74d..0673137de 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/GuideView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/higuide/GuideView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.higuide; +package com.mango.moshen.ui.widget.higuide; import android.content.Context; import android.graphics.Canvas; @@ -13,9 +13,9 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.RelativeLayout; -import com.yizhuan.erban.ui.widget.higuide.Overlay.HightLight; -import com.yizhuan.erban.ui.widget.higuide.Overlay.Tips; -import com.yizhuan.erban.ui.widget.higuide.Overlay.Tips.Margin; +import com.mango.moshen.ui.widget.higuide.Overlay.HightLight; +import com.mango.moshen.ui.widget.higuide.Overlay.Tips; +import com.mango.moshen.ui.widget.higuide.Overlay.Tips.Margin; /** * Create By Zii at 2018/5/3. diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/HiGuide.java b/app/src/main/java/com/mango/moshen/ui/widget/higuide/HiGuide.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/higuide/HiGuide.java rename to app/src/main/java/com/mango/moshen/ui/widget/higuide/HiGuide.java index 45ea20298..40ad50fb4 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/HiGuide.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/higuide/HiGuide.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.higuide; +package com.mango.moshen.ui.widget.higuide; import android.app.Activity; import android.content.Context; @@ -7,9 +7,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.higuide.GuideView.RemoveCallback; -import com.yizhuan.erban.ui.widget.higuide.Overlay.Tips; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.higuide.GuideView.RemoveCallback; +import com.mango.moshen.ui.widget.higuide.Overlay.Tips; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/HiLightInfo.java b/app/src/main/java/com/mango/moshen/ui/widget/higuide/HiLightInfo.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/higuide/HiLightInfo.java rename to app/src/main/java/com/mango/moshen/ui/widget/higuide/HiLightInfo.java index 1af7434ec..08a229953 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/HiLightInfo.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/higuide/HiLightInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.higuide; +package com.mango.moshen.ui.widget.higuide; import android.graphics.Rect; import android.graphics.RectF; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/LightConfig.java b/app/src/main/java/com/mango/moshen/ui/widget/higuide/LightConfig.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/higuide/LightConfig.java rename to app/src/main/java/com/mango/moshen/ui/widget/higuide/LightConfig.java index b76f68c73..f94ecd379 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/LightConfig.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/higuide/LightConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.higuide; +package com.mango.moshen.ui.widget.higuide; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/OverLayer.java b/app/src/main/java/com/mango/moshen/ui/widget/higuide/OverLayer.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/higuide/OverLayer.java rename to app/src/main/java/com/mango/moshen/ui/widget/higuide/OverLayer.java index c64e20194..2fc5b3b5e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/OverLayer.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/higuide/OverLayer.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.higuide; +package com.mango.moshen.ui.widget.higuide; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/Overlay.java b/app/src/main/java/com/mango/moshen/ui/widget/higuide/Overlay.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/higuide/Overlay.java rename to app/src/main/java/com/mango/moshen/ui/widget/higuide/Overlay.java index 2db4f4b26..dc6c5f56c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/Overlay.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/higuide/Overlay.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.higuide; +package com.mango.moshen.ui.widget.higuide; import android.graphics.Color; import android.graphics.RectF; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideHelper.java b/app/src/main/java/com/mango/moshen/ui/widget/higuide/TuTuGuideHelper.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideHelper.java rename to app/src/main/java/com/mango/moshen/ui/widget/higuide/TuTuGuideHelper.java index 6b0612eed..747cab99e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideHelper.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/higuide/TuTuGuideHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.higuide; +package com.mango.moshen.ui.widget.higuide; import android.app.Activity; import android.app.Dialog; @@ -11,11 +11,11 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.ImageView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.utils.ActivityUtil; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideView.java b/app/src/main/java/com/mango/moshen/ui/widget/higuide/TuTuGuideView.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideView.java rename to app/src/main/java/com/mango/moshen/ui/widget/higuide/TuTuGuideView.java index b0f9aa73a..7463cf0c7 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/higuide/TuTuGuideView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.higuide; +package com.mango.moshen.ui.widget.higuide; import android.content.Context; import android.graphics.Canvas; @@ -13,8 +13,8 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/interfacex/MicListItem.java b/app/src/main/java/com/mango/moshen/ui/widget/interfacex/MicListItem.java similarity index 75% rename from app/src/main/java/com/yizhuan/erban/ui/widget/interfacex/MicListItem.java rename to app/src/main/java/com/mango/moshen/ui/widget/interfacex/MicListItem.java index a8d68c389..ccac5e086 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/interfacex/MicListItem.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/interfacex/MicListItem.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.ui.widget.interfacex; +package com.mango.moshen.ui.widget.interfacex; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.core.user.bean.UserInfo; /** * Created by zhouxiangfeng on 2017/6/15. diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/FragmentContainerHelper.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/FragmentContainerHelper.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/FragmentContainerHelper.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/FragmentContainerHelper.java index f71e10ca9..b60446512 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/FragmentContainerHelper.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/FragmentContainerHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator; +package com.mango.moshen.ui.widget.magicindicator; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -9,7 +9,7 @@ import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.Interpolator; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/GiftIndicator.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/GiftIndicator.java index 91a981b9b..7e1f96d05 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/GiftIndicator.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator; +package com.mango.moshen.ui.widget.magicindicator; import android.content.Context; import androidx.annotation.Nullable; @@ -8,9 +8,9 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.gift.bean.GiftTab; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.gift.bean.GiftTab; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/MagicIndicator.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/MagicIndicator.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/MagicIndicator.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/MagicIndicator.java index 4a678c511..298da1ee7 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/MagicIndicator.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/MagicIndicator.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.ui.widget.magicindicator; +package com.mango.moshen.ui.widget.magicindicator; import android.content.Context; import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; -import com.yizhuan.erban.ui.widget.magicindicator.abs.IPagerNavigator; +import com.mango.moshen.ui.widget.magicindicator.abs.IPagerNavigator; /** * 整个框架的入口，核心 diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/NavigatorHelper.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/NavigatorHelper.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/NavigatorHelper.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/NavigatorHelper.java index a0e3f6d0f..afba0dabd 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/NavigatorHelper.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/NavigatorHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator; +package com.mango.moshen.ui.widget.magicindicator; import android.util.SparseArray; import android.util.SparseBooleanArray; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ScrollState.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/ScrollState.java similarity index 81% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ScrollState.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/ScrollState.java index 72ec12748..46cbcf66a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ScrollState.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/ScrollState.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator; +package com.mango.moshen.ui.widget.magicindicator; /** * 自定义滚动状态，消除对ViewPager的依赖 diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ViewPagerHelper.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/ViewPagerHelper.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ViewPagerHelper.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/ViewPagerHelper.java index de374f4b9..8f46e40a8 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ViewPagerHelper.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/ViewPagerHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator; +package com.mango.moshen.ui.widget.magicindicator; import androidx.viewpager.widget.ViewPager; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/abs/IPagerNavigator.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/abs/IPagerNavigator.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/abs/IPagerNavigator.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/abs/IPagerNavigator.java index 589094c61..3e9f92532 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/abs/IPagerNavigator.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/abs/IPagerNavigator.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.abs; +package com.mango.moshen.ui.widget.magicindicator.abs; /** * 抽象的ViewPager导航器 diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java index 51658cd09..ee75b4d1a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/ArgbEvaluatorHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins; +package com.mango.moshen.ui.widget.magicindicator.buildins; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/UIUtil.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/UIUtil.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/UIUtil.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/UIUtil.java index dcdc925f5..4cf0f487e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/UIUtil.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/UIUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins; +package com.mango.moshen.ui.widget.magicindicator.buildins; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java index 95eca6d59..a9b026b11 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/circlenavigator/CircleNavigator.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.circlenavigator; +package com.mango.moshen.ui.widget.magicindicator.buildins.circlenavigator; import android.content.Context; import android.graphics.Canvas; @@ -11,8 +11,8 @@ import android.view.animation.Interpolator; import android.view.animation.LinearInterpolator; -import com.yizhuan.erban.ui.widget.magicindicator.abs.IPagerNavigator; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.abs.IPagerNavigator; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java index 04a94d4ea..2869cd2f5 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/CommonNavigator.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator; import android.content.Context; import android.database.DataSetObserver; @@ -9,15 +9,15 @@ import android.widget.FrameLayout; import android.widget.HorizontalScrollView; import android.widget.LinearLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.NavigatorHelper; -import com.yizhuan.erban.ui.widget.magicindicator.ScrollState; -import com.yizhuan.erban.ui.widget.magicindicator.abs.IPagerNavigator; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; -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.model.PositionData; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.NavigatorHelper; +import com.mango.moshen.ui.widget.magicindicator.ScrollState; +import com.mango.moshen.ui.widget.magicindicator.abs.IPagerNavigator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java index ccc18761c..adc17d901 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/abs/CommonNavigatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs; import android.content.Context; import android.database.DataSetObservable; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java similarity index 79% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java index bc15f4608..198696d24 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/abs/IMeasurablePagerTitleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java similarity index 71% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java index 98fbbb17d..0997b9469 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerIndicator.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java index 6e0abe9d6..93a8a1667 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/abs/IPagerTitleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs; /** * 抽象的指示器标题，适用于CommonNavigator diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java index 8e86be720..bdf7f86d0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/BezierPagerIndicator.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators; import android.content.Context; import android.graphics.Canvas; @@ -10,11 +10,11 @@ import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; -import com.yizhuan.erban.ui.widget.magicindicator.FragmentContainerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.mango.moshen.ui.widget.magicindicator.FragmentContainerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java index f80ec8124..a8a787089 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators; import android.content.Context; import android.graphics.Canvas; @@ -9,11 +9,11 @@ import android.view.animation.Interpolator; import android.view.animation.LinearInterpolator; -import com.yizhuan.erban.ui.widget.magicindicator.FragmentContainerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.mango.moshen.ui.widget.magicindicator.FragmentContainerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java index 29aba0c5d..1b3f7868d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/TestPagerIndicator.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators; import android.content.Context; import android.graphics.Canvas; @@ -8,9 +8,9 @@ import android.graphics.RectF; import android.view.View; -import com.yizhuan.erban.ui.widget.magicindicator.FragmentContainerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.mango.moshen.ui.widget.magicindicator.FragmentContainerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java index 631c7a445..53f5818f3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/TriangularPagerIndicator.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators; import android.content.Context; import android.graphics.Canvas; @@ -9,10 +9,10 @@ import android.view.animation.Interpolator; import android.view.animation.LinearInterpolator; -import com.yizhuan.erban.ui.widget.magicindicator.FragmentContainerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.mango.moshen.ui.widget.magicindicator.FragmentContainerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.java index e7fc81449..49a30b246 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/indicators/WrapPagerIndicator.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators; import android.content.Context; import android.graphics.Canvas; @@ -10,10 +10,10 @@ import android.view.View; import android.view.animation.Interpolator; import android.view.animation.LinearInterpolator; -import com.yizhuan.erban.ui.widget.magicindicator.FragmentContainerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; +import com.mango.moshen.ui.widget.magicindicator.FragmentContainerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.model.PositionData; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java index 2d5a40071..5cff81eba 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/model/PositionData.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.model; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.model; /** * 保存指示器标题的坐标 diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java index 3e782e8f4..2d7698d5c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.titles; import android.content.Context; import android.graphics.Canvas; @@ -6,8 +6,8 @@ import android.graphics.Paint; import android.graphics.Rect; import android.view.View; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java index 3e44be2fe..388d3bba6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/ColorTransitionPagerTitleView.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.titles; import android.content.Context; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; +import com.mango.moshen.ui.widget.magicindicator.buildins.ArgbEvaluatorHolder; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java index 2a0d11453..609a7e798 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/CommonPagerTitleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.titles; import android.content.Context; import android.view.LayoutInflater; @@ -6,7 +6,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java similarity index 80% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java index 1228fbfaf..f5086c16b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/DummyPagerTitleView.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.titles; import android.content.Context; import android.view.View; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; /** * 空指示器标题，用于只需要指示器而不需要title的需求 diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java index 35b99b26d..aaab3556b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/SimplePagerTitleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.titles; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.titles; import android.content.Context; import android.graphics.Paint; @@ -7,8 +7,8 @@ import android.text.TextUtils; import android.view.Gravity; import android.widget.TextView; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java similarity index 78% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java index 5b1ee24a6..807d11423 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeAnchor.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; /** * 角标的锚点 diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java index 70d0574ef..2e5fddf53 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgePagerTitleView.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; import android.content.Context; import android.view.View; import android.widget.FrameLayout; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java index 4de0297f2..61687185d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/buildins/commonnavigator/titles/badge/BadgeRule.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; +package com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.titles.badge; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ext/FontChangePagerTitleView.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/ext/FontChangePagerTitleView.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ext/FontChangePagerTitleView.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/ext/FontChangePagerTitleView.java index fb88ee8a3..1d7b80f84 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ext/FontChangePagerTitleView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/ext/FontChangePagerTitleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.magicindicator.ext; +package com.mango.moshen.ui.widget.magicindicator.ext; import android.content.Context; import android.graphics.Paint; @@ -8,8 +8,8 @@ import android.view.Gravity; import android.widget.LinearLayout; import android.widget.TextView; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView; /** * create by lvzebiao @2019/5/5 diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java similarity index 82% rename from app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java rename to app/src/main/java/com/mango/moshen/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java index d47c8bd46..2b378414e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.ui.widget.magicindicator.ext; +package com.mango.moshen.ui.widget.magicindicator.ext; import android.content.Context; import androidx.core.content.ContextCompat; -import com.yizhuan.erban.R; -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.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/AvRoomNobleWelcomeView.java b/app/src/main/java/com/mango/moshen/ui/widget/marqueeview/AvRoomNobleWelcomeView.java similarity index 93% rename from app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/AvRoomNobleWelcomeView.java rename to app/src/main/java/com/mango/moshen/ui/widget/marqueeview/AvRoomNobleWelcomeView.java index 2a39793c1..6d8ac796c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/AvRoomNobleWelcomeView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/marqueeview/AvRoomNobleWelcomeView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.marqueeview; +package com.mango.moshen.ui.widget.marqueeview; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -14,11 +14,11 @@ import android.view.animation.LinearInterpolator; import android.widget.RelativeLayout; 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_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.ScreenUtils; +import com.mango.xchat_android_library.utils.SizeUtils; +import com.mango.core.noble.NobleInfo; +import com.mango.core.noble.NobleUtil; /** *

贵族进入房间欢迎界面 diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/BetterMarqueeView.java b/app/src/main/java/com/mango/moshen/ui/widget/marqueeview/BetterMarqueeView.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/BetterMarqueeView.java rename to app/src/main/java/com/mango/moshen/ui/widget/marqueeview/BetterMarqueeView.java index 996fd4034..4cb698d41 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/BetterMarqueeView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/marqueeview/BetterMarqueeView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.marqueeview; +package com.mango.moshen.ui.widget.marqueeview; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/MarqueeView.java b/app/src/main/java/com/mango/moshen/ui/widget/marqueeview/MarqueeView.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/MarqueeView.java rename to app/src/main/java/com/mango/moshen/ui/widget/marqueeview/MarqueeView.java index c808f2a47..7fbc6089d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/MarqueeView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/marqueeview/MarqueeView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.marqueeview; +package com.mango.moshen.ui.widget.marqueeview; import android.content.Context; import android.content.res.TypedArray; @@ -14,7 +14,7 @@ import android.view.animation.AnimationUtils; import android.widget.TextView; import android.widget.ViewFlipper; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/Utils.java b/app/src/main/java/com/mango/moshen/ui/widget/marqueeview/Utils.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/Utils.java rename to app/src/main/java/com/mango/moshen/ui/widget/marqueeview/Utils.java index df76e386f..e8766b44c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/Utils.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/marqueeview/Utils.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.marqueeview; +package com.mango.moshen.ui.widget.marqueeview; import android.annotation.TargetApi; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java b/app/src/main/java/com/mango/moshen/ui/widget/password/PassWordFragment.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java rename to app/src/main/java/com/mango/moshen/ui/widget/password/PassWordFragment.java index 1a180c0e9..85154f7fe 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/password/PassWordFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.password; +package com.mango.moshen.ui.widget.password; import android.app.Activity; @@ -17,11 +17,11 @@ import android.view.WindowManager; import com.jungly.gridpasswordview.GridPasswordView; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.setting.VerifyPhoneActivity; -import com.yizhuan.erban.ui.wallet.ExchangeGoldActivity; -import com.yizhuan.erban.ui.withdraw.WithdrawActivity; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; +import com.mango.moshen.R; +import com.mango.moshen.ui.setting.VerifyPhoneActivity; +import com.mango.moshen.ui.wallet.ExchangeGoldActivity; +import com.mango.moshen.ui.withdraw.WithdrawActivity; +import com.mango.xchat_android_library.utils.codec.DESUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PasswordEvent.java b/app/src/main/java/com/mango/moshen/ui/widget/password/PasswordEvent.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/ui/widget/password/PasswordEvent.java rename to app/src/main/java/com/mango/moshen/ui/widget/password/PasswordEvent.java index 82be8e39e..460fa9488 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PasswordEvent.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/password/PasswordEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.password; +package com.mango.moshen.ui.widget.password; import lombok.Data; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PasswordKeyboardView.java b/app/src/main/java/com/mango/moshen/ui/widget/password/PasswordKeyboardView.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/password/PasswordKeyboardView.java rename to app/src/main/java/com/mango/moshen/ui/widget/password/PasswordKeyboardView.java index 40b6b1d3c..505bc3149 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PasswordKeyboardView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/password/PasswordKeyboardView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.password; +package com.mango.moshen.ui.widget.password; import android.content.Context; import android.content.res.TypedArray; @@ -11,7 +11,7 @@ import android.inputmethodservice.Keyboard; import android.inputmethodservice.KeyboardView; import android.util.AttributeSet; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.util.Arrays; import java.util.Collections; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PasswordView.java b/app/src/main/java/com/mango/moshen/ui/widget/password/PasswordView.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/ui/widget/password/PasswordView.java rename to app/src/main/java/com/mango/moshen/ui/widget/password/PasswordView.java index bbc4541c4..a7eb7faa3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PasswordView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/password/PasswordView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.password; +package com.mango.moshen.ui.widget.password; import android.content.Context; import android.util.AttributeSet; @@ -8,7 +8,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.jungly.gridpasswordview.GridPasswordView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/ColorDecoration.java b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/ColorDecoration.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/ColorDecoration.java rename to app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/ColorDecoration.java index 2b28021d7..35f7bf412 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/ColorDecoration.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/ColorDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.recyclerview.decoration; +package com.mango.moshen.ui.widget.recyclerview.decoration; import android.graphics.Canvas; import android.graphics.Rect; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DatingItemDecoration.java b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/DatingItemDecoration.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DatingItemDecoration.java rename to app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/DatingItemDecoration.java index c5186c149..bdddc27b9 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DatingItemDecoration.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/DatingItemDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.recyclerview.decoration; +package com.mango.moshen.ui.widget.recyclerview.decoration; import android.graphics.Rect; 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/mango/moshen/ui/widget/recyclerview/decoration/DividerItemDecoration.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DividerItemDecoration.java rename to app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/DividerItemDecoration.java index cc1e9de39..54f0ec86c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DividerItemDecoration.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/DividerItemDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.recyclerview.decoration; +package com.mango.moshen.ui.widget.recyclerview.decoration; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java rename to app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java index aae3d1c92..39a69192f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.recyclerview.decoration; +package com.mango.moshen.ui.widget.recyclerview.decoration; import android.content.Context; import android.graphics.Rect; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridVItemDecoration.java b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/GridVItemDecoration.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridVItemDecoration.java rename to app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/GridVItemDecoration.java index dc362677d..8d60e4c22 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridVItemDecoration.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/GridVItemDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.recyclerview.decoration; +package com.mango.moshen.ui.widget.recyclerview.decoration; import android.content.Context; import android.graphics.Rect; @@ -7,7 +7,7 @@ import android.view.View; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; import lombok.Setter; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/HorizontalDecoration.java b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/HorizontalDecoration.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/HorizontalDecoration.java rename to app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/HorizontalDecoration.java index d5662f83c..888273d74 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/HorizontalDecoration.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/HorizontalDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.recyclerview.decoration; +package com.mango.moshen.ui.widget.recyclerview.decoration; import android.graphics.Rect; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/SpacingDecoration.java b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/SpacingDecoration.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/SpacingDecoration.java rename to app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/SpacingDecoration.java index 905b973a1..019b68f80 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/SpacingDecoration.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/SpacingDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.recyclerview.decoration; +package com.mango.moshen.ui.widget.recyclerview.decoration; import android.graphics.Rect; import androidx.recyclerview.widget.GridLayoutManager; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/VerticalDecoration.java b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/VerticalDecoration.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/VerticalDecoration.java rename to app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/VerticalDecoration.java index 97b0c50c5..712476820 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/VerticalDecoration.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/decoration/VerticalDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.recyclerview.decoration; +package com.mango.moshen.ui.widget.recyclerview.decoration; import android.graphics.Rect; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java rename to app/src/main/java/com/mango/moshen/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java index 05eef6811..33c62fe39 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.recyclerview.layoutmanager; +package com.mango.moshen.ui.widget.recyclerview.layoutmanager; import android.content.Context; import androidx.recyclerview.widget.GridLayoutManager; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java rename to app/src/main/java/com/mango/moshen/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java index 0063aea55..c660cde74 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.recyclerview.layoutmanager; +package com.mango.moshen.ui.widget.recyclerview.layoutmanager; import android.content.Context; import androidx.recyclerview.widget.LinearLayoutManager; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/HintView.java b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/HintView.java similarity index 67% rename from app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/HintView.java rename to app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/HintView.java index 0e49bb9f1..dc4160585 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/HintView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/HintView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.rollviewpager; +package com.mango.moshen.ui.widget.rollviewpager; public interface HintView { diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/OnItemClickListener.java b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/OnItemClickListener.java similarity index 70% rename from app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/OnItemClickListener.java rename to app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/OnItemClickListener.java index 08b2d0033..a4f03058d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/OnItemClickListener.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/OnItemClickListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.rollviewpager; +package com.mango.moshen.ui.widget.rollviewpager; /** * Created by zhuchenxi on 16/8/4. diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/RollPagerView.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java rename to app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/RollPagerView.java index 8a70db263..0b128e809 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/RollPagerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.rollviewpager; +package com.mango.moshen.ui.widget.rollviewpager; import android.content.Context; import android.content.res.TypedArray; @@ -22,9 +22,9 @@ import androidx.viewpager.widget.ViewPager; import androidx.viewpager.widget.ViewPager.OnPageChangeListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.rollviewpager.adapter.LoopPagerAdapter; -import com.yizhuan.erban.ui.widget.rollviewpager.hintview.ColorPointHintView; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.rollviewpager.adapter.LoopPagerAdapter; +import com.mango.moshen.ui.widget.rollviewpager.hintview.ColorPointHintView; import java.lang.ref.WeakReference; import java.lang.reflect.Field; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/Util.java b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/Util.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/Util.java rename to app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/Util.java index 5bfb6a1fb..e57e8eeee 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/Util.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/Util.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.rollviewpager; +package com.mango.moshen.ui.widget.rollviewpager; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java rename to app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java index f365d2da1..064cc6e48 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/adapter/DynamicPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.rollviewpager.adapter; +package com.mango.moshen.ui.widget.rollviewpager.adapter; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java rename to app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java index 081ce5410..d4148cabe 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/adapter/LoopPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.rollviewpager.adapter; +package com.mango.moshen.ui.widget.rollviewpager.adapter; import android.database.DataSetObserver; import android.view.View; @@ -8,8 +8,8 @@ import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; -import com.yizhuan.erban.ui.widget.rollviewpager.HintView; -import com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView; +import com.mango.moshen.ui.widget.rollviewpager.HintView; +import com.mango.moshen.ui.widget.rollviewpager.RollPagerView; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java rename to app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java index 46d9d2499..cf5235338 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/adapter/StaticPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.rollviewpager.adapter; +package com.mango.moshen.ui.widget.rollviewpager.adapter; import android.view.View; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java rename to app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java index 98ceee4fe..7971ee44b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/adapter/StaticPagerAdapterWrapper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.rollviewpager.adapter; +package com.mango.moshen.ui.widget.rollviewpager.adapter; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/ColorPointHintView.java b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/hintview/ColorPointHintView.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/ColorPointHintView.java rename to app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/hintview/ColorPointHintView.java index d8042b163..0afc15206 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/ColorPointHintView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/hintview/ColorPointHintView.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.ui.widget.rollviewpager.hintview; +package com.mango.moshen.ui.widget.rollviewpager.hintview; import android.content.Context; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; -import com.yizhuan.erban.ui.widget.rollviewpager.Util; +import com.mango.moshen.ui.widget.rollviewpager.Util; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/IconHintView.java b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/hintview/IconHintView.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/IconHintView.java rename to app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/hintview/IconHintView.java index b38c6fdb6..fb603cc21 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/IconHintView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/hintview/IconHintView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.rollviewpager.hintview; +package com.mango.moshen.ui.widget.rollviewpager.hintview; import android.content.Context; import android.graphics.Bitmap; @@ -10,7 +10,7 @@ import android.graphics.drawable.Drawable; import androidx.annotation.DrawableRes; -import com.yizhuan.erban.ui.widget.rollviewpager.Util; +import com.mango.moshen.ui.widget.rollviewpager.Util; /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/ShapeHintView.java b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/hintview/ShapeHintView.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/ShapeHintView.java rename to app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/hintview/ShapeHintView.java index d86ba9258..12460ae3d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/ShapeHintView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/hintview/ShapeHintView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.widget.rollviewpager.hintview; +package com.mango.moshen.ui.widget.rollviewpager.hintview; import android.content.Context; import android.graphics.drawable.Drawable; @@ -7,7 +7,7 @@ import android.view.Gravity; import android.widget.ImageView; import android.widget.LinearLayout; -import com.yizhuan.erban.ui.widget.rollviewpager.HintView; +import com.mango.moshen.ui.widget.rollviewpager.HintView; public abstract class ShapeHintView extends LinearLayout implements HintView { diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/TextHintView.java b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/hintview/TextHintView.java similarity index 84% rename from app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/TextHintView.java rename to app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/hintview/TextHintView.java index cc3cf3f47..8608eb565 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/TextHintView.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/rollviewpager/hintview/TextHintView.java @@ -1,13 +1,12 @@ -package com.yizhuan.erban.ui.widget.rollviewpager.hintview; +package com.mango.moshen.ui.widget.rollviewpager.hintview; import android.content.Context; -import android.graphics.Color; import android.util.AttributeSet; import android.view.Gravity; import androidx.appcompat.widget.AppCompatTextView; -import com.yizhuan.erban.ui.widget.rollviewpager.HintView; +import com.mango.moshen.ui.widget.rollviewpager.HintView; public class TextHintView extends AppCompatTextView implements HintView { diff --git a/app/src/main/java/com/yizhuan/erban/ui/withdraw/BinderAlipayActivity.java b/app/src/main/java/com/mango/moshen/ui/withdraw/BinderAlipayActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/withdraw/BinderAlipayActivity.java rename to app/src/main/java/com/mango/moshen/ui/withdraw/BinderAlipayActivity.java index 9686a6030..9298ed213 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/withdraw/BinderAlipayActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/withdraw/BinderAlipayActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.withdraw; +package com.mango.moshen.ui.withdraw; import android.annotation.SuppressLint; import android.content.Context; @@ -14,17 +14,17 @@ import android.widget.ImageView; import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.ui.login.CodeDownTimer; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.code.CodeType; -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.BeanObserver; -import com.yizhuan.xchat_android_core.withdraw.WithdrawModel; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo; -import com.yizhuan.xchat_android_library.utils.FormatUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.ui.login.CodeDownTimer; +import com.mango.core.auth.AuthModel; +import com.mango.core.code.CodeType; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.withdraw.WithdrawModel; +import com.mango.core.withdraw.bean.WithdrawInfo; +import com.mango.xchat_android_library.utils.FormatUtils; import java.text.MessageFormat; diff --git a/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java b/app/src/main/java/com/mango/moshen/ui/withdraw/WithdrawActivity.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java rename to app/src/main/java/com/mango/moshen/ui/withdraw/WithdrawActivity.java index 2c1e03feb..f46e09f3e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/withdraw/WithdrawActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.withdraw; +package com.mango.moshen.ui.withdraw; import android.annotation.SuppressLint; import android.content.Intent; @@ -18,31 +18,31 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bills.activities.WithdrawBillsActivity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.setting.ModifyPwdActivity; -import com.yizhuan.erban.ui.wallet.adapter.WithdrawJewelAdapter; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.password.PassWordFragment; -import com.yizhuan.erban.ui.withdraw.bankcard.BindWithdrawBankCardActivity; -import com.yizhuan.erban.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.initial.bean.TaxInfo; -import com.yizhuan.xchat_android_core.pay.bean.NotRealNameYetException; -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.BeanObserver; -import com.yizhuan.xchat_android_core.withdraw.WithdrawModel; -import com.yizhuan.xchat_android_core.withdraw.bean.ExchangerInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.RefreshInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrwaListInfo; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.bills.activities.WithdrawBillsActivity; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.ui.setting.ModifyPwdActivity; +import com.mango.moshen.ui.wallet.adapter.WithdrawJewelAdapter; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.ui.widget.password.PassWordFragment; +import com.mango.moshen.ui.withdraw.bankcard.BindWithdrawBankCardActivity; +import com.mango.moshen.utils.SpannableBuilder; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.initial.bean.TaxInfo; +import com.mango.core.pay.bean.NotRealNameYetException; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.withdraw.WithdrawModel; +import com.mango.core.withdraw.bean.ExchangerInfo; +import com.mango.core.withdraw.bean.RefreshInfo; +import com.mango.core.withdraw.bean.WithdrawInfo; +import com.mango.core.withdraw.bean.WithdrwaListInfo; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawRuleActivity.java b/app/src/main/java/com/mango/moshen/ui/withdraw/WithdrawRuleActivity.java similarity index 76% rename from app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawRuleActivity.java rename to app/src/main/java/com/mango/moshen/ui/withdraw/WithdrawRuleActivity.java index 4cfdb1db4..3200ab7fc 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawRuleActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/withdraw/WithdrawRuleActivity.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.ui.withdraw; +package com.mango.moshen.ui.withdraw; import android.os.Bundle; import android.webkit.WebView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.xchat_android_core.UriProvider; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.core.UriProvider; public class WithdrawRuleActivity extends BaseActivity { private WebView mWebView; diff --git a/app/src/main/java/com/yizhuan/erban/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java b/app/src/main/java/com/mango/moshen/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java similarity index 91% rename from app/src/main/java/com/yizhuan/erban/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java rename to app/src/main/java/com/mango/moshen/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java index 96729fe39..8af31a80c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.ui.withdraw.bankcard; +package com.mango.moshen.ui.withdraw.bankcard; import android.os.Bundle; import com.google.android.material.textfield.TextInputEditText; @@ -9,17 +9,17 @@ import android.widget.Button; import android.widget.TextView; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.ui.login.CodeDownTimer; -import com.yizhuan.erban.ui.widget.TextWatcherSimple; -import com.yizhuan.xchat_android_core.code.CodeModel; -import com.yizhuan.xchat_android_core.code.CodeType; -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.withdraw.WithdrawModel; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.ui.login.CodeDownTimer; +import com.mango.moshen.ui.widget.TextWatcherSimple; +import com.mango.core.code.CodeModel; +import com.mango.core.code.CodeType; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.withdraw.WithdrawModel; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/yizhuan/erban/utils/ActWhiteListMrg.java b/app/src/main/java/com/mango/moshen/utils/ActWhiteListMrg.java similarity index 77% rename from app/src/main/java/com/yizhuan/erban/utils/ActWhiteListMrg.java rename to app/src/main/java/com/mango/moshen/utils/ActWhiteListMrg.java index 110739401..f2bd5e4fc 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/ActWhiteListMrg.java +++ b/app/src/main/java/com/mango/moshen/utils/ActWhiteListMrg.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.content.Context; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.erban.MiddleActivity; -import com.yizhuan.erban.NimMiddleActivity; -import com.yizhuan.erban.other.activity.SplashActivity; -import com.yizhuan.xchat_android_core.pay.PaymentActivity; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; +import com.mango.moshen.MiddleActivity; +import com.mango.moshen.NimMiddleActivity; +import com.mango.moshen.other.activity.SplashActivity; +import com.mango.core.pay.PaymentActivity; +import com.mango.core.utils.ActivityUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/utils/AppBarStateChangeListener.java b/app/src/main/java/com/mango/moshen/utils/AppBarStateChangeListener.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/utils/AppBarStateChangeListener.java rename to app/src/main/java/com/mango/moshen/utils/AppBarStateChangeListener.java index 6ebc8de01..103c76e71 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/AppBarStateChangeListener.java +++ b/app/src/main/java/com/mango/moshen/utils/AppBarStateChangeListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import com.google.android.material.appbar.AppBarLayout; diff --git a/app/src/main/java/com/yizhuan/erban/utils/BlurTransformation.java b/app/src/main/java/com/mango/moshen/utils/BlurTransformation.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/utils/BlurTransformation.java rename to app/src/main/java/com/mango/moshen/utils/BlurTransformation.java index 03811b337..cf045ee2c 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/BlurTransformation.java +++ b/app/src/main/java/com/mango/moshen/utils/BlurTransformation.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java b/app/src/main/java/com/mango/moshen/utils/BuglyFileProvider.java similarity index 89% rename from app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java rename to app/src/main/java/com/mango/moshen/utils/BuglyFileProvider.java index ac344efc3..ccd0b5b51 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java +++ b/app/src/main/java/com/mango/moshen/utils/BuglyFileProvider.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import androidx.core.content.FileProvider; diff --git a/app/src/main/java/com/yizhuan/erban/utils/CertificateHelper.java b/app/src/main/java/com/mango/moshen/utils/CertificateHelper.java similarity index 86% rename from app/src/main/java/com/yizhuan/erban/utils/CertificateHelper.java rename to app/src/main/java/com/mango/moshen/utils/CertificateHelper.java index 616135a47..c41380110 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/CertificateHelper.java +++ b/app/src/main/java/com/mango/moshen/utils/CertificateHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.content.Context; import androidx.annotation.NonNull; @@ -7,17 +7,17 @@ import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.certification.CertificationModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.core.UriProvider; +import com.mango.core.certification.CertificationModel; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; -import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_FORCE; -import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_GUIDE; -import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_NONE; +import static com.mango.core.certification.CertificationModel.CER_TYPE_FORCE; +import static com.mango.core.certification.CertificationModel.CER_TYPE_GUIDE; +import static com.mango.core.certification.CertificationModel.CER_TYPE_NONE; /** * 强制用户实名认证 diff --git a/app/src/main/java/com/yizhuan/erban/utils/CleanLeakUtils.java b/app/src/main/java/com/mango/moshen/utils/CleanLeakUtils.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/utils/CleanLeakUtils.java rename to app/src/main/java/com/mango/moshen/utils/CleanLeakUtils.java index 6d0a84932..d4c80b482 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/CleanLeakUtils.java +++ b/app/src/main/java/com/mango/moshen/utils/CleanLeakUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.content.Context; import android.os.Build; diff --git a/app/src/main/java/com/yizhuan/erban/utils/CommonJumpHelper.java b/app/src/main/java/com/mango/moshen/utils/CommonJumpHelper.java similarity index 80% rename from app/src/main/java/com/yizhuan/erban/utils/CommonJumpHelper.java rename to app/src/main/java/com/mango/moshen/utils/CommonJumpHelper.java index 9fb26df3d..da88faf64 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/CommonJumpHelper.java +++ b/app/src/main/java/com/mango/moshen/utils/CommonJumpHelper.java @@ -1,17 +1,17 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.content.Context; import android.content.Intent; import android.text.TextUtils; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.ui.im.RouterHandler; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_library.utils.JavaUtil; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.ui.im.RouterHandler; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.core.home.bean.BannerInfo; +import com.mango.xchat_android_library.utils.JavaUtil; -import static com.yizhuan.xchat_android_core.home.bean.BannerInfo.*; +import static com.mango.core.home.bean.BannerInfo.*; /** * 用于banner做通用跳转 diff --git a/app/src/main/java/com/yizhuan/erban/utils/FastBlur.java b/app/src/main/java/com/mango/moshen/utils/FastBlur.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/utils/FastBlur.java rename to app/src/main/java/com/mango/moshen/utils/FastBlur.java index 9ffab878f..b6ef81898 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/FastBlur.java +++ b/app/src/main/java/com/mango/moshen/utils/FastBlur.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/yizhuan/erban/utils/FloatManager.java b/app/src/main/java/com/mango/moshen/utils/FloatManager.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/utils/FloatManager.java rename to app/src/main/java/com/mango/moshen/utils/FloatManager.java index eb40146bd..c9b2a76be 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/FloatManager.java +++ b/app/src/main/java/com/mango/moshen/utils/FloatManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.content.Context; import android.graphics.PixelFormat; @@ -7,9 +7,9 @@ import android.view.Gravity; import android.view.ViewGroup; import android.view.WindowManager; -import com.yizhuan.erban.application.XChatApplication; -import com.yizhuan.xchat_android_library.utils.SizeUtils; -import com.yizhuan.erban.ui.widget.MarqueeLayout; +import com.mango.moshen.application.XChatApplication; +import com.mango.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.ui.widget.MarqueeLayout; /** *

悬浮窗管理

diff --git a/app/src/main/java/com/yizhuan/erban/utils/FontTextView.java b/app/src/main/java/com/mango/moshen/utils/FontTextView.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/utils/FontTextView.java rename to app/src/main/java/com/mango/moshen/utils/FontTextView.java index 4c0a202fc..9d017432a 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/FontTextView.java +++ b/app/src/main/java/com/mango/moshen/utils/FontTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.content.Context; import android.content.res.AssetManager; diff --git a/app/src/main/java/com/yizhuan/erban/utils/KeyBoardUtils.java b/app/src/main/java/com/mango/moshen/utils/KeyBoardUtils.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/utils/KeyBoardUtils.java rename to app/src/main/java/com/mango/moshen/utils/KeyBoardUtils.java index f50441afc..d6f102aa5 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/KeyBoardUtils.java +++ b/app/src/main/java/com/mango/moshen/utils/KeyBoardUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/utils/LimitInputFliter.java b/app/src/main/java/com/mango/moshen/utils/LimitInputFliter.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/utils/LimitInputFliter.java rename to app/src/main/java/com/mango/moshen/utils/LimitInputFliter.java index 6a798acbd..2357b8d23 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/LimitInputFliter.java +++ b/app/src/main/java/com/mango/moshen/utils/LimitInputFliter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.text.InputFilter; import android.text.Spanned; diff --git a/app/src/main/java/com/yizhuan/erban/utils/NotificationsUtils.java b/app/src/main/java/com/mango/moshen/utils/NotificationsUtils.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/utils/NotificationsUtils.java rename to app/src/main/java/com/mango/moshen/utils/NotificationsUtils.java index d1167228c..6f83d01b4 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/NotificationsUtils.java +++ b/app/src/main/java/com/mango/moshen/utils/NotificationsUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.app.Activity; import android.content.ComponentName; @@ -11,7 +11,7 @@ import android.provider.Settings; import androidx.core.app.NotificationManagerCompat; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; /** * 通知栏监测工具 diff --git a/app/src/main/java/com/yizhuan/erban/utils/NumberFormatUtil.java b/app/src/main/java/com/mango/moshen/utils/NumberFormatUtil.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/utils/NumberFormatUtil.java rename to app/src/main/java/com/mango/moshen/utils/NumberFormatUtil.java index 2f73b983c..1bdb5ab5c 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/NumberFormatUtil.java +++ b/app/src/main/java/com/mango/moshen/utils/NumberFormatUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.text.TextUtils; diff --git a/app/src/main/java/com/yizhuan/erban/utils/OSUtils.java b/app/src/main/java/com/mango/moshen/utils/OSUtils.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/utils/OSUtils.java rename to app/src/main/java/com/mango/moshen/utils/OSUtils.java index bc3df8f15..81d30d186 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/OSUtils.java +++ b/app/src/main/java/com/mango/moshen/utils/OSUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.text.TextUtils; diff --git a/app/src/main/java/com/yizhuan/erban/utils/PermissionUtil.kt b/app/src/main/java/com/mango/moshen/utils/PermissionUtil.kt similarity index 97% rename from app/src/main/java/com/yizhuan/erban/utils/PermissionUtil.kt rename to app/src/main/java/com/mango/moshen/utils/PermissionUtil.kt index 39044c34a..f5bd2526c 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/PermissionUtil.kt +++ b/app/src/main/java/com/mango/moshen/utils/PermissionUtil.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils +package com.mango.moshen.utils import android.content.ComponentName import android.content.Context @@ -7,8 +7,8 @@ import android.content.pm.PackageManager import android.net.Uri import android.os.Build import com.microquation.linkedme.android.v4.ContextCompatLKMe -import com.yizhuan.erban.BuildConfig -import com.yizhuan.erban.ui.setting.bean.PermissionEntity +import com.mango.moshen.BuildConfig +import com.mango.moshen.ui.setting.bean.PermissionEntity import java.lang.Exception class PermissionUtil { diff --git a/app/src/main/java/com/yizhuan/erban/utils/PushMessageHandler.java b/app/src/main/java/com/mango/moshen/utils/PushMessageHandler.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/utils/PushMessageHandler.java rename to app/src/main/java/com/mango/moshen/utils/PushMessageHandler.java index ea8afb620..bef306655 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/PushMessageHandler.java +++ b/app/src/main/java/com/mango/moshen/utils/PushMessageHandler.java @@ -1,24 +1,19 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.app.Activity; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.text.TextUtils; -import android.util.Log; import com.coorchice.library.utils.LogUtils; import com.netease.nimlib.sdk.StatusBarNotificationConfig; import com.netease.nimlib.sdk.mixpush.MixPushMessageHandler; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_library.utils.LogUtil; +import com.mango.core.DemoCache; import java.io.Serializable; import java.util.Map; -import lombok.Data; - public class PushMessageHandler implements MixPushMessageHandler { public static final String PAYLOAD_SKIPTYPE = "skiptype"; public static final String PAYLOAD_PUSH_TITLE = "pushTitle"; diff --git a/app/src/main/java/com/yizhuan/erban/utils/RSBlur.java b/app/src/main/java/com/mango/moshen/utils/RSBlur.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/utils/RSBlur.java rename to app/src/main/java/com/mango/moshen/utils/RSBlur.java index 11f8598fc..2b0e211ee 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/RSBlur.java +++ b/app/src/main/java/com/mango/moshen/utils/RSBlur.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.annotation.TargetApi; import android.content.Context; diff --git a/app/src/main/java/com/yizhuan/erban/utils/RegexUtil.java b/app/src/main/java/com/mango/moshen/utils/RegexUtil.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/utils/RegexUtil.java rename to app/src/main/java/com/mango/moshen/utils/RegexUtil.java index c148448a6..e291eff12 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/RegexUtil.java +++ b/app/src/main/java/com/mango/moshen/utils/RegexUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.text.TextUtils; @@ -58,7 +58,7 @@ public class RegexUtil { } public static String getNotPrintableStringReg() { - // bug-fixed java.lang.RuntimeException:Unable to resume activity {com.yizhuan.erban/com.yizhuan.erban.MainActivity}: kotlin.KotlinNullPointerException + // bug-fixed java.lang.RuntimeException:Unable to resume activity {com.mango.moshen/com.mango.moshen.MainActivity}: kotlin.KotlinNullPointerException return TextUtils.isEmpty(NOT_VISIBLE_CHARS) ? "" : NOT_VISIBLE_CHARS; } diff --git a/app/src/main/java/com/yizhuan/erban/utils/SpannableBuilder.java b/app/src/main/java/com/mango/moshen/utils/SpannableBuilder.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/utils/SpannableBuilder.java rename to app/src/main/java/com/mango/moshen/utils/SpannableBuilder.java index 2e7acf9aa..f2a11f600 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/SpannableBuilder.java +++ b/app/src/main/java/com/mango/moshen/utils/SpannableBuilder.java @@ -1,11 +1,10 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.content.Context; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextUtils; import android.text.style.ForegroundColorSpan; -import android.widget.TextView; /** diff --git a/app/src/main/java/com/yizhuan/erban/utils/ThreadUtil.java b/app/src/main/java/com/mango/moshen/utils/ThreadUtil.java similarity index 99% rename from app/src/main/java/com/yizhuan/erban/utils/ThreadUtil.java rename to app/src/main/java/com/mango/moshen/utils/ThreadUtil.java index a52310cbe..899fd0cf9 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/ThreadUtil.java +++ b/app/src/main/java/com/mango/moshen/utils/ThreadUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.os.Handler; import android.os.Looper; diff --git a/app/src/main/java/com/yizhuan/erban/utils/TimeUiUtils.java b/app/src/main/java/com/mango/moshen/utils/TimeUiUtils.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/utils/TimeUiUtils.java rename to app/src/main/java/com/mango/moshen/utils/TimeUiUtils.java index b50c4d48a..3d58d6bc7 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/TimeUiUtils.java +++ b/app/src/main/java/com/mango/moshen/utils/TimeUiUtils.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.xchat_android_library.utils.TimeUtils; /** * create by lvzebiao @2019/11/21 diff --git a/app/src/main/java/com/yizhuan/erban/utils/UserUtils.java b/app/src/main/java/com/mango/moshen/utils/UserUtils.java similarity index 73% rename from app/src/main/java/com/yizhuan/erban/utils/UserUtils.java rename to app/src/main/java/com/mango/moshen/utils/UserUtils.java index 33f9bb095..097680a8b 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/UserUtils.java +++ b/app/src/main/java/com/mango/moshen/utils/UserUtils.java @@ -1,10 +1,9 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -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; +import com.mango.core.auth.AuthModel; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; public class UserUtils { diff --git a/app/src/main/java/com/yizhuan/erban/utils/VpSwipeRefreshLayout.java b/app/src/main/java/com/mango/moshen/utils/VpSwipeRefreshLayout.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/utils/VpSwipeRefreshLayout.java rename to app/src/main/java/com/mango/moshen/utils/VpSwipeRefreshLayout.java index 25d907143..e137b51bd 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/VpSwipeRefreshLayout.java +++ b/app/src/main/java/com/mango/moshen/utils/VpSwipeRefreshLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yizhuan/erban/utils/WebViewUtils.java b/app/src/main/java/com/mango/moshen/utils/WebViewUtils.java similarity index 94% rename from app/src/main/java/com/yizhuan/erban/utils/WebViewUtils.java rename to app/src/main/java/com/mango/moshen/utils/WebViewUtils.java index da9542896..11001bccf 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/WebViewUtils.java +++ b/app/src/main/java/com/mango/moshen/utils/WebViewUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.utils; +package com.mango.moshen.utils; import android.view.ViewGroup; import android.webkit.WebView; diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipAuthAdapter.kt b/app/src/main/java/com/mango/moshen/vip/VipAuthAdapter.kt similarity index 78% rename from app/src/main/java/com/yizhuan/erban/vip/VipAuthAdapter.kt rename to app/src/main/java/com/mango/moshen/vip/VipAuthAdapter.kt index 1c388562b..389843f41 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipAuthAdapter.kt +++ b/app/src/main/java/com/mango/moshen/vip/VipAuthAdapter.kt @@ -1,12 +1,12 @@ -package com.yizhuan.erban.vip +package com.mango.moshen.vip import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.xchat_android_core.vip.VipAuthInfo -import com.yizhuan.xchat_android_core.vip.VipInfo +import com.mango.moshen.R +import com.mango.moshen.ui.utils.load +import com.mango.core.vip.VipAuthInfo +import com.mango.core.vip.VipInfo class VipAuthAdapter : BaseQuickAdapter(R.layout.item_vip_auth) { diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipAuthDetailsDialog.kt b/app/src/main/java/com/mango/moshen/vip/VipAuthDetailsDialog.kt similarity index 78% rename from app/src/main/java/com/yizhuan/erban/vip/VipAuthDetailsDialog.kt rename to app/src/main/java/com/mango/moshen/vip/VipAuthDetailsDialog.kt index 9224d3a24..39ad5db68 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipAuthDetailsDialog.kt +++ b/app/src/main/java/com/mango/moshen/vip/VipAuthDetailsDialog.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.vip +package com.mango.moshen.vip import android.os.Bundle -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogRoomPkRuleBinding -import com.yizhuan.erban.databinding.DialogVipAuthDetailsBinding -import com.yizhuan.erban.ui.utils.load +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogRoomPkRuleBinding +import com.mango.moshen.databinding.DialogVipAuthDetailsBinding +import com.mango.moshen.ui.utils.load class VipAuthDetailsDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipBroadcastDialog.kt b/app/src/main/java/com/mango/moshen/vip/VipBroadcastDialog.kt similarity index 92% rename from app/src/main/java/com/yizhuan/erban/vip/VipBroadcastDialog.kt rename to app/src/main/java/com/mango/moshen/vip/VipBroadcastDialog.kt index ae03389b1..b1ba44e27 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipBroadcastDialog.kt +++ b/app/src/main/java/com/mango/moshen/vip/VipBroadcastDialog.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.vip +package com.mango.moshen.vip import android.annotation.SuppressLint import android.os.Bundle import androidx.core.view.isVisible import androidx.fragment.app.viewModels -import com.yizhuan.erban.base.BaseActivity -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogVipBroadcastBinding -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.base.BaseActivity +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogVipBroadcastBinding +import com.mango.core.utils.CurrentTimeUtils +import com.mango.core.utils.toast import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipBroadcastView.kt b/app/src/main/java/com/mango/moshen/vip/VipBroadcastView.kt similarity index 86% rename from app/src/main/java/com/yizhuan/erban/vip/VipBroadcastView.kt rename to app/src/main/java/com/mango/moshen/vip/VipBroadcastView.kt index 5b4bb7f34..a25d4e5f9 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipBroadcastView.kt +++ b/app/src/main/java/com/mango/moshen/vip/VipBroadcastView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.vip +package com.mango.moshen.vip import android.animation.ObjectAnimator import android.annotation.SuppressLint @@ -9,15 +9,14 @@ import android.widget.FrameLayout import androidx.core.animation.doOnEnd import androidx.core.view.isGone import androidx.core.view.isVisible -import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage -import com.yizhuan.erban.databinding.LayoutVipBroadcastViewBinding -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.VipMessageAttachment -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.vip.VipBroadcastMsgEvent -import com.yizhuan.xchat_android_library.rxbus.RxBus +import com.mango.moshen.databinding.LayoutVipBroadcastViewBinding +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.im.custom.bean.VipMessageAttachment +import com.mango.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.mango.core.utils.subAndReplaceDot +import com.mango.core.vip.VipBroadcastMsgEvent +import com.mango.xchat_android_library.rxbus.RxBus import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipHelper.java b/app/src/main/java/com/mango/moshen/vip/VipHelper.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/vip/VipHelper.java rename to app/src/main/java/com/mango/moshen/vip/VipHelper.java index 4ac58253e..7f96834d3 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipHelper.java +++ b/app/src/main/java/com/mango/moshen/vip/VipHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.vip; +package com.mango.moshen.vip; import android.graphics.Color; import android.view.View; @@ -8,11 +8,11 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -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 com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.TextUtils; +import com.mango.core.vip.UserVipInfo; public class VipHelper { diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipMagicIndicatorAdapter.java b/app/src/main/java/com/mango/moshen/vip/VipMagicIndicatorAdapter.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/vip/VipMagicIndicatorAdapter.java rename to app/src/main/java/com/mango/moshen/vip/VipMagicIndicatorAdapter.java index 9705e2466..26644a4d7 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipMagicIndicatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/vip/VipMagicIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.vip; +package com.mango.moshen.vip; import android.content.Context; import android.graphics.Color; @@ -7,12 +7,12 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.TextView; -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.mango.moshen.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt b/app/src/main/java/com/mango/moshen/vip/VipMainActivity.kt similarity index 90% rename from app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt rename to app/src/main/java/com/mango/moshen/vip/VipMainActivity.kt index bf223728c..a423cdd06 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt +++ b/app/src/main/java/com/mango/moshen/vip/VipMainActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.vip +package com.mango.moshen.vip import android.annotation.SuppressLint import android.content.Context @@ -17,31 +17,31 @@ 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.firstcharge.SelectPayTypeDialog -import com.yizhuan.erban.bank_card.activity.AddBankCardAgreementActivity -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.base.TitleBar -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.common.widget.dialog.DialogManager -import com.yizhuan.erban.databinding.ActivityVipMainBinding -import com.yizhuan.erban.ui.setting.ModifyPwdActivity -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.erban.ui.webview.CommonWebViewActivity -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.PaymentActivity -import com.yizhuan.xchat_android_core.pay.bean.PaymentResult -import com.yizhuan.xchat_android_core.pay.model.unionpay.UnionPayModel -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol -import com.yizhuan.xchat_android_core.utils.toast -import com.yizhuan.xchat_android_core.vip.VipAuthInfo -import com.yizhuan.xchat_android_core.vip.VipInfo -import com.yizhuan.xchat_android_core.vip.VipOpenEvent -import com.yizhuan.xchat_android_library.utils.JavaUtil +import com.mango.moshen.R +import com.mango.moshen.avroom.firstcharge.SelectPayTypeDialog +import com.mango.moshen.bank_card.activity.AddBankCardAgreementActivity +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.base.TitleBar +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.common.widget.dialog.DialogManager +import com.mango.moshen.databinding.ActivityVipMainBinding +import com.mango.moshen.ui.setting.ModifyPwdActivity +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.moshen.ui.webview.CommonWebViewActivity +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.mango.core.UriProvider +import com.mango.core.auth.AuthModel +import com.mango.core.pay.PayModel +import com.mango.core.pay.PaymentActivity +import com.mango.core.pay.bean.PaymentResult +import com.mango.core.pay.model.unionpay.UnionPayModel +import com.mango.core.statistic.StatisticManager +import com.mango.core.statistic.protocol.StatisticsProtocol +import com.mango.core.utils.toast +import com.mango.core.vip.VipAuthInfo +import com.mango.core.vip.VipInfo +import com.mango.core.vip.VipOpenEvent +import com.mango.xchat_android_library.utils.JavaUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipRemainTimeDialog.kt b/app/src/main/java/com/mango/moshen/vip/VipRemainTimeDialog.kt similarity index 77% rename from app/src/main/java/com/yizhuan/erban/vip/VipRemainTimeDialog.kt rename to app/src/main/java/com/mango/moshen/vip/VipRemainTimeDialog.kt index 4d4a19df7..ea5742542 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipRemainTimeDialog.kt +++ b/app/src/main/java/com/mango/moshen/vip/VipRemainTimeDialog.kt @@ -1,8 +1,8 @@ -package com.yizhuan.erban.vip +package com.mango.moshen.vip import android.os.Bundle -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogVipRemainTimeBinding +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogVipRemainTimeBinding class VipRemainTimeDialog : BaseDialog() { diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipSettingActivity.kt b/app/src/main/java/com/mango/moshen/vip/VipSettingActivity.kt similarity index 89% rename from app/src/main/java/com/yizhuan/erban/vip/VipSettingActivity.kt rename to app/src/main/java/com/mango/moshen/vip/VipSettingActivity.kt index 41aaeeeb5..ec95d6f8d 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipSettingActivity.kt +++ b/app/src/main/java/com/mango/moshen/vip/VipSettingActivity.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.vip +package com.mango.moshen.vip import android.annotation.SuppressLint import android.content.Context import android.content.Intent import androidx.activity.viewModels import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.databinding.ActivityVipSettingBinding -import com.yizhuan.xchat_android_core.user.UserModel +import com.mango.moshen.R +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.databinding.ActivityVipSettingBinding +import com.mango.core.user.UserModel class VipSettingActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipUpgradeDialog.kt b/app/src/main/java/com/mango/moshen/vip/VipUpgradeDialog.kt similarity index 91% rename from app/src/main/java/com/yizhuan/erban/vip/VipUpgradeDialog.kt rename to app/src/main/java/com/mango/moshen/vip/VipUpgradeDialog.kt index 25f0e7e4b..2c82133a3 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipUpgradeDialog.kt +++ b/app/src/main/java/com/mango/moshen/vip/VipUpgradeDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.vip +package com.mango.moshen.vip import android.annotation.SuppressLint import android.os.Bundle @@ -6,10 +6,10 @@ import androidx.fragment.app.activityViewModels import com.opensource.svgaplayer.SVGADrawable import com.opensource.svgaplayer.SVGAParser import com.opensource.svgaplayer.SVGAVideoEntity -import com.yizhuan.erban.base.BaseActivity -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogVipUpgradeBinding -import com.yizhuan.xchat_android_core.vip.VipInfo +import com.mango.moshen.base.BaseActivity +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogVipUpgradeBinding +import com.mango.core.vip.VipInfo import java.net.MalformedURLException import java.net.URL diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipViewModel.kt b/app/src/main/java/com/mango/moshen/vip/VipViewModel.kt similarity index 90% rename from app/src/main/java/com/yizhuan/erban/vip/VipViewModel.kt rename to app/src/main/java/com/mango/moshen/vip/VipViewModel.kt index d482b1b2f..07b9c8f19 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipViewModel.kt +++ b/app/src/main/java/com/mango/moshen/vip/VipViewModel.kt @@ -1,16 +1,15 @@ -package com.yizhuan.erban.vip +package com.mango.moshen.vip import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.yizhuan.erban.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.BeanResult -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.utils.net.ServerException -import com.yizhuan.xchat_android_core.utils.toast -import com.yizhuan.xchat_android_core.vip.VipAuthInfo -import com.yizhuan.xchat_android_core.vip.VipBroadcastInfo -import com.yizhuan.xchat_android_core.vip.VipInfo -import com.yizhuan.xchat_android_core.vip.VipModel +import com.mango.moshen.base.BaseViewModel +import com.mango.core.bean.response.BeanResult +import com.mango.core.user.UserModel +import com.mango.core.utils.toast +import com.mango.core.vip.VipAuthInfo +import com.mango.core.vip.VipBroadcastInfo +import com.mango.core.vip.VipInfo +import com.mango.core.vip.VipModel class VipViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/xuanyi/accompany/wxapi/WXEntryActivity.java b/app/src/main/java/com/xuanyi/accompany/wxapi/WXEntryActivity.java deleted file mode 100644 index e9154fb12..000000000 --- a/app/src/main/java/com/xuanyi/accompany/wxapi/WXEntryActivity.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.xuanyi.accompany.wxapi; - -import android.content.Intent; - - -import cn.sharesdk.wechat.utils.WXMediaMessage; -import cn.sharesdk.wechat.utils.WechatHandlerActivity; - -/** - * create by lvzebiao @2019/11/8 - */ -public class WXEntryActivity extends WechatHandlerActivity { - - @Override - public void onShowMessageFromWXReq(WXMediaMessage msg) { - super.onShowMessageFromWXReq(msg); - } - - @Override - public void onGetMessageFromWXReq(WXMediaMessage msg) { - super.onGetMessageFromWXReq(msg); - //从小程序返回APP - Intent iLaunchMyself = getPackageManager().getLaunchIntentForPackage(getPackageName()); - startActivity(iLaunchMyself); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageEvent.java b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageEvent.java deleted file mode 100644 index 073c8389f..000000000 --- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.erban.avroom.redpackage; - -public class RedPackageEvent { -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/presenter/BillGiftIncomeGroupPresenter.java b/app/src/main/java/com/yizhuan/erban/bills/presenter/BillGiftIncomeGroupPresenter.java deleted file mode 100644 index 4c67832c3..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/presenter/BillGiftIncomeGroupPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.erban.bills.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.bills.view.IBillGiftIncomeGroupView; - -public class BillGiftIncomeGroupPresenter extends BaseMvpPresenter { -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/view/IBillGiftIncomeGroupView.java b/app/src/main/java/com/yizhuan/erban/bills/view/IBillGiftIncomeGroupView.java deleted file mode 100644 index 01c1c9a0a..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/view/IBillGiftIncomeGroupView.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.erban.bills.view; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface IBillGiftIncomeGroupView extends IMvpBaseView { -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/view/IGiftIncomeView.java b/app/src/main/java/com/yizhuan/erban/bills/view/IGiftIncomeView.java deleted file mode 100644 index a7f6a287c..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/view/IGiftIncomeView.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.yizhuan.erban.bills.view; - -import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface IGiftIncomeView extends ISmoothToTopView { - void onGetDataError(String message); - void onGetIncomeBills(IncomeListInfo data); -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/view/ISmoothToTopView.java b/app/src/main/java/com/yizhuan/erban/bills/view/ISmoothToTopView.java deleted file mode 100644 index 995be34a2..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/view/ISmoothToTopView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.erban.bills.view; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface ISmoothToTopView extends IMvpBaseView { - void smoothScrollToTop(); -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyManagePresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyManagePresenter.java deleted file mode 100644 index ba220d0cf..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyManagePresenter.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyManageActivityView; - -/** - * @author jack - * @Description - * @Date 2018/5/25 - */ - -public class FamilyManagePresenter extends BaseMvpPresenter { - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySelectFriendPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySelectFriendPresenter.java deleted file mode 100644 index 7b2c588e0..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySelectFriendPresenter.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yizhuan.erban.family.presenter; - - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilySelectFriendActivityView; - -/** - * @author jack - * @Description - * @Date 2018/7/4 - */ - -public class FamilySelectFriendPresenter extends BaseMvpPresenter { -} diff --git a/app/src/main/java/com/yizhuan/erban/home/event/ContactTrashEvent.java b/app/src/main/java/com/yizhuan/erban/home/event/ContactTrashEvent.java deleted file mode 100644 index 19ccb180c..000000000 --- a/app/src/main/java/com/yizhuan/erban/home/event/ContactTrashEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.erban.home.event; - -public class ContactTrashEvent { -} diff --git a/app/src/main/java/com/yizhuan/erban/other/present/SplashPresenter.java b/app/src/main/java/com/yizhuan/erban/other/present/SplashPresenter.java deleted file mode 100644 index 625ac44fa..000000000 --- a/app/src/main/java/com/yizhuan/erban/other/present/SplashPresenter.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yizhuan.erban.other.present; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.other.view.ISplashView; - -/** - *

- * - * @author jiahui - * @date 2017/12/8 - */ -public class SplashPresenter extends BaseMvpPresenter { - - -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/presenter/TaskCenterFrgPresenter.java b/app/src/main/java/com/yizhuan/erban/radish/task/presenter/TaskCenterFrgPresenter.java deleted file mode 100644 index da4835cef..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/task/presenter/TaskCenterFrgPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.erban.radish.task.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.radish.task.view.ITaskCenterViewFrg; - -public class TaskCenterFrgPresenter extends BaseMvpPresenter { -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/presenter/TaskCenterPresenter.java b/app/src/main/java/com/yizhuan/erban/radish/task/presenter/TaskCenterPresenter.java deleted file mode 100644 index 9b5b1acf2..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/task/presenter/TaskCenterPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.erban.radish.task.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.radish.task.view.ITaskCenterView; - -/** - * create by lvzebiao @2019/3/27 - */ -public class TaskCenterPresenter extends BaseMvpPresenter { - - -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/view/ITaskCenterView.java b/app/src/main/java/com/yizhuan/erban/radish/task/view/ITaskCenterView.java deleted file mode 100644 index 9a748c4ed..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/task/view/ITaskCenterView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.erban.radish.task.view; - -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -/** - * create by lvzebiao @2019/3/27 - */ -public interface ITaskCenterView extends IMvpBaseView { - void playPriceAnim(TaskInfo info); -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/view/ITaskCenterViewFrg.java b/app/src/main/java/com/yizhuan/erban/radish/task/view/ITaskCenterViewFrg.java deleted file mode 100644 index b726bb91b..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/task/view/ITaskCenterViewFrg.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.erban.radish.task.view; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface ITaskCenterViewFrg extends IMvpBaseView { -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/view/IRadishRecordView.java b/app/src/main/java/com/yizhuan/erban/radish/view/IRadishRecordView.java deleted file mode 100644 index f09a90de2..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/view/IRadishRecordView.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.erban.radish.view; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface IRadishRecordView extends IMvpBaseView { -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/actions/ChatterBoxAction.java b/app/src/main/java/com/yizhuan/erban/ui/im/actions/ChatterBoxAction.java deleted file mode 100644 index f715762ae..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/im/actions/ChatterBoxAction.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.yizhuan.erban.ui.im.actions; - -import android.os.Handler; -import android.text.TextUtils; - -import com.netease.nim.uikit.business.session.actions.BaseAction; -import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper; -import com.netease.nimlib.sdk.msg.MessageBuilder; -import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; -import com.netease.nimlib.sdk.msg.model.CustomMessageConfig; -import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.higuide.TuTuGuideHelper; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.chatterbox.ChatterBoxHelper; -import com.yizhuan.xchat_android_core.im.chatterbox.ChatterBoxModel; -import com.yizhuan.xchat_android_core.im.chatterbox.HideInputEvent; -import com.yizhuan.xchat_android_core.im.chatterbox.TopicBoxItemInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatterBoxAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -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.BeanObserver; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; - -import org.greenrobot.eventbus.EventBus; - -import java.util.List; - -import io.reactivex.Single; -import io.reactivex.functions.BiConsumer; - -public class ChatterBoxAction extends BaseAction { - - private long lastClick = 0L; - public static String sessionId; - - public ChatterBoxAction() { - super(R.drawable.chat_icon_say, R.string.chat_action); - } - - @Override - public void onClick() { - long currentClick = System.currentTimeMillis(); - - if (currentClick - lastClick > 1000L) { - - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MESSAGE_START_CHATTER_BOX, "消息-发起话匣子"); - - EventBus.getDefault().post(new HideInputEvent()); - lastClick = currentClick; - - if (TuTuGuideHelper.isNeedHiGuide(TuTuGuideHelper.KEY_GUIDE_CHATTER_BOX)) { - new Handler().post(() -> { - TuTuGuideHelper helper = new TuTuGuideHelper(getActivity()); - helper.createHiGuide(() -> helper.createDiceOverLayer()); - TuTuGuideHelper.setNoNeedHiGuide(TuTuGuideHelper.KEY_GUIDE_CHATTER_BOX); - }); - } - ChatterBoxHelper.topicBoxCanSend(); - - } - } -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/utils/sys/PermissionUtil.kt b/app/src/main/java/com/yizhuan/erban/ui/utils/sys/PermissionUtil.kt deleted file mode 100644 index e6540a2f2..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/utils/sys/PermissionUtil.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.erban.ui.utils.sys - -class PermissionUtil { -} \ No newline at end of file diff --git a/app/src/main/res/layout/act_community_notice.xml b/app/src/main/res/layout/act_community_notice.xml index 8884e5332..461a14193 100644 --- a/app/src/main/res/layout/act_community_notice.xml +++ b/app/src/main/res/layout/act_community_notice.xml @@ -5,14 +5,14 @@ android:background="@color/bg_normal_1c1b22" xmlns:app="http://schemas.android.com/apk/res-auto"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/act_friend_list.xml b/app/src/main/res/layout/act_friend_list.xml index e721d18d8..03f1327ce 100644 --- a/app/src/main/res/layout/act_friend_list.xml +++ b/app/src/main/res/layout/act_friend_list.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + - + tools:context="com.mango.moshen.team.view.AddMemberActivity"> - @@ -99,7 +99,7 @@ - @@ -144,7 +144,7 @@ tools:ignore="SpUsage" /> - + \ No newline at end of file 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..d4b9eb274 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 @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context="com.yizhuan.erban.team.view.AddMemberSearchActivity"> + tools:context="com.mango.moshen.team.view.AddMemberSearchActivity"> - @@ -131,7 +131,7 @@ tools:ignore="SpUsage" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_all_game.xml b/app/src/main/res/layout/activity_all_game.xml index 1258f0418..082ec4f43 100644 --- a/app/src/main/res/layout/activity_all_game.xml +++ b/app/src/main/res/layout/activity_all_game.xml @@ -4,6 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.yizhuan.erban.home.activity.AllGameActivity"> + tools:context="com.mango.moshen.home.activity.AllGameActivity"> 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..7b1abd438 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 @@ -5,12 +5,12 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - @@ -59,7 +59,7 @@ - @@ -77,7 +77,7 @@ android:scrollbars="vertical" /> - + diff --git a/app/src/main/res/layout/activity_bills_gift.xml b/app/src/main/res/layout/activity_bills_gift.xml index 1aac18b4d..c83b6b45a 100644 --- a/app/src/main/res/layout/activity_bills_gift.xml +++ b/app/src/main/res/layout/activity_bills_gift.xml @@ -10,12 +10,12 @@ android:layout_height="match_parent" android:orientation="vertical"> - - 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..e75a7b6f7 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 @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - diff --git a/app/src/main/res/layout/activity_charge.xml b/app/src/main/res/layout/activity_charge.xml index 6c02a8c69..d291f79f9 100644 --- a/app/src/main/res/layout/activity_charge.xml +++ b/app/src/main/res/layout/activity_charge.xml @@ -15,7 +15,7 @@ android:src="@mipmap/bg_charge" app:layout_constraintTop_toTopOf="parent" /> - - - - @@ -32,7 +32,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_common_web_view.xml b/app/src/main/res/layout/activity_common_web_view.xml index 340e29a53..77b0e8a46 100644 --- a/app/src/main/res/layout/activity_common_web_view.xml +++ b/app/src/main/res/layout/activity_common_web_view.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="@color/bg_normal_1c1b22" - tools:context="com.yizhuan.erban.ui.webview.CommonWebViewActivity"> + tools:context="com.mango.moshen.ui.webview.CommonWebViewActivity"> - - - - diff --git a/app/src/main/res/layout/activity_cp_task.xml b/app/src/main/res/layout/activity_cp_task.xml index cd58a9128..24ac1f4f0 100644 --- a/app/src/main/res/layout/activity_cp_task.xml +++ b/app/src/main/res/layout/activity_cp_task.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" android:background="#F4F4FA"> - - - - - - - - - - - - - - - @@ -121,7 +121,7 @@ - - - - - - - - - - - - + tools:context="com.mango.moshen.home.activity.ErbanTopMessageActivity"> - - @@ -30,5 +30,5 @@ - + diff --git a/app/src/main/res/layout/activity_exchange_gold.xml b/app/src/main/res/layout/activity_exchange_gold.xml index 9681f055d..3db8eb079 100644 --- a/app/src/main/res/layout/activity_exchange_gold.xml +++ b/app/src/main/res/layout/activity_exchange_gold.xml @@ -6,7 +6,7 @@ android:background="@color/color_F5F5F5" android:orientation="vertical"> - diff --git a/app/src/main/res/layout/activity_family_currency.xml b/app/src/main/res/layout/activity_family_currency.xml index 98a505cce..f0c29ecb0 100644 --- a/app/src/main/res/layout/activity_family_currency.xml +++ b/app/src/main/res/layout/activity_family_currency.xml @@ -8,7 +8,7 @@ android:background="@color/white" tools:context=".family.view.activity.FamilyCurrencyActivity"> - 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..6a130342c 100644 --- a/app/src/main/res/layout/activity_family_game_list.xml +++ b/app/src/main/res/layout/activity_family_game_list.xml @@ -8,12 +8,12 @@ tools:context=".family.view.activity.FamilyGameListActivity"> - - - + diff --git a/app/src/main/res/layout/activity_family_home.xml b/app/src/main/res/layout/activity_family_home.xml index 09db36f5f..944900c4d 100644 --- a/app/src/main/res/layout/activity_family_home.xml +++ b/app/src/main/res/layout/activity_family_home.xml @@ -8,12 +8,12 @@ android:orientation="vertical" tools:context=".family.view.activity.FamilyHomeActivity"> - - @@ -31,7 +31,7 @@ android:focusableInTouchMode="true" android:orientation="vertical"> - @@ -97,7 +97,7 @@ tools:text="H啊哈哈" /> - - + - - + - - @@ -117,7 +117,7 @@ android:layout_height="1px" android:layout_weight="1" /> - - - @@ -29,6 +29,6 @@ tools:listItem="@layout/item_family_list"/> - + 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..bf8b6ebea 100644 --- a/app/src/main/res/layout/activity_family_list_member.xml +++ b/app/src/main/res/layout/activity_family_list_member.xml @@ -6,7 +6,7 @@ android:orientation="vertical" tools:context=".family.view.activity.FamilyMemberListActivity"> - @@ -89,7 +89,7 @@ - @@ -104,7 +104,7 @@ - + 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..7873082f4 100644 --- a/app/src/main/res/layout/activity_family_manage_activty.xml +++ b/app/src/main/res/layout/activity_family_manage_activty.xml @@ -8,7 +8,7 @@ android:background="@color/color_F5F5F5" tools:context=".family.view.activity.FamilyManageActivity"> - 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..c0325e1ec 100644 --- a/app/src/main/res/layout/activity_family_member_currency.xml +++ b/app/src/main/res/layout/activity_family_member_currency.xml @@ -8,7 +8,7 @@ android:background="@color/white" tools:context=".family.view.activity.FamilyMemberCurrencyActivity"> - 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..2223fb04d 100644 --- a/app/src/main/res/layout/activity_family_member_search.xml +++ b/app/src/main/res/layout/activity_family_member_search.xml @@ -80,7 +80,7 @@ - @@ -91,5 +91,5 @@ tools:listItem="@layout/item_family_list"> - + diff --git a/app/src/main/res/layout/activity_family_plaza.xml b/app/src/main/res/layout/activity_family_plaza.xml index 576022a5e..e015a1a50 100644 --- a/app/src/main/res/layout/activity_family_plaza.xml +++ b/app/src/main/res/layout/activity_family_plaza.xml @@ -8,7 +8,7 @@ android:orientation="vertical" tools:context=".family.view.activity.FamilyPlazaActivity"> - @@ -32,7 +32,7 @@ android:focusableInTouchMode="true" android:orientation="vertical"> - @@ -43,7 +43,7 @@ android:scaleType="centerCrop" android:src="@drawable/banner_family_plaza" /> - + - @@ -94,5 +94,5 @@ tools:listItem="@layout/item_family_list"> - + 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..176990861 100644 --- a/app/src/main/res/layout/activity_family_select_friend.xml +++ b/app/src/main/res/layout/activity_family_select_friend.xml @@ -7,12 +7,12 @@ android:background="@color/white" tools:context=".family.view.activity.FamilySelectFriendActivity" > - - - diff --git a/app/src/main/res/layout/activity_fans.xml b/app/src/main/res/layout/activity_fans.xml index 5742eba82..5c427c8d6 100644 --- a/app/src/main/res/layout/activity_fans.xml +++ b/app/src/main/res/layout/activity_fans.xml @@ -8,7 +8,7 @@ android:background="@color/bg_normal_1c1b22" android:orientation="vertical"> - - - - - - - - - - - + tools:context="com.mango.moshen.ui.setting.FeedbackActivity"> - - - @@ -20,6 +20,6 @@ android:id="@+id/recycler_view" 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_give_gold_success.xml b/app/src/main/res/layout/activity_give_gold_success.xml index 8b9fd04b0..5411b30d3 100644 --- a/app/src/main/res/layout/activity_give_gold_success.xml +++ b/app/src/main/res/layout/activity_give_gold_success.xml @@ -8,7 +8,7 @@ android:orientation="vertical" tools:context=".pay.activity.GiveGoldSuccessActivity"> - diff --git a/app/src/main/res/layout/activity_granted_permissions.xml b/app/src/main/res/layout/activity_granted_permissions.xml index 2accdcf29..9dfdd1ba1 100644 --- a/app/src/main/res/layout/activity_granted_permissions.xml +++ b/app/src/main/res/layout/activity_granted_permissions.xml @@ -6,7 +6,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android" > - + tools:context="com.mango.moshen.guide.GuideActivity"> - + app:layout_behavior="com.mango.moshen.ui.widget.AppBarLayoutBehavior"> - - - --> - + type="com.mango.moshen.base.BaseMsListViewModel" /> - @@ -131,7 +131,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -156,7 +156,7 @@ - + + type="com.mango.moshen.base.BaseMsListViewModel" /> - 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..83b018986 100644 --- a/app/src/main/res/layout/activity_ktv_song_list.xml +++ b/app/src/main/res/layout/activity_ktv_song_list.xml @@ -7,7 +7,7 @@ + type="com.mango.moshen.avroom.ktv.KtvSongListVm" /> - - + - - @@ -31,6 +31,6 @@ android:layout_height="wrap_content" /> - + diff --git a/app/src/main/res/layout/activity_login_code.xml b/app/src/main/res/layout/activity_login_code.xml index 62e21d65b..a5a420cc5 100644 --- a/app/src/main/res/layout/activity_login_code.xml +++ b/app/src/main/res/layout/activity_login_code.xml @@ -41,7 +41,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_title" /> - - 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 b22f9f285..d47493adb 100644 --- a/app/src/main/res/layout/activity_lucky_money_detail.xml +++ b/app/src/main/res/layout/activity_lucky_money_detail.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2b5484ff9..a8a43a378 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.yizhuan.erban.MainActivity"> + tools:context="com.mango.moshen.MainActivity"> - - - - - - + - - - - - - --> - @@ -214,7 +214,7 @@ android:gravity="center" android:text="施法" /> - - - - - + android:layout_height="wrap_content"> - - --> - - + + tools:context="com.mango.moshen.home.activity.NewUserListActivity"> - - @@ -34,5 +34,5 @@ - + 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 5fea8f2d8..0ae851b9d 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="@color/bg_normal_1c1b22" android:orientation="vertical"> - - - - + tools:context="com.mango.moshen.ui.patriarch.PatriarchModeActivity"> - + tools:context="com.mango.moshen.ui.patriarch.PatriarchPwdActivity"> - - - - - - - - - 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 135d2b0c3..03734beb0 100644 --- a/app/src/main/res/layout/activity_record_for_pk.xml +++ b/app/src/main/res/layout/activity_record_for_pk.xml @@ -5,13 +5,13 @@ android:background="@color/bg_normal_1c1b22" android:orientation="vertical"> - - @@ -28,5 +28,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_recording_voice.xml b/app/src/main/res/layout/activity_recording_voice.xml index b9b7c8222..8c37e9595 100644 --- a/app/src/main/res/layout/activity_recording_voice.xml +++ b/app/src/main/res/layout/activity_recording_voice.xml @@ -7,7 +7,7 @@ android:background="@drawable/bg_my_voice" android:orientation="vertical"> - - @@ -32,7 +32,7 @@ android:gravity="center_horizontal" android:orientation="vertical"> - - + type="com.mango.moshen.base.BaseListViewModel" /> - diff --git a/app/src/main/res/layout/activity_reset_login_pwd.xml b/app/src/main/res/layout/activity_reset_login_pwd.xml index 8b4415e76..bb111f4d6 100644 --- a/app/src/main/res/layout/activity_reset_login_pwd.xml +++ b/app/src/main/res/layout/activity_reset_login_pwd.xml @@ -16,7 +16,7 @@ android:background="@color/bg_normal_1c1b22" android:orientation="vertical"> - - - - @@ -20,5 +20,5 @@ 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_room_history_list.xml b/app/src/main/res/layout/activity_room_history_list.xml index e810d4c45..61923c8c2 100644 --- a/app/src/main/res/layout/activity_room_history_list.xml +++ b/app/src/main/res/layout/activity_room_history_list.xml @@ -5,7 +5,7 @@ android:background="@color/color_f4f4fa" android:orientation="vertical"> - - - @@ -30,6 +30,6 @@ app:layoutManager="LinearLayoutManager" /> - + diff --git a/app/src/main/res/layout/activity_room_manager_list.xml b/app/src/main/res/layout/activity_room_manager_list.xml index 5ee4411e5..9b50dd7b2 100644 --- a/app/src/main/res/layout/activity_room_manager_list.xml +++ b/app/src/main/res/layout/activity_room_manager_list.xml @@ -5,13 +5,13 @@ android:background="@color/bg_normal_1c1b22" android:orientation="vertical"> - - @@ -20,5 +20,5 @@ 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_room_online_user.xml b/app/src/main/res/layout/activity_room_online_user.xml index 5ecb75eb7..efa7d735e 100644 --- a/app/src/main/res/layout/activity_room_online_user.xml +++ b/app/src/main/res/layout/activity_room_online_user.xml @@ -10,7 +10,7 @@ + tools:context="com.mango.moshen.avroom.activity.RoomOnlineUserActivity"> - - + tools:context="com.mango.moshen.avroom.activity.RoomRankListActivity"> - - - + - - - @@ -199,5 +199,5 @@ android:layout_height="wrap_content"> - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_search_hall.xml b/app/src/main/res/layout/activity_search_hall.xml index 436d8b219..8727fcf21 100644 --- a/app/src/main/res/layout/activity_search_hall.xml +++ b/app/src/main/res/layout/activity_search_hall.xml @@ -84,7 +84,7 @@ android:visibility="gone" android:orientation="vertical"> - - - + \ 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..b1dcfe785 100644 --- a/app/src/main/res/layout/activity_select_friend.xml +++ b/app/src/main/res/layout/activity_select_friend.xml @@ -11,12 +11,12 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - + tools:context="com.mango.moshen.ui.login.ShowBindPhoneActivity"> - + tools:context="com.mango.moshen.ui.user.ShowPhotoActivity"> - - + - - + tools:context="com.mango.moshen.ui.webview.CommonWebViewActivity"> - - - - - @@ -39,7 +39,7 @@ android:layout_marginBottom="@dimen/dp_15" app:layout_constraintTop_toBottomOf="@id/title_bar" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_task_center.xml b/app/src/main/res/layout/activity_task_center.xml index 7f7a448b5..d8c0d082e 100644 --- a/app/src/main/res/layout/activity_task_center.xml +++ b/app/src/main/res/layout/activity_task_center.xml @@ -13,15 +13,15 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - + - + type="com.mango.core.team.bean.TeamInfo" /> - - + + - + - @@ -132,7 +132,7 @@ android:layout_height="wrap_content" tools:ignore="SpUsage" /> - - - @@ -99,7 +99,7 @@ - @@ -116,7 +116,7 @@ - + \ No newline at end of file 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..6695868b2 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 @@ -94,7 +94,7 @@ - @@ -105,6 +105,6 @@ tools:listItem="@layout/item_family_list"> - + diff --git a/app/src/main/res/layout/activity_team_message.xml b/app/src/main/res/layout/activity_team_message.xml index 2f26f3529..48735bfc8 100644 --- a/app/src/main/res/layout/activity_team_message.xml +++ b/app/src/main/res/layout/activity_team_message.xml @@ -59,7 +59,7 @@ - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_team_weekly_bill.xml b/app/src/main/res/layout/activity_team_weekly_bill.xml index 7c7acce50..54ea92066 100644 --- a/app/src/main/res/layout/activity_team_weekly_bill.xml +++ b/app/src/main/res/layout/activity_team_weekly_bill.xml @@ -14,14 +14,14 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="@color/white" - tools:context="com.yizhuan.erban.team.view.TeamWeeklyBillActivity"> + tools:context="com.mango.moshen.team.view.TeamWeeklyBillActivity"> - - @@ -36,7 +36,7 @@ android:layout_height="match_parent" /> - + \ No newline at end of file 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..874288e05 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 @@ -94,7 +94,7 @@ - @@ -109,6 +109,6 @@ android:layout_height="match_parent" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_total_bills.xml b/app/src/main/res/layout/activity_total_bills.xml index 2446038c2..240c70dc4 100644 --- a/app/src/main/res/layout/activity_total_bills.xml +++ b/app/src/main/res/layout/activity_total_bills.xml @@ -11,12 +11,12 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - - diff --git a/app/src/main/res/layout/activity_user_gift.xml b/app/src/main/res/layout/activity_user_gift.xml index 71f9baade..cd015c0f8 100644 --- a/app/src/main/res/layout/activity_user_gift.xml +++ b/app/src/main/res/layout/activity_user_gift.xml @@ -6,14 +6,14 @@ android:background="@color/bg_normal_1c1b22" android:orientation="vertical"> - - + app:layout_behavior="com.mango.moshen.ui.widget.AppBarLayoutBehavior"> - - - + android:layout="@layout/user_info_bottom_layout" /> 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 a85544fa9..375ba7c19 100644 --- a/app/src/main/res/layout/activity_user_info_modify.xml +++ b/app/src/main/res/layout/activity_user_info_modify.xml @@ -5,7 +5,7 @@ android:background="@color/bg_normal_1c1b22" android:orientation="vertical"> - - - + tools:context="com.mango.moshen.ui.setting.VerifyPhoneActivity"> - - - - + - - + - - - diff --git a/app/src/main/res/layout/activity_withdraw_bills.xml b/app/src/main/res/layout/activity_withdraw_bills.xml index e34b7ad56..a58e5e8e6 100644 --- a/app/src/main/res/layout/activity_withdraw_bills.xml +++ b/app/src/main/res/layout/activity_withdraw_bills.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - diff --git a/app/src/main/res/layout/activity_withdraw_rule.xml b/app/src/main/res/layout/activity_withdraw_rule.xml index c1e5da656..98a1652e4 100644 --- a/app/src/main/res/layout/activity_withdraw_rule.xml +++ b/app/src/main/res/layout/activity_withdraw_rule.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - diff --git a/app/src/main/res/layout/attention_item_new.xml b/app/src/main/res/layout/attention_item_new.xml index 9f9c2eea1..bc7074b41 100644 --- a/app/src/main/res/layout/attention_item_new.xml +++ b/app/src/main/res/layout/attention_item_new.xml @@ -7,7 +7,7 @@ android:layout_height="71dp" android:orientation="horizontal"> - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/common_status_layout.xml b/app/src/main/res/layout/common_status_layout.xml index f45b6d25f..dde84db91 100644 --- a/app/src/main/res/layout/common_status_layout.xml +++ b/app/src/main/res/layout/common_status_layout.xml @@ -1,5 +1,5 @@ - @@ -9,4 +9,4 @@ 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/main/res/layout/dialog_auction_finish.xml b/app/src/main/res/layout/dialog_auction_finish.xml index 57c741f3c..583ec4540 100644 --- a/app/src/main/res/layout/dialog_auction_finish.xml +++ b/app/src/main/res/layout/dialog_auction_finish.xml @@ -39,7 +39,7 @@ android:layout_width="81dp" android:layout_height="81dp"> - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/dialog_custom_confirm_send_gold.xml b/app/src/main/res/layout/dialog_custom_confirm_send_gold.xml index 7006c5f39..fd999d875 100644 --- a/app/src/main/res/layout/dialog_custom_confirm_send_gold.xml +++ b/app/src/main/res/layout/dialog_custom_confirm_send_gold.xml @@ -32,7 +32,7 @@ android:gravity="center" android:orientation="horizontal"> - diff --git a/app/src/main/res/layout/dialog_custom_voice_match_sync_history_voice.xml b/app/src/main/res/layout/dialog_custom_voice_match_sync_history_voice.xml index 0f72eb781..a4c4988ac 100644 --- a/app/src/main/res/layout/dialog_custom_voice_match_sync_history_voice.xml +++ b/app/src/main/res/layout/dialog_custom_voice_match_sync_history_voice.xml @@ -47,7 +47,7 @@ android:src="@drawable/ic_voice_bar_play" tools:ignore="ContentDescription" /> - - @@ -21,7 +21,7 @@ android:layout_alignParentStart="true" android:layout_alignParentTop="true" android:src="@mipmap/bg_family_guide_1" /> - + diff --git a/app/src/main/res/layout/dialog_family_invite_confirm.xml b/app/src/main/res/layout/dialog_family_invite_confirm.xml index 683a3a095..426792556 100644 --- a/app/src/main/res/layout/dialog_family_invite_confirm.xml +++ b/app/src/main/res/layout/dialog_family_invite_confirm.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="horizontal"> - - - - - + type="com.mango.core.noble.AllServiceGiftProtocol.DataBean" /> - - + type="com.mango.core.noble.AllServiceGiftProtocol.DataBean" /> - - - - + type="com.mango.core.noble.AllServiceGiftProtocol.DataBean" /> - - - - + type="com.mango.core.noble.AllServiceGiftProtocol.DataBean" /> - - - - - - - + type="com.mango.core.room.ktv.bean.MusicInfo" /> - + + type="com.mango.core.monsterhunting.bean.MonsterProtocol.DataBean" /> - - - - - - - - - - - diff --git a/app/src/main/res/layout/dialog_request_upmic.xml b/app/src/main/res/layout/dialog_request_upmic.xml index 1b49be32d..99cd480b8 100644 --- a/app/src/main/res/layout/dialog_request_upmic.xml +++ b/app/src/main/res/layout/dialog_request_upmic.xml @@ -4,7 +4,7 @@ - + @@ -24,7 +24,7 @@ android:layout_height="226dp" android:background="@drawable/dialog_background"> - - - - - - - - - - - - - - - - - - - + type="com.mango.core.room.bean.RoomInfo" /> - - - diff --git a/app/src/main/res/layout/fragment_decoration_common.xml b/app/src/main/res/layout/fragment_decoration_common.xml index b29aba3ac..1adc1291f 100644 --- a/app/src/main/res/layout/fragment_decoration_common.xml +++ b/app/src/main/res/layout/fragment_decoration_common.xml @@ -1,5 +1,5 @@ - @@ -18,4 +18,4 @@ - + diff --git a/app/src/main/res/layout/fragment_family.xml b/app/src/main/res/layout/fragment_family.xml index d725158dc..1450b1dc3 100644 --- a/app/src/main/res/layout/fragment_family.xml +++ b/app/src/main/res/layout/fragment_family.xml @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - + @@ -197,7 +197,7 @@ android:gravity="center_vertical" android:orientation="horizontal"> - - diff --git a/app/src/main/res/layout/fragment_family_attention.xml b/app/src/main/res/layout/fragment_family_attention.xml index e959c7f37..3cc16a652 100644 --- a/app/src/main/res/layout/fragment_family_attention.xml +++ b/app/src/main/res/layout/fragment_family_attention.xml @@ -2,7 +2,7 @@ - @@ -20,5 +20,5 @@ /> - + \ 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..3c584b32a 100644 --- a/app/src/main/res/layout/fragment_family_fans_list.xml +++ b/app/src/main/res/layout/fragment_family_fans_list.xml @@ -5,7 +5,7 @@ android:orientation="vertical"> - @@ -23,6 +23,6 @@ - + \ No newline at end of file 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..21ae8c3d4 100644 --- a/app/src/main/res/layout/fragment_family_friend_list.xml +++ b/app/src/main/res/layout/fragment_family_friend_list.xml @@ -1,5 +1,5 @@ - @@ -18,4 +18,4 @@ - \ No newline at end of file + \ 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 e27d37733..acc49cd46 100644 --- a/app/src/main/res/layout/fragment_fans_list.xml +++ b/app/src/main/res/layout/fragment_fans_list.xml @@ -1,5 +1,5 @@ - @@ -17,4 +17,4 @@ - \ No newline at end of file + \ 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..6df7f3f82 100644 --- a/app/src/main/res/layout/fragment_find_tab.xml +++ b/app/src/main/res/layout/fragment_find_tab.xml @@ -23,7 +23,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="48dp"> - - - + - @@ -59,6 +59,6 @@ android:scrollbars="vertical" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 989f5b87b..3a18cc397 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -36,7 +36,7 @@ android:paddingBottom="@dimen/dp_10" app:layout_constraintTop_toTopOf="parent"> - @@ -18,4 +18,4 @@ - + diff --git a/app/src/main/res/layout/fragment_live.xml b/app/src/main/res/layout/fragment_live.xml index c24a998b8..461b021d3 100644 --- a/app/src/main/res/layout/fragment_live.xml +++ b/app/src/main/res/layout/fragment_live.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:background="@color/transparent" app:elevation="0dp" - app:layout_behavior="com.yizhuan.erban.ui.widget.AppBarLayoutBehavior"> + app:layout_behavior="com.mango.moshen.ui.widget.AppBarLayoutBehavior"> - - + + type="com.mango.core.user.bean.UserInfo" /> - - - - - - + diff --git a/app/src/main/res/layout/fragment_msg.xml b/app/src/main/res/layout/fragment_msg.xml index c8bf0aad3..d6c98d298 100644 --- a/app/src/main/res/layout/fragment_msg.xml +++ b/app/src/main/res/layout/fragment_msg.xml @@ -5,7 +5,7 @@ android:background="@color/color_FAFAFA" android:orientation="vertical"> - + type="com.mango.moshen.base.BaseListViewModel"/> - @@ -30,7 +30,7 @@ - + diff --git a/app/src/main/res/layout/fragment_my_chat_bubble.xml b/app/src/main/res/layout/fragment_my_chat_bubble.xml index ba0a91b7f..15e4d8488 100644 --- a/app/src/main/res/layout/fragment_my_chat_bubble.xml +++ b/app/src/main/res/layout/fragment_my_chat_bubble.xml @@ -5,10 +5,10 @@ + type="com.mango.moshen.base.BaseListViewModel" /> - @@ -33,6 +33,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_newbie_list.xml b/app/src/main/res/layout/fragment_newbie_list.xml index 21e904af9..62d2f057f 100644 --- a/app/src/main/res/layout/fragment_newbie_list.xml +++ b/app/src/main/res/layout/fragment_newbie_list.xml @@ -1,8 +1,8 @@ - + tools:context="com.mango.moshen.home.fragment.HomeOtherTabFragment"> - + diff --git a/app/src/main/res/layout/fragment_newbie_message.xml b/app/src/main/res/layout/fragment_newbie_message.xml index 6ac048a6e..b6074ede5 100644 --- a/app/src/main/res/layout/fragment_newbie_message.xml +++ b/app/src/main/res/layout/fragment_newbie_message.xml @@ -1,4 +1,4 @@ - @@ -18,4 +18,4 @@ - + diff --git a/app/src/main/res/layout/fragment_party.xml b/app/src/main/res/layout/fragment_party.xml index 6b4205d42..ded6d2bfe 100644 --- a/app/src/main/res/layout/fragment_party.xml +++ b/app/src/main/res/layout/fragment_party.xml @@ -13,7 +13,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + tools:context="com.mango.moshen.ui.webview.CommonWebViewActivity"> - diff --git a/app/src/main/res/layout/fragment_recent_list.xml b/app/src/main/res/layout/fragment_recent_list.xml index afcfd822a..6c6c3ea2d 100644 --- a/app/src/main/res/layout/fragment_recent_list.xml +++ b/app/src/main/res/layout/fragment_recent_list.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + app:layout_behavior="com.mango.moshen.ui.widget.AppBarLayoutBehavior"> - - - + - - - + \ No newline at end of file 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..d2c3de500 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 @@ -6,10 +6,10 @@ + type="com.mango.moshen.base.BaseMsListViewModel" /> - @@ -53,5 +53,5 @@ android:textSize="13dp" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_rexylerview_bind.xml b/app/src/main/res/layout/fragment_rexylerview_bind.xml index 35b4e3e34..14970cc80 100644 --- a/app/src/main/res/layout/fragment_rexylerview_bind.xml +++ b/app/src/main/res/layout/fragment_rexylerview_bind.xml @@ -5,10 +5,10 @@ + type="com.mango.moshen.base.BaseListViewModel"/> - @@ -32,5 +32,5 @@ - + \ No newline at end of file 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 e990286a2..083995369 100644 --- a/app/src/main/res/layout/fragment_room_charm_list.xml +++ b/app/src/main/res/layout/fragment_room_charm_list.xml @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:background="@drawable/bg_room_rank_in_room_middle"> - - - + app:layout_behavior="com.mango.moshen.ui.widget.AppBarLayoutBehavior"> - @@ -17,4 +17,4 @@ android:background="@color/white" /> - \ No newline at end of file + \ No newline at end of file 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 f7267dc5b..959fa3e41 100644 --- a/app/src/main/res/layout/fragment_room_rank_list.xml +++ b/app/src/main/res/layout/fragment_room_rank_list.xml @@ -17,7 +17,7 @@ + tools:context="com.mango.moshen.avroom.activity.RoomRankListActivity"> - - @@ -10,4 +10,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_task_center.xml b/app/src/main/res/layout/fragment_task_center.xml index 55127f910..8ae131b39 100644 --- a/app/src/main/res/layout/fragment_task_center.xml +++ b/app/src/main/res/layout/fragment_task_center.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -19,6 +19,6 @@ 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..c998702d9 100644 --- a/app/src/main/res/layout/fragment_team_list.xml +++ b/app/src/main/res/layout/fragment_team_list.xml @@ -8,7 +8,7 @@ type="android.view.View.OnClickListener" /> - @@ -26,5 +26,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_userinfo_cp.xml b/app/src/main/res/layout/fragment_userinfo_cp.xml index da4a36e08..558cee789 100644 --- a/app/src/main/res/layout/fragment_userinfo_cp.xml +++ b/app/src/main/res/layout/fragment_userinfo_cp.xml @@ -20,7 +20,7 @@ android:scaleType="centerCrop" android:visibility="gone" /> - - - - - - - - @@ -23,5 +23,5 @@ - + \ 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..eacc9e4d0 100644 --- a/app/src/main/res/layout/frg_decoration_send_list.xml +++ b/app/src/main/res/layout/frg_decoration_send_list.xml @@ -1,5 +1,5 @@ - @@ -17,4 +17,4 @@ - + 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 2c7d6e29c..202d378f0 100644 --- a/app/src/main/res/layout/frg_my_decoration_common.xml +++ b/app/src/main/res/layout/frg_my_decoration_common.xml @@ -3,10 +3,10 @@ + type="com.mango.moshen.base.BaseListViewModel"/> - @@ -30,6 +30,6 @@ - + \ 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 678648f3c..31358f2fc 100644 --- a/app/src/main/res/layout/item_add_team_member.xml +++ b/app/src/main/res/layout/item_add_team_member.xml @@ -6,7 +6,7 @@ + type="com.mango.core.family.bean.FamilyMemberInfo" /> - - - - + - - + - - + type="com.mango.core.decoration.car.bean.CarInfo" /> + type="com.mango.core.decoration.car.bean.CarInfo" /> - - - - @@ -25,7 +25,7 @@ app:riv_corner_radius="@dimen/dp_16" /> - + - - + - @@ -36,7 +36,7 @@ android:gravity="center_vertical" android:orientation="horizontal"> - - + - - - - - - - - - - - - + type="com.mango.core.decoration.headwear.bean.HeadWearInfo" /> diff --git a/app/src/main/res/layout/item_home_add_friends.xml b/app/src/main/res/layout/item_home_add_friends.xml index 4d1dea68b..cfcaaaec5 100644 --- a/app/src/main/res/layout/item_home_add_friends.xml +++ b/app/src/main/res/layout/item_home_add_friends.xml @@ -30,7 +30,7 @@ app:layout_constraintStart_toStartOf="@id/view_bg" app:layout_constraintTop_toTopOf="@id/view_bg" /> - - - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_attention.xml b/app/src/main/res/layout/item_home_attention.xml index fb2dd1e20..3b8942f36 100644 --- a/app/src/main/res/layout/item_home_attention.xml +++ b/app/src/main/res/layout/item_home_attention.xml @@ -5,7 +5,7 @@ + type="com.mango.core.user.bean.AttentionInfo" /> @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - - - - - - - + - - + diff --git a/app/src/main/res/layout/item_home_find_new_user_list.xml b/app/src/main/res/layout/item_home_find_new_user_list.xml index c34457d5b..b8a0fb004 100644 --- a/app/src/main/res/layout/item_home_find_new_user_list.xml +++ b/app/src/main/res/layout/item_home_find_new_user_list.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - + - - + - - - - - - - - - - - - - - + - @@ -43,7 +43,7 @@ android:src="@drawable/icon_home_square_cover" /> - - + - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_live_tag.xml b/app/src/main/res/layout/item_live_tag.xml index a5fd2512e..36ab1c656 100644 --- a/app/src/main/res/layout/item_live_tag.xml +++ b/app/src/main/res/layout/item_live_tag.xml @@ -5,7 +5,7 @@ + type="com.mango.core.user.bean.LiveTagInfo.LiveSkillVoListBean" /> - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_my_chat_bubble.xml b/app/src/main/res/layout/item_my_chat_bubble.xml index 0f3c3ee94..36457a4de 100644 --- a/app/src/main/res/layout/item_my_chat_bubble.xml +++ b/app/src/main/res/layout/item_my_chat_bubble.xml @@ -7,7 +7,7 @@ + type="com.mango.core.decoration.headwear.bean.ChatBubbleInfo" /> + type="com.mango.core.decoration.headwear.bean.HeadWearInfo" /> + type="com.mango.core.decoration.headwear.bean.UserCardWearInfo" /> - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_reward_notice.xml b/app/src/main/res/layout/item_reward_notice.xml index 732e29156..1e4383a41 100644 --- a/app/src/main/res/layout/item_reward_notice.xml +++ b/app/src/main/res/layout/item_reward_notice.xml @@ -18,7 +18,7 @@ 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/main/res/layout/item_team_list.xml b/app/src/main/res/layout/item_team_list.xml index c4a547537..872b392a5 100644 --- a/app/src/main/res/layout/item_team_list.xml +++ b/app/src/main/res/layout/item_team_list.xml @@ -6,7 +6,7 @@ + type="com.mango.core.team.bean.TeamInfo" /> + type="com.mango.core.team.bean.TeamMemberInfo" /> + type="com.mango.core.team.bean.TeamTransactionRecordInfo" /> - - + type="com.mango.core.user.bean.UserGameInfo" /> - + type="com.mango.core.home.bean.BannerInfo" /> - - - + type="com.mango.core.relation.cp.CpRelation" /> + type="com.mango.core.relation.cp.CpInvitePageEntity" /> - - - - - - - - @@ -73,7 +73,7 @@ android:gravity="center_vertical" android:orientation="vertical"> - @@ -113,7 +113,7 @@ android:gravity="center_vertical" android:orientation="vertical"> - - diff --git a/app/src/main/res/layout/layout_gift_view.xml b/app/src/main/res/layout/layout_gift_view.xml index fb667b80a..0e943fa44 100644 --- a/app/src/main/res/layout/layout_gift_view.xml +++ b/app/src/main/res/layout/layout_gift_view.xml @@ -5,14 +5,14 @@ android:layout_height="match_parent" android:orientation="vertical"> - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type="com.mango.moshen.skill.widget.RecordIResourceItem" /> @@ -35,7 +35,7 @@ android:paddingTop="@dimen/dp_25" android:paddingBottom="@dimen/dp_25"> - - - - - - diff --git a/app/src/main/res/layout/list_item_auction_list.xml b/app/src/main/res/layout/list_item_auction_list.xml index fc2ce1710..27ee078c0 100644 --- a/app/src/main/res/layout/list_item_auction_list.xml +++ b/app/src/main/res/layout/list_item_auction_list.xml @@ -36,7 +36,7 @@ - - + type="com.mango.moshen.ui.gift.dialog.GiftInfoVm" /> diff --git a/app/src/main/res/layout/list_item_find_rv.xml b/app/src/main/res/layout/list_item_find_rv.xml index 169010020..ffb49d6bd 100644 --- a/app/src/main/res/layout/list_item_find_rv.xml +++ b/app/src/main/res/layout/list_item_find_rv.xml @@ -47,7 +47,7 @@ - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_home_monster.xml b/app/src/main/res/layout/list_item_home_monster.xml index daf88a067..9f841ea73 100644 --- a/app/src/main/res/layout/list_item_home_monster.xml +++ b/app/src/main/res/layout/list_item_home_monster.xml @@ -6,7 +6,7 @@ + type="com.mango.core.monsterhunting.bean.MonsterInfo"/> - - - + - + type="com.mango.core.room.ktv.bean.KtvRoomInfo" /> diff --git a/app/src/main/res/layout/list_item_ktv_search.xml b/app/src/main/res/layout/list_item_ktv_search.xml index 20fd07bb7..62a2a9a0c 100644 --- a/app/src/main/res/layout/list_item_ktv_search.xml +++ b/app/src/main/res/layout/list_item_ktv_search.xml @@ -8,7 +8,7 @@ + type="com.mango.core.room.ktv.bean.MusicInfo" /> diff --git a/app/src/main/res/layout/list_item_ktv_select.xml b/app/src/main/res/layout/list_item_ktv_select.xml index a567425be..dea3cad2b 100644 --- a/app/src/main/res/layout/list_item_ktv_select.xml +++ b/app/src/main/res/layout/list_item_ktv_select.xml @@ -7,7 +7,7 @@ + type="com.mango.core.room.ktv.bean.MusicInfo" /> diff --git a/app/src/main/res/layout/list_item_ktv_song.xml b/app/src/main/res/layout/list_item_ktv_song.xml index 58a2d4d63..fbed81ba2 100644 --- a/app/src/main/res/layout/list_item_ktv_song.xml +++ b/app/src/main/res/layout/list_item_ktv_song.xml @@ -8,7 +8,7 @@ + type="com.mango.core.room.ktv.bean.MusicInfo" /> @@ -78,7 +78,7 @@ android:layout_marginEnd="@dimen/dp_15" android:src="@drawable/icon_clear_song" /> - - - - - @@ -16,7 +16,7 @@ android:id="@+id/layout_item" android:layout_width="match_parent" android:layout_height="match_parent"> - - + - - - - - - - - @@ -25,5 +25,5 @@ android:layout_marginRight="5dp" android:src="@drawable/ic_nick_delete" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/list_order_bills_item.xml b/app/src/main/res/layout/list_order_bills_item.xml index 5f26086f0..47e00a374 100644 --- a/app/src/main/res/layout/list_order_bills_item.xml +++ b/app/src/main/res/layout/list_order_bills_item.xml @@ -7,7 +7,7 @@ android:background="@color/white" android:visibility="visible"> - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/popup_message_tip.xml b/app/src/main/res/layout/popup_message_tip.xml index 06c813a70..e99a7248e 100644 --- a/app/src/main/res/layout/popup_message_tip.xml +++ b/app/src/main/res/layout/popup_message_tip.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - - \ No newline at end of file diff --git a/app/src/main/res/layout/user_info_bottom_layout.xml b/app/src/main/res/layout/user_info_bottom_layout.xml index 293a35798..b351a2b2e 100644 --- a/app/src/main/res/layout/user_info_bottom_layout.xml +++ b/app/src/main/res/layout/user_info_bottom_layout.xml @@ -8,7 +8,7 @@ android:gravity="center" android:orientation="horizontal"> - - - - 隐私设置 通知提醒设置 - com.yizhuan.erban.ui.behavior.FixAppBarBehavior + com.mango.moshen.ui.behavior.FixAppBarBehavior 搜索记录 进房记录 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 3fa8c2ef1..5a5439971 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 @@ -24,7 +24,7 @@ import android.os.Parcelable; import androidx.annotation.Nullable; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import com.zhihu.matisse.internal.loader.AlbumLoader; public class Album implements Parcelable { 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 6698c343d..3e87cfb42 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 @@ -20,7 +20,7 @@ import androidx.annotation.IntDef; import androidx.fragment.app.FragmentActivity; import android.widget.Toast; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; import com.zhihu.matisse.internal.ui.widget.IncapableDialog; import java.lang.annotation.Retention; 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 87a9cecd7..45588e7ba 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 @@ -20,7 +20,7 @@ import android.content.pm.ActivityInfo; import androidx.annotation.StyleRes; import com.zhihu.matisse.MimeType; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import com.zhihu.matisse.engine.ImageEngine; import com.zhihu.matisse.engine.impl.GlideEngine; import com.zhihu.matisse.filter.Filter; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/model/SelectedItemCollection.java b/app/src/module_album/java/com/zhihu/matisse/internal/model/SelectedItemCollection.java index d82865f42..8e86cfe94 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/model/SelectedItemCollection.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/model/SelectedItemCollection.java @@ -20,7 +20,7 @@ import android.content.res.Resources; import android.net.Uri; import android.os.Bundle; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import com.zhihu.matisse.internal.entity.CustomItem; import com.zhihu.matisse.internal.entity.IncapableCause; 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..e26ce82ef 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 @@ -32,8 +32,8 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.TitleBar; +import com.mango.moshen.R; +import com.mango.moshen.base.TitleBar; import com.zhihu.matisse.internal.entity.IncapableCause; 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/MediaSelectionFragment.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java index 3498935aa..7e4e66e32 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 @@ -26,7 +26,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import com.zhihu.matisse.internal.entity.Album; 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/PreviewItemFragment.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java index d98f1fe92..fdd720768 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 @@ -27,8 +27,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.SingleToastUtil; import com.zhihu.matisse.internal.entity.Item; import com.zhihu.matisse.internal.entity.SelectionSpec; import com.zhihu.matisse.internal.utils.PhotoMetadataUtils; 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..d0f4f8e83 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 @@ -26,7 +26,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import com.zhihu.matisse.internal.entity.Album; import com.zhihu.matisse.internal.entity.IncapableCause; import com.zhihu.matisse.internal.entity.Item; diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumsAdapter.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumsAdapter.java index 5b7463379..b085c4328 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumsAdapter.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumsAdapter.java @@ -26,7 +26,7 @@ import android.widget.CursorAdapter; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; 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/ui/widget/AlbumsSpinner.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java index 7b8210268..85e11291b 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 @@ -27,7 +27,7 @@ import android.widget.AdapterView; import android.widget.CursorAdapter; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import com.zhihu.matisse.internal.entity.Album; import com.zhihu.matisse.internal.utils.Platform; 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..1bebce942 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 @@ -7,7 +7,7 @@ import androidx.core.content.res.ResourcesCompat; import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; -import com.yizhuan.erban.R; +import com.mango.moshen.R; public class CheckRadioView extends AppCompatImageView { 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..0311fc62c 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 @@ -32,7 +32,7 @@ import android.text.TextPaint; import android.util.AttributeSet; import android.view.View; -import com.yizhuan.erban.R; +import com.mango.moshen.R; public class CheckView extends 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 b36ac842f..775a2eb51 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 @@ -24,8 +24,8 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.BaseAlertDialogBuilder; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.dialog.BaseAlertDialogBuilder; public class IncapableDialog extends DialogFragment { 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..ba04b2639 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 @@ -25,7 +25,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; 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/utils/PhotoMetadataUtils.java b/app/src/module_album/java/com/zhihu/matisse/internal/utils/PhotoMetadataUtils.java index 67d8dd395..724ecd837 100644 --- a/app/src/module_album/java/com/zhihu/matisse/internal/utils/PhotoMetadataUtils.java +++ b/app/src/module_album/java/com/zhihu/matisse/internal/utils/PhotoMetadataUtils.java @@ -29,7 +29,7 @@ import android.util.DisplayMetrics; import android.util.Log; import com.zhihu.matisse.MimeType; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import com.zhihu.matisse.filter.Filter; import com.zhihu.matisse.internal.entity.IncapableCause; import com.zhihu.matisse.internal.entity.Item; 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 b2129d9b0..0a81a7d02 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 @@ -46,7 +46,7 @@ import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import com.zhihu.matisse.internal.entity.Album; import com.zhihu.matisse.internal.entity.CustomItem; import com.zhihu.matisse.internal.entity.IncapableCause; 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..f9d09aac5 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 @@ -7,8 +7,8 @@ import android.util.AttributeSet; import android.widget.LinearLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; /** * create by lvzebiao @2019/12/2 diff --git a/app/src/module_album/res/layout/layout_album_pick.xml b/app/src/module_album/res/layout/layout_album_pick.xml index b8990bd49..dc26ddf82 100644 --- a/app/src/module_album/res/layout/layout_album_pick.xml +++ b/app/src/module_album/res/layout/layout_album_pick.xml @@ -18,7 +18,7 @@ android:textSize="@dimen/sp_14" android:textStyle="bold" /> - - - - @@ -17,4 +17,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_bank_card/res/layout/item_room_collection.xml b/app/src/module_bank_card/res/layout/item_room_collection.xml index 3e2978209..2cf2b9aa2 100644 --- a/app/src/module_bank_card/res/layout/item_room_collection.xml +++ b/app/src/module_bank_card/res/layout/item_room_collection.xml @@ -7,7 +7,7 @@ android:layout_height="wrap_content" tools:background="@color/bg_normal_1c1b22"> - { + + + +} diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java b/app/src/module_community/java/com/mango/moshen/community/dynamic/view/DynamicDetailActivity.java similarity index 93% rename from app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java rename to app/src/module_community/java/com/mango/moshen/community/dynamic/view/DynamicDetailActivity.java index 60314c8cf..18b1f5c09 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java +++ b/app/src/module_community/java/com/mango/moshen/community/dynamic/view/DynamicDetailActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.dynamic.view; +package com.mango.moshen.community.dynamic.view; import android.content.ClipboardManager; import android.content.Context; @@ -31,53 +31,53 @@ import com.netease.nim.uikit.business.session.emoji.EmoticonPickerView; import com.netease.nim.uikit.business.session.emoji.IEmoticonSelectedListener; import com.netease.nim.uikit.business.session.emoji.MoonUtil; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.community.dynamic.adapter.CommentAdapter; -import com.yizhuan.erban.community.helper.CalcSize; -import com.yizhuan.erban.community.helper.DynamicUiHelper; -import com.yizhuan.erban.community.helper.ImageUiHelper; -import com.yizhuan.erban.community.helper.ShareDynamicHelper; -import com.yizhuan.erban.community.photo.BigPhotoActivity; -import com.yizhuan.erban.community.photo.DynamicImageAdapter; -import com.yizhuan.erban.community.photo.PagerOption; -import com.yizhuan.erban.community.utils.ObjectTypeHelper; -import com.yizhuan.erban.community.widget.DynamicNickDetailWidget; -import com.yizhuan.erban.community.widget.ExpandableTextView; -import com.yizhuan.erban.miniworld.activity.TopicMainActivity; -import com.yizhuan.erban.ui.login.BindPhoneActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.erban.utils.SpannableBuilder; -import com.yizhuan.erban.utils.TimeUiUtils; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.bean.Comment; -import com.yizhuan.xchat_android_core.community.bean.CommentResult; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.bean.comment.PopupParams; -import com.yizhuan.xchat_android_core.community.bean.comment.Reply; -import com.yizhuan.xchat_android_core.community.bean.comment.ReplyResult; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicDetailModel; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.community.event.DynamicDetailFinishEvent; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -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.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.LogUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.keyboard.KeyboardVisibilityEvent; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.community.dynamic.adapter.CommentAdapter; +import com.mango.moshen.community.helper.CalcSize; +import com.mango.moshen.community.helper.DynamicUiHelper; +import com.mango.moshen.community.helper.ImageUiHelper; +import com.mango.moshen.community.helper.ShareDynamicHelper; +import com.mango.moshen.community.photo.BigPhotoActivity; +import com.mango.moshen.community.photo.DynamicImageAdapter; +import com.mango.moshen.community.photo.PagerOption; +import com.mango.moshen.community.utils.ObjectTypeHelper; +import com.mango.moshen.community.widget.DynamicNickDetailWidget; +import com.mango.moshen.community.widget.ExpandableTextView; +import com.mango.moshen.miniworld.activity.TopicMainActivity; +import com.mango.moshen.ui.login.BindPhoneActivity; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.utils.RegexUtil; +import com.mango.moshen.utils.SpannableBuilder; +import com.mango.moshen.utils.TimeUiUtils; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.auth.AuthModel; +import com.mango.core.community.bean.Comment; +import com.mango.core.community.bean.CommentResult; +import com.mango.core.community.bean.DynamicMedia; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.core.community.bean.comment.PopupParams; +import com.mango.core.community.bean.comment.Reply; +import com.mango.core.community.bean.comment.ReplyResult; +import com.mango.core.community.dynamic.DynamicDetailModel; +import com.mango.core.community.dynamic.DynamicModel; +import com.mango.core.community.event.DynamicDetailFinishEvent; +import com.mango.core.noble.NobleUtil; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.LogUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.keyboard.KeyboardVisibilityEvent; import org.greenrobot.eventbus.EventBus; @@ -270,7 +270,7 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele etReply.setSelection(editEnd); etReply.addTextChangedListener(this); - tvSend.setEnabled(!com.yizhuan.xchat_android_core.utils.TextUtils.isEmptyText(s.toString())); + tvSend.setEnabled(!com.mango.core.utils.TextUtils.isEmptyText(s.toString())); } }); diff --git a/app/src/module_community/java/com/mango/moshen/community/dynamic/view/IWorldDynamicView.java b/app/src/module_community/java/com/mango/moshen/community/dynamic/view/IWorldDynamicView.java new file mode 100644 index 000000000..07d7dfd93 --- /dev/null +++ b/app/src/module_community/java/com/mango/moshen/community/dynamic/view/IWorldDynamicView.java @@ -0,0 +1,9 @@ +package com.mango.moshen.community.dynamic.view; + +import com.mango.xchat_android_library.base.IMvpBaseView; + +/** + * create by lvzebiao @2019/11/21 + */ +public interface IWorldDynamicView extends IMvpBaseView { +} diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java b/app/src/module_community/java/com/mango/moshen/community/dynamic/view/WorldDynamicFragment.java similarity index 90% rename from app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java rename to app/src/module_community/java/com/mango/moshen/community/dynamic/view/WorldDynamicFragment.java index 863135e94..d54a25ba2 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java +++ b/app/src/module_community/java/com/mango/moshen/community/dynamic/view/WorldDynamicFragment.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.community.dynamic.view; +package com.mango.moshen.community.dynamic.view; 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; @@ -11,29 +11,29 @@ import android.view.View; import android.view.ViewGroup; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.community.dynamic.adapter.WorldDynamicAdapter; -import com.yizhuan.erban.community.dynamic.presenter.WorldDynamicPresenter; -import com.yizhuan.erban.community.helper.ShareDynamicHelper; -import com.yizhuan.erban.miniworld.activity.MiniWorldGuestPageActivity; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.community.event.DynamicDetailFinishEvent; -import com.yizhuan.xchat_android_core.community.event.DynamicPublishEvent; -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.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.community.dynamic.adapter.WorldDynamicAdapter; +import com.mango.moshen.community.dynamic.presenter.WorldDynamicPresenter; +import com.mango.moshen.community.helper.ShareDynamicHelper; +import com.mango.moshen.miniworld.activity.MiniWorldGuestPageActivity; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.auth.AuthModel; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.core.community.bean.WorldDynamicListResult; +import com.mango.core.community.dynamic.DynamicModel; +import com.mango.core.community.event.DynamicDetailFinishEvent; +import com.mango.core.community.event.DynamicPublishEvent; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.SizeUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/helper/CalcSize.java b/app/src/module_community/java/com/mango/moshen/community/helper/CalcSize.java similarity index 84% rename from app/src/module_community/java/com/yizhuan/erban/community/helper/CalcSize.java rename to app/src/module_community/java/com/mango/moshen/community/helper/CalcSize.java index 2d7ed620d..dd599152e 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/helper/CalcSize.java +++ b/app/src/module_community/java/com/mango/moshen/community/helper/CalcSize.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.helper; +package com.mango.moshen.community.helper; /** * create by lvzebiao @2020/1/3 diff --git a/app/src/module_community/java/com/yizhuan/erban/community/helper/DynamicUiHelper.java b/app/src/module_community/java/com/mango/moshen/community/helper/DynamicUiHelper.java similarity index 71% rename from app/src/module_community/java/com/yizhuan/erban/community/helper/DynamicUiHelper.java rename to app/src/module_community/java/com/mango/moshen/community/helper/DynamicUiHelper.java index eed0f7989..d984d0ab3 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/helper/DynamicUiHelper.java +++ b/app/src/module_community/java/com/mango/moshen/community/helper/DynamicUiHelper.java @@ -1,13 +1,10 @@ -package com.yizhuan.erban.community.helper; +package com.mango.moshen.community.helper; import android.text.TextUtils; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.widget.MessageView; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_library.utils.LogUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.avroom.widget.MessageView; +import com.mango.core.community.bean.WorldDynamicBean; /** * create by lvzebiao @2019/12/4 diff --git a/app/src/module_community/java/com/yizhuan/erban/community/helper/ImageUiHelper.java b/app/src/module_community/java/com/mango/moshen/community/helper/ImageUiHelper.java similarity index 94% rename from app/src/module_community/java/com/yizhuan/erban/community/helper/ImageUiHelper.java rename to app/src/module_community/java/com/mango/moshen/community/helper/ImageUiHelper.java index d542291ae..5a2bbb0a6 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/helper/ImageUiHelper.java +++ b/app/src/module_community/java/com/mango/moshen/community/helper/ImageUiHelper.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.community.helper; +package com.mango.moshen.community.helper; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; +import com.mango.core.community.bean.DynamicMedia; /** * create by lvzebiao @2020/1/3 diff --git a/app/src/module_community/java/com/yizhuan/erban/community/helper/ShareDynamicHelper.java b/app/src/module_community/java/com/mango/moshen/community/helper/ShareDynamicHelper.java similarity index 72% rename from app/src/module_community/java/com/yizhuan/erban/community/helper/ShareDynamicHelper.java rename to app/src/module_community/java/com/mango/moshen/community/helper/ShareDynamicHelper.java index 7318c0ab4..6f591bc95 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/helper/ShareDynamicHelper.java +++ b/app/src/module_community/java/com/mango/moshen/community/helper/ShareDynamicHelper.java @@ -1,23 +1,23 @@ -package com.yizhuan.erban.community.helper; +package com.mango.moshen.community.helper; import android.app.Activity; import android.text.TextUtils; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.erban.ui.widget.ShareDialog; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.community.im.DynamicImMsg; -import com.yizhuan.xchat_android_core.share.ShareModel; -import com.yizhuan.xchat_android_core.share.bean.ShareCommonInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.friend.view.SelectFriendActivity; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.moshen.ui.widget.ShareDialog; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.core.community.dynamic.DynamicModel; +import com.mango.core.community.im.DynamicImMsg; +import com.mango.core.share.ShareModel; +import com.mango.core.share.bean.ShareCommonInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.config.BasicConfig; import cn.sharesdk.framework.Platform; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/holder/DynamicSysHolder.java b/app/src/module_community/java/com/mango/moshen/community/holder/DynamicSysHolder.java similarity index 91% rename from app/src/module_community/java/com/yizhuan/erban/community/holder/DynamicSysHolder.java rename to app/src/module_community/java/com/mango/moshen/community/holder/DynamicSysHolder.java index e09315897..d3e0c5c64 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/holder/DynamicSysHolder.java +++ b/app/src/module_community/java/com/mango/moshen/community/holder/DynamicSysHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.holder; +package com.mango.moshen.community.holder; import android.graphics.Color; import android.text.SpannableStringBuilder; @@ -12,13 +12,13 @@ import android.widget.TextView; import com.alibaba.fastjson.JSON; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.im.RouterHandler; -import com.yizhuan.xchat_android_core.community.attachment.DynamicSysAttachment; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgComponent; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgInfo; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgLayout; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.R; +import com.mango.moshen.ui.im.RouterHandler; +import com.mango.core.community.attachment.DynamicSysAttachment; +import com.mango.core.msg.sys.ErbanSysMsgComponent; +import com.mango.core.msg.sys.ErbanSysMsgInfo; +import com.mango.core.msg.sys.ErbanSysMsgLayout; +import com.mango.xchat_android_library.utils.SizeUtils; import java.util.List; import java.util.Objects; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/im/WorldDynamicShareViewHolder.java b/app/src/module_community/java/com/mango/moshen/community/im/WorldDynamicShareViewHolder.java similarity index 87% rename from app/src/module_community/java/com/yizhuan/erban/community/im/WorldDynamicShareViewHolder.java rename to app/src/module_community/java/com/mango/moshen/community/im/WorldDynamicShareViewHolder.java index 80e15ff6f..62298d387 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/im/WorldDynamicShareViewHolder.java +++ b/app/src/module_community/java/com/mango/moshen/community/im/WorldDynamicShareViewHolder.java @@ -1,20 +1,18 @@ -package com.yizhuan.erban.community.im; +package com.mango.moshen.community.im; import android.text.TextUtils; -import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.community.im.DynamicImMsg; -import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.community.dynamic.view.DynamicDetailActivity; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.community.im.DynamicImMsg; +import com.mango.core.community.im.WorldDynamicAttachment; /** * create by lvzebiao @2019/11/25 diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPagerAdapter.java b/app/src/module_community/java/com/mango/moshen/community/photo/BigPagerAdapter.java similarity index 97% rename from app/src/module_community/java/com/yizhuan/erban/community/photo/BigPagerAdapter.java rename to app/src/module_community/java/com/mango/moshen/community/photo/BigPagerAdapter.java index d21c8e9dd..3a38ef32b 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPagerAdapter.java +++ b/app/src/module_community/java/com/mango/moshen/community/photo/BigPagerAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.erban.community.photo; +package com.mango.moshen.community.photo; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPhotoActivity.java b/app/src/module_community/java/com/mango/moshen/community/photo/BigPhotoActivity.java similarity index 94% rename from app/src/module_community/java/com/yizhuan/erban/community/photo/BigPhotoActivity.java rename to app/src/module_community/java/com/mango/moshen/community/photo/BigPhotoActivity.java index 4d94736b2..f6e00d3d5 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPhotoActivity.java +++ b/app/src/module_community/java/com/mango/moshen/community/photo/BigPhotoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.photo; +package com.mango.moshen.community.photo; import android.app.Activity; import android.content.Intent; @@ -8,12 +8,12 @@ import android.view.View; import android.widget.ImageView; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.erban.ui.widget.OnPageSelectedListener; -import com.yizhuan.xchat_android_core.community.download.DownloadModel; -import com.yizhuan.xchat_android_core.utils.DirectoryHelper; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.moshen.ui.widget.OnPageSelectedListener; +import com.mango.core.community.download.DownloadModel; +import com.mango.core.utils.DirectoryHelper; import com.zhihu.matisse.internal.entity.CustomItem; import com.zhihu.matisse.internal.ui.widget.PreviewViewPager; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPhotoItemFragment.java b/app/src/module_community/java/com/mango/moshen/community/photo/BigPhotoItemFragment.java similarity index 94% rename from app/src/module_community/java/com/yizhuan/erban/community/photo/BigPhotoItemFragment.java rename to app/src/module_community/java/com/mango/moshen/community/photo/BigPhotoItemFragment.java index 2b4b12774..05858c4c7 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPhotoItemFragment.java +++ b/app/src/module_community/java/com/mango/moshen/community/photo/BigPhotoItemFragment.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.erban.community.photo; +package com.mango.moshen.community.photo; import android.app.Activity; import android.content.Context; @@ -26,10 +26,10 @@ import android.view.ViewGroup; import com.bumptech.glide.request.RequestOptions; 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_library.utils.LogUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.xchat_android_library.utils.LogUtil; import com.zhihu.matisse.internal.entity.CustomItem; import it.sephiroth.android.library.imagezoom.ImageViewTouch; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/DynamicImageAdapter.java b/app/src/module_community/java/com/mango/moshen/community/photo/DynamicImageAdapter.java similarity index 86% rename from app/src/module_community/java/com/yizhuan/erban/community/photo/DynamicImageAdapter.java rename to app/src/module_community/java/com/mango/moshen/community/photo/DynamicImageAdapter.java index c0d268012..6c055260e 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/photo/DynamicImageAdapter.java +++ b/app/src/module_community/java/com/mango/moshen/community/photo/DynamicImageAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.photo; +package com.mango.moshen.community.photo; import android.content.Context; @@ -10,12 +10,12 @@ import android.widget.ImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -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.DynamicMedia; -import com.yizhuan.xchat_android_library.utils.ScreenUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.community.bean.DynamicMedia; +import com.mango.xchat_android_library.utils.ScreenUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.util.List; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/OnFragmentOptionListener.java b/app/src/module_community/java/com/mango/moshen/community/photo/OnFragmentOptionListener.java similarity index 78% rename from app/src/module_community/java/com/yizhuan/erban/community/photo/OnFragmentOptionListener.java rename to app/src/module_community/java/com/mango/moshen/community/photo/OnFragmentOptionListener.java index c2a787675..3a0986590 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/photo/OnFragmentOptionListener.java +++ b/app/src/module_community/java/com/mango/moshen/community/photo/OnFragmentOptionListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.photo; +package com.mango.moshen.community.photo; /** * create by lvzebiao @2019/11/20 diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/PagerOption.java b/app/src/module_community/java/com/mango/moshen/community/photo/PagerOption.java similarity index 95% rename from app/src/module_community/java/com/yizhuan/erban/community/photo/PagerOption.java rename to app/src/module_community/java/com/mango/moshen/community/photo/PagerOption.java index 39ec380e2..cdb90f18d 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/photo/PagerOption.java +++ b/app/src/module_community/java/com/mango/moshen/community/photo/PagerOption.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.photo; +package com.mango.moshen.community.photo; import com.zhihu.matisse.internal.entity.CustomItem; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/PhotoAdapter.java b/app/src/module_community/java/com/mango/moshen/community/photo/PhotoAdapter.java similarity index 87% rename from app/src/module_community/java/com/yizhuan/erban/community/photo/PhotoAdapter.java rename to app/src/module_community/java/com/mango/moshen/community/photo/PhotoAdapter.java index aa6d99a62..0aafe772f 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/photo/PhotoAdapter.java +++ b/app/src/module_community/java/com/mango/moshen/community/photo/PhotoAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.photo; +package com.mango.moshen.community.photo; import android.content.Context; import android.content.Intent; @@ -15,14 +15,14 @@ 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.common.widget.dialog.DialogManager; -import com.yizhuan.erban.community.widget.ZoomImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.file.JXFileUtils; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.community.widget.ZoomImageView; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.file.JXFileUtils; import com.zhihu.matisse.internal.entity.CustomItem; import java.io.File; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/PreviewPhotoActivity.java b/app/src/module_community/java/com/mango/moshen/community/photo/PreviewPhotoActivity.java similarity index 95% rename from app/src/module_community/java/com/yizhuan/erban/community/photo/PreviewPhotoActivity.java rename to app/src/module_community/java/com/mango/moshen/community/photo/PreviewPhotoActivity.java index cfcf5d6ae..789a35658 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/photo/PreviewPhotoActivity.java +++ b/app/src/module_community/java/com/mango/moshen/community/photo/PreviewPhotoActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.photo; +package com.mango.moshen.community.photo; import android.app.Activity; import android.content.Context; @@ -11,9 +11,9 @@ import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.community.utils.ObjectTypeHelper; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.community.utils.ObjectTypeHelper; import com.zhihu.matisse.internal.entity.CustomItem; import java.util.ArrayList; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/ImageAdapter.java b/app/src/module_community/java/com/mango/moshen/community/publish/ImageAdapter.java similarity index 87% rename from app/src/module_community/java/com/yizhuan/erban/community/publish/ImageAdapter.java rename to app/src/module_community/java/com/mango/moshen/community/publish/ImageAdapter.java index b98cf3ffa..326629ef4 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/ImageAdapter.java +++ b/app/src/module_community/java/com/mango/moshen/community/publish/ImageAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.publish; +package com.mango.moshen.community.publish; import android.widget.ImageView; @@ -9,9 +9,9 @@ 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.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.community.bean.PublishItem; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.community.bean.PublishItem; import java.util.List; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/presenter/PublishPresenter.java b/app/src/module_community/java/com/mango/moshen/community/publish/presenter/PublishPresenter.java similarity index 85% rename from app/src/module_community/java/com/yizhuan/erban/community/publish/presenter/PublishPresenter.java rename to app/src/module_community/java/com/mango/moshen/community/publish/presenter/PublishPresenter.java index 60d179653..5100d808f 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/presenter/PublishPresenter.java +++ b/app/src/module_community/java/com/mango/moshen/community/publish/presenter/PublishPresenter.java @@ -1,27 +1,27 @@ -package com.yizhuan.erban.community.publish.presenter; +package com.mango.moshen.community.publish.presenter; import android.text.TextUtils; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.community.publish.view.IPublishView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.ImageUploadConfig; -import com.yizhuan.xchat_android_core.community.PublishModel; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; -import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo; -import com.yizhuan.xchat_android_core.community.bean.PublishBody; -import com.yizhuan.xchat_android_core.file.FileModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.DirectoryHelper; -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.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.file.JXFileUtils; -import com.yizhuan.xchat_android_library.utils.image.JXImageUtils; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.community.publish.view.IPublishView; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.community.ImageUploadConfig; +import com.mango.core.community.PublishModel; +import com.mango.core.community.bean.DynamicMedia; +import com.mango.core.community.bean.MiniWorldChooseInfo; +import com.mango.core.community.bean.PublishBody; +import com.mango.core.file.FileModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.DirectoryHelper; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.file.JXFileUtils; +import com.mango.xchat_android_library.utils.image.JXImageUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/presenter/WorldChoosePresenter.java b/app/src/module_community/java/com/mango/moshen/community/publish/presenter/WorldChoosePresenter.java similarity index 79% rename from app/src/module_community/java/com/yizhuan/erban/community/publish/presenter/WorldChoosePresenter.java rename to app/src/module_community/java/com/mango/moshen/community/publish/presenter/WorldChoosePresenter.java index 98ca21dbc..a3f216562 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/presenter/WorldChoosePresenter.java +++ b/app/src/module_community/java/com/mango/moshen/community/publish/presenter/WorldChoosePresenter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.community.publish.presenter; +package com.mango.moshen.community.publish.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.community.publish.view.IWorldsChooseView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.community.PublishModel; -import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.community.publish.view.IWorldsChooseView; +import com.mango.core.Constants; +import com.mango.core.community.PublishModel; +import com.mango.core.community.bean.MiniWorldChooseInfo; import java.util.List; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/IPublishView.java b/app/src/module_community/java/com/mango/moshen/community/publish/view/IPublishView.java similarity index 62% rename from app/src/module_community/java/com/yizhuan/erban/community/publish/view/IPublishView.java rename to app/src/module_community/java/com/mango/moshen/community/publish/view/IPublishView.java index fbb8f4522..fe7c6692f 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/IPublishView.java +++ b/app/src/module_community/java/com/mango/moshen/community/publish/view/IPublishView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.community.publish.view; +package com.mango.moshen.community.publish.view; -import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.community.bean.MiniWorldChooseInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/IWorldsChooseView.java b/app/src/module_community/java/com/mango/moshen/community/publish/view/IWorldsChooseView.java similarity index 50% rename from app/src/module_community/java/com/yizhuan/erban/community/publish/view/IWorldsChooseView.java rename to app/src/module_community/java/com/mango/moshen/community/publish/view/IWorldsChooseView.java index bed2f25e4..c9ddfe13f 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/IWorldsChooseView.java +++ b/app/src/module_community/java/com/mango/moshen/community/publish/view/IWorldsChooseView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.community.publish.view; +package com.mango.moshen.community.publish.view; -import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.community.bean.MiniWorldChooseInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java b/app/src/module_community/java/com/mango/moshen/community/publish/view/PublishActivity.java similarity index 90% rename from app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java rename to app/src/module_community/java/com/mango/moshen/community/publish/view/PublishActivity.java index b451abd67..22ca66f23 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java +++ b/app/src/module_community/java/com/mango/moshen/community/publish/view/PublishActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.publish.view; +package com.mango.moshen.community.publish.view; import android.Manifest; import android.content.Context; @@ -24,35 +24,34 @@ import com.google.android.flexbox.FlexboxLayout; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.common.util.log.LogUtil; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.common.permission.PermissionActivity; -import com.yizhuan.erban.common.widget.dialog.ChooseWorldsDialog; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.community.ConstantValue; -import com.yizhuan.erban.community.photo.BigPhotoActivity; -import com.yizhuan.erban.community.photo.PagerOption; -import com.yizhuan.erban.community.publish.ImageAdapter; -import com.yizhuan.erban.community.publish.presenter.PublishPresenter; -import com.yizhuan.erban.community.utils.Glide4Engine; -import com.yizhuan.erban.community.utils.ObjectTypeHelper; -import com.yizhuan.erban.ui.login.BindPhoneActivity; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.GridSpacingItemDecoration; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo; -import com.yizhuan.xchat_android_core.community.bean.PublishItem; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -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.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.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.common.widget.dialog.ChooseWorldsDialog; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.community.ConstantValue; +import com.mango.moshen.community.photo.BigPhotoActivity; +import com.mango.moshen.community.photo.PagerOption; +import com.mango.moshen.community.publish.ImageAdapter; +import com.mango.moshen.community.publish.presenter.PublishPresenter; +import com.mango.moshen.community.utils.Glide4Engine; +import com.mango.moshen.community.utils.ObjectTypeHelper; +import com.mango.moshen.ui.login.BindPhoneActivity; +import com.mango.moshen.ui.widget.recyclerview.decoration.GridSpacingItemDecoration; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.community.bean.MiniWorldChooseInfo; +import com.mango.core.community.bean.PublishItem; +import com.mango.core.miniworld.model.MiniWorldModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.config.BasicConfig; import com.zhihu.matisse.Matisse; import com.zhihu.matisse.MimeType; import com.zhihu.matisse.internal.entity.CaptureStrategy; @@ -306,7 +305,7 @@ public class PublishActivity extends BaseMvpActivity { diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java b/app/src/module_community/java/com/mango/moshen/community/publish/view/WorldsChooseFrg.java similarity index 88% rename from app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java rename to app/src/module_community/java/com/mango/moshen/community/publish/view/WorldsChooseFrg.java index 0695af131..dfc18dac6 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java +++ b/app/src/module_community/java/com/mango/moshen/community/publish/view/WorldsChooseFrg.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.publish.view; +package com.mango.moshen.community.publish.view; import android.os.Bundle; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -7,14 +7,14 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.community.publish.presenter.WorldChoosePresenter; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.HorizontalDecoration; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.community.publish.presenter.WorldChoosePresenter; +import com.mango.moshen.ui.widget.recyclerview.decoration.HorizontalDecoration; +import com.mango.core.Constants; +import com.mango.core.community.bean.MiniWorldChooseInfo; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.SizeUtils; import java.util.List; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java b/app/src/module_community/java/com/mango/moshen/community/square/SquareDynamicFragment.java similarity index 86% rename from app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java rename to app/src/module_community/java/com/mango/moshen/community/square/SquareDynamicFragment.java index b36dae297..800961777 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java +++ b/app/src/module_community/java/com/mango/moshen/community/square/SquareDynamicFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.square; +package com.mango.moshen.community.square; import android.graphics.Rect; import android.os.Bundle; @@ -14,37 +14,37 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.common.EmptyViewHelper; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.community.helper.ShareDynamicHelper; -import com.yizhuan.erban.community.square.adapter.SquareDynamicAdapter; -import com.yizhuan.erban.miniworld.activity.AllTopicActivity; -import com.yizhuan.erban.miniworld.activity.TopicMainActivity; -import com.yizhuan.erban.miniworld.adapter.RecommendTopicListAdapter; -import com.yizhuan.erban.miniworld.listener.DoubleClickCheckListener; -import com.yizhuan.erban.miniworld.presenter.MiniWorldCategoryPresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldCategoryView; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.CommunityConstant; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.community.event.DynamicPublishEvent; -import com.yizhuan.xchat_android_core.community.square.SquareModel; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -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.event.LoadLoginUserInfoEvent; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.common.EmptyViewHelper; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.community.helper.ShareDynamicHelper; +import com.mango.moshen.community.square.adapter.SquareDynamicAdapter; +import com.mango.moshen.miniworld.activity.AllTopicActivity; +import com.mango.moshen.miniworld.activity.TopicMainActivity; +import com.mango.moshen.miniworld.adapter.RecommendTopicListAdapter; +import com.mango.moshen.miniworld.listener.DoubleClickCheckListener; +import com.mango.moshen.miniworld.presenter.MiniWorldCategoryPresenter; +import com.mango.moshen.miniworld.view.IMiniWorldCategoryView; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.auth.AuthModel; +import com.mango.core.community.CommunityConstant; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.core.community.bean.WorldDynamicListResult; +import com.mango.core.community.dynamic.DynamicModel; +import com.mango.core.community.event.DynamicPublishEvent; +import com.mango.core.community.square.SquareModel; +import com.mango.core.miniworld.bean.MiniWorldInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.user.event.LoadLoginUserInfoEvent; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.SizeUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java b/app/src/module_community/java/com/mango/moshen/community/square/SquareFragment.java similarity index 86% rename from app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java rename to app/src/module_community/java/com/mango/moshen/community/square/SquareFragment.java index b15dc8417..fa3bd5471 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java +++ b/app/src/module_community/java/com/mango/moshen/community/square/SquareFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.square; +package com.mango.moshen.community.square; import android.annotation.SuppressLint; import android.os.Bundle; @@ -12,23 +12,23 @@ import android.widget.FrameLayout; import android.widget.TextView; import com.netease.nim.uikit.common.ui.draggablebubbles.BubbleView; -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.activity.CommunityNoticeAct; -import com.yizhuan.erban.ui.widget.OnPageSelectedListener; -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.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.event.UnReadCountEvent; -import com.yizhuan.xchat_android_core.home.model.HomeModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.RoomContributeListAdapter; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.common.widget.DragLayout; +import com.mango.moshen.community.publish.view.PublishActivity; +import com.mango.moshen.home.adapter.TopMagicIndicatorAdapter; +import com.mango.moshen.home.activity.CommunityNoticeAct; +import com.mango.moshen.ui.widget.OnPageSelectedListener; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.core.auth.AuthModel; +import com.mango.core.community.event.UnReadCountEvent; +import com.mango.core.home.model.HomeModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.event.LoadLoginUserInfoEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java b/app/src/module_community/java/com/mango/moshen/community/square/adapter/SquareDynamicAdapter.java similarity index 85% rename from app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java rename to app/src/module_community/java/com/mango/moshen/community/square/adapter/SquareDynamicAdapter.java index 122d5630b..5132538f6 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java +++ b/app/src/module_community/java/com/mango/moshen/community/square/adapter/SquareDynamicAdapter.java @@ -1,8 +1,7 @@ -package com.yizhuan.erban.community.square.adapter; +package com.mango.moshen.community.square.adapter; import android.content.Context; -import android.graphics.drawable.AnimationDrawable; import android.text.TextUtils; import android.util.SparseBooleanArray; import android.util.SparseIntArray; @@ -15,37 +14,32 @@ 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.UIHelper; -import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity; -import com.yizhuan.erban.community.helper.DynamicUiHelper; -import com.yizhuan.erban.community.helper.ImageUiHelper; -import com.yizhuan.erban.community.square.SquareFragment; -import com.yizhuan.erban.community.utils.TopicUpTextWrapper; -import com.yizhuan.erban.community.widget.DynamicNickDetailWidget; -import com.yizhuan.erban.community.widget.ExpandableTextView; -import com.yizhuan.erban.community.widget.GridImageWidget; -import com.yizhuan.erban.community.widget.TopicLabelWidget; -import com.yizhuan.erban.miniworld.activity.MiniWorldGuestPageActivity; -import com.yizhuan.erban.miniworld.activity.TopicMainActivity; -import com.yizhuan.erban.miniworld.presenter.MiniWorldCategoryPresenter; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.utils.TimeUiUtils; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -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.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.community.dynamic.view.DynamicDetailActivity; +import com.mango.moshen.community.helper.DynamicUiHelper; +import com.mango.moshen.community.utils.TopicUpTextWrapper; +import com.mango.moshen.community.widget.DynamicNickDetailWidget; +import com.mango.moshen.community.widget.ExpandableTextView; +import com.mango.moshen.community.widget.GridImageWidget; +import com.mango.moshen.community.widget.TopicLabelWidget; +import com.mango.moshen.miniworld.activity.TopicMainActivity; +import com.mango.moshen.miniworld.presenter.MiniWorldCategoryPresenter; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.utils.TimeUiUtils; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.core.community.dynamic.DynamicModel; +import com.mango.core.noble.NobleUtil; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.List; -import lombok.val; - /** * create by lvzebiao @2019/11/13 */ diff --git a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/IUserDynamicView.java b/app/src/module_community/java/com/mango/moshen/community/user_dynamic/IUserDynamicView.java similarity index 64% rename from app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/IUserDynamicView.java rename to app/src/module_community/java/com/mango/moshen/community/user_dynamic/IUserDynamicView.java index dcf5da9a2..eed669d8c 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/IUserDynamicView.java +++ b/app/src/module_community/java/com/mango/moshen/community/user_dynamic/IUserDynamicView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.community.user_dynamic; +package com.mango.moshen.community.user_dynamic; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java b/app/src/module_community/java/com/mango/moshen/community/user_dynamic/UserDynamicAdapter.java similarity index 90% rename from app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java rename to app/src/module_community/java/com/mango/moshen/community/user_dynamic/UserDynamicAdapter.java index 3eef74af3..ead791f30 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java +++ b/app/src/module_community/java/com/mango/moshen/community/user_dynamic/UserDynamicAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.user_dynamic; +package com.mango.moshen.community.user_dynamic; import android.app.Activity; import android.content.Context; @@ -17,25 +17,25 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.community.helper.CalcSize; -import com.yizhuan.erban.community.helper.ImageUiHelper; -import com.yizhuan.erban.community.photo.BigPhotoActivity; -import com.yizhuan.erban.community.photo.DynamicImageAdapter; -import com.yizhuan.erban.community.photo.PagerOption; -import com.yizhuan.erban.community.utils.ObjectTypeHelper; -import com.yizhuan.erban.community.widget.ExpandableTextView; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.GridSpacingItemDecoration; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; -import com.yizhuan.xchat_android_core.community.bean.UserDynamicItem; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ScreenUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.moshen.community.helper.CalcSize; +import com.mango.moshen.community.helper.ImageUiHelper; +import com.mango.moshen.community.photo.BigPhotoActivity; +import com.mango.moshen.community.photo.DynamicImageAdapter; +import com.mango.moshen.community.photo.PagerOption; +import com.mango.moshen.community.utils.ObjectTypeHelper; +import com.mango.moshen.community.widget.ExpandableTextView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.recyclerview.decoration.GridSpacingItemDecoration; +import com.mango.core.community.bean.DynamicMedia; +import com.mango.core.community.bean.UserDynamicItem; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.core.community.dynamic.DynamicModel; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.ScreenUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java b/app/src/module_community/java/com/mango/moshen/community/user_dynamic/UserDynamicFrg.java similarity index 91% rename from app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java rename to app/src/module_community/java/com/mango/moshen/community/user_dynamic/UserDynamicFrg.java index 5b111aa5a..28258ff06 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java +++ b/app/src/module_community/java/com/mango/moshen/community/user_dynamic/UserDynamicFrg.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.user_dynamic; +package com.mango.moshen.community.user_dynamic; import android.os.Bundle; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -7,21 +7,21 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity; -import com.yizhuan.erban.community.helper.ShareDynamicHelper; -import com.yizhuan.erban.miniworld.activity.TopicMainActivity; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.bean.UserDynamicItem; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -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; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.community.dynamic.view.DynamicDetailActivity; +import com.mango.moshen.community.helper.ShareDynamicHelper; +import com.mango.moshen.miniworld.activity.TopicMainActivity; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.auth.AuthModel; +import com.mango.core.community.bean.UserDynamicItem; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.base.factory.CreatePresenter; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicPresenter.java b/app/src/module_community/java/com/mango/moshen/community/user_dynamic/UserDynamicPresenter.java similarity index 79% rename from app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicPresenter.java rename to app/src/module_community/java/com/mango/moshen/community/user_dynamic/UserDynamicPresenter.java index 276f91df0..ae8ed7405 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicPresenter.java +++ b/app/src/module_community/java/com/mango/moshen/community/user_dynamic/UserDynamicPresenter.java @@ -1,32 +1,19 @@ -package com.yizhuan.erban.community.user_dynamic; +package com.mango.moshen.community.user_dynamic; import android.annotation.SuppressLint; -import android.app.Activity; -import android.text.TextUtils; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.erban.ui.widget.ShareDialog; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.community.bean.UserDynamicItem; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.community.im.DynamicImMsg; -import com.yizhuan.xchat_android_core.share.ShareModel; -import com.yizhuan.xchat_android_core.share.bean.ShareCommonInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.user.UserDynamicModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.Constants; +import com.mango.core.community.bean.UserDynamicItem; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.core.community.dynamic.DynamicModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserDynamicModel; import java.util.ArrayList; import java.util.List; -import cn.sharesdk.framework.Platform; import io.reactivex.functions.BiConsumer; public class UserDynamicPresenter extends BaseMvpPresenter { diff --git a/app/src/module_community/java/com/yizhuan/erban/community/utils/Glide4Engine.java b/app/src/module_community/java/com/mango/moshen/community/utils/Glide4Engine.java similarity index 98% rename from app/src/module_community/java/com/yizhuan/erban/community/utils/Glide4Engine.java rename to app/src/module_community/java/com/mango/moshen/community/utils/Glide4Engine.java index b15c6349c..e68f58e00 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/utils/Glide4Engine.java +++ b/app/src/module_community/java/com/mango/moshen/community/utils/Glide4Engine.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.erban.community.utils; +package com.mango.moshen.community.utils; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/utils/ObjectTypeHelper.java b/app/src/module_community/java/com/mango/moshen/community/utils/ObjectTypeHelper.java similarity index 93% rename from app/src/module_community/java/com/yizhuan/erban/community/utils/ObjectTypeHelper.java rename to app/src/module_community/java/com/mango/moshen/community/utils/ObjectTypeHelper.java index 8fb96633f..64a684bb5 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/utils/ObjectTypeHelper.java +++ b/app/src/module_community/java/com/mango/moshen/community/utils/ObjectTypeHelper.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.community.utils; +package com.mango.moshen.community.utils; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; +import com.mango.core.community.bean.DynamicMedia; import com.zhihu.matisse.internal.entity.CustomItem; import java.util.ArrayList; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/utils/TopicUpTextWrapper.kt b/app/src/module_community/java/com/mango/moshen/community/utils/TopicUpTextWrapper.kt similarity index 84% rename from app/src/module_community/java/com/yizhuan/erban/community/utils/TopicUpTextWrapper.kt rename to app/src/module_community/java/com/mango/moshen/community/utils/TopicUpTextWrapper.kt index 04a3d42b4..1f8738846 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/utils/TopicUpTextWrapper.kt +++ b/app/src/module_community/java/com/mango/moshen/community/utils/TopicUpTextWrapper.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.utils +package com.mango.moshen.community.utils import android.content.Context import android.graphics.Color @@ -6,9 +6,9 @@ import android.graphics.drawable.Drawable import android.text.SpannableStringBuilder import android.text.Spanned import android.text.style.ForegroundColorSpan -import com.yizhuan.erban.R -import com.yizhuan.erban.common.widget.CustomImageSpan -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil +import com.mango.moshen.R +import com.mango.moshen.common.widget.CustomImageSpan +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil object TopicUpTextWrapper { diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java b/app/src/module_community/java/com/mango/moshen/community/widget/DynamicNickDetailWidget.java similarity index 90% rename from app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java rename to app/src/module_community/java/com/mango/moshen/community/widget/DynamicNickDetailWidget.java index ecf32a101..1cdff23ac 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java +++ b/app/src/module_community/java/com/mango/moshen/community/widget/DynamicNickDetailWidget.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.widget; +package com.mango.moshen.community.widget; import android.content.Context; @@ -13,13 +13,13 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.erban.utils.TimeUiUtils; -import com.yizhuan.erban.vip.VipHelper; -import com.yizhuan.xchat_android_core.user.bean.BaseUserInfo; -import com.yizhuan.xchat_android_library.widget.ShapeConstrainLayout; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.utils.RegexUtil; +import com.mango.moshen.utils.TimeUiUtils; +import com.mango.moshen.vip.VipHelper; +import com.mango.core.user.bean.BaseUserInfo; +import com.mango.xchat_android_library.widget.ShapeConstrainLayout; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java b/app/src/module_community/java/com/mango/moshen/community/widget/ExpandableTextView.java similarity index 98% rename from app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java rename to app/src/module_community/java/com/mango/moshen/community/widget/ExpandableTextView.java index 116ef5d34..0a27d0b55 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java +++ b/app/src/module_community/java/com/mango/moshen/community/widget/ExpandableTextView.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.yizhuan.erban.community.widget; +package com.mango.moshen.community.widget; import android.annotation.TargetApi; import android.content.Context; @@ -43,9 +43,9 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; +import com.mango.moshen.R; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; import lombok.Setter; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java b/app/src/module_community/java/com/mango/moshen/community/widget/GridImageWidget.java similarity index 84% rename from app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java rename to app/src/module_community/java/com/mango/moshen/community/widget/GridImageWidget.java index 3c70a53c4..319cd9972 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java +++ b/app/src/module_community/java/com/mango/moshen/community/widget/GridImageWidget.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.widget; +package com.mango.moshen.community.widget; import android.app.Activity; import android.content.Context; @@ -11,18 +11,18 @@ import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.community.helper.CalcSize; -import com.yizhuan.erban.community.helper.ImageUiHelper; -import com.yizhuan.erban.community.photo.BigPhotoActivity; -import com.yizhuan.erban.community.photo.DynamicImageAdapter; -import com.yizhuan.erban.community.photo.PagerOption; -import com.yizhuan.erban.community.utils.ObjectTypeHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.GridVItemDecoration; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.community.helper.CalcSize; +import com.mango.moshen.community.helper.ImageUiHelper; +import com.mango.moshen.community.photo.BigPhotoActivity; +import com.mango.moshen.community.photo.DynamicImageAdapter; +import com.mango.moshen.community.photo.PagerOption; +import com.mango.moshen.community.utils.ObjectTypeHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.recyclerview.decoration.GridVItemDecoration; +import com.mango.core.community.bean.DynamicMedia; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/TopicLabelWidget.kt b/app/src/module_community/java/com/mango/moshen/community/widget/TopicLabelWidget.kt similarity index 90% rename from app/src/module_community/java/com/yizhuan/erban/community/widget/TopicLabelWidget.kt rename to app/src/module_community/java/com/mango/moshen/community/widget/TopicLabelWidget.kt index 35d90bd26..579baabb5 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/widget/TopicLabelWidget.kt +++ b/app/src/module_community/java/com/mango/moshen/community/widget/TopicLabelWidget.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.widget +package com.mango.moshen.community.widget import android.content.Context import android.os.Build @@ -7,8 +7,8 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.LinearLayout import androidx.annotation.Nullable -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil +import com.mango.moshen.ui.utils.ImageLoadUtilsV2 +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil class TopicLabelWidget(context: Context, @Nullable attrs: AttributeSet) : LinearLayout(context, attrs) { diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/TouchHideKeyboardView.java b/app/src/module_community/java/com/mango/moshen/community/widget/TouchHideKeyboardView.java similarity index 88% rename from app/src/module_community/java/com/yizhuan/erban/community/widget/TouchHideKeyboardView.java rename to app/src/module_community/java/com/mango/moshen/community/widget/TouchHideKeyboardView.java index a4b3c90a5..82fd31127 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/widget/TouchHideKeyboardView.java +++ b/app/src/module_community/java/com/mango/moshen/community/widget/TouchHideKeyboardView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.widget; +package com.mango.moshen.community.widget; import android.app.Activity; import android.content.Context; @@ -6,7 +6,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; import android.util.AttributeSet; import android.view.MotionEvent; -import com.yizhuan.xchat_android_library.utils.keyboard.KeyboardUtil; +import com.mango.xchat_android_library.utils.keyboard.KeyboardUtil; /** * create by lvzebiao @2019/11/28 diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/ZoomImageView.java b/app/src/module_community/java/com/mango/moshen/community/widget/ZoomImageView.java similarity index 99% rename from app/src/module_community/java/com/yizhuan/erban/community/widget/ZoomImageView.java rename to app/src/module_community/java/com/mango/moshen/community/widget/ZoomImageView.java index c300836a5..c382c6b6b 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/widget/ZoomImageView.java +++ b/app/src/module_community/java/com/mango/moshen/community/widget/ZoomImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.community.widget; +package com.mango.moshen.community.widget; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/presenter/WorldDynamicPresenter.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/presenter/WorldDynamicPresenter.java deleted file mode 100644 index 909433f94..000000000 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/presenter/WorldDynamicPresenter.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.erban.community.dynamic.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.community.dynamic.view.IWorldDynamicView; - -/** - * create by lvzebiao @2019/11/21 - */ -public class WorldDynamicPresenter extends BaseMvpPresenter { - - - -} diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/IWorldDynamicView.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/IWorldDynamicView.java deleted file mode 100644 index b86497cb8..000000000 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/IWorldDynamicView.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.yizhuan.erban.community.dynamic.view; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -/** - * create by lvzebiao @2019/11/21 - */ -public interface IWorldDynamicView extends IMvpBaseView { -} 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..7606dfc57 100644 --- a/app/src/module_community/res/layout/activity_big_photo.xml +++ b/app/src/module_community/res/layout/activity_big_photo.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - - - - - + 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 4f21d8ca4..04cb6bbdc 100644 --- a/app/src/module_community/res/layout/fragment_square_dynamic.xml +++ b/app/src/module_community/res/layout/fragment_square_dynamic.xml @@ -7,7 +7,7 @@ android:background="@color/color_F9F9F9" android:focusableInTouchMode="true"> - @@ -20,7 +20,7 @@ android:layout_marginRight="15dp" android:clipToPadding="false" /> - + \ 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..253e4d50e 100644 --- a/app/src/module_community/res/layout/fragment_world_dynamic.xml +++ b/app/src/module_community/res/layout/fragment_world_dynamic.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -17,6 +17,6 @@ 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/frg_worlds_choose.xml b/app/src/module_community/res/layout/frg_worlds_choose.xml index 86c2d22d2..6a60d59e4 100644 --- a/app/src/module_community/res/layout/frg_worlds_choose.xml +++ b/app/src/module_community/res/layout/frg_worlds_choose.xml @@ -1,5 +1,5 @@ - @@ -18,4 +18,4 @@ - \ No newline at end of file + \ 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 23f1254a1..a3d36d57f 100644 --- a/app/src/module_community/res/layout/head_dynamic_detail.xml +++ b/app/src/module_community/res/layout/head_dynamic_detail.xml @@ -13,7 +13,7 @@ android:layout_marginTop="@dimen/dp_10" app:layout_constraintTop_toTopOf="parent"> - - - - + - - - - - diff --git a/app/src/module_community/res/layout/item_red_package_diamond.xml b/app/src/module_community/res/layout/item_red_package_diamond.xml index 3c19c0300..d19328ac7 100644 --- a/app/src/module_community/res/layout/item_red_package_diamond.xml +++ b/app/src/module_community/res/layout/item_red_package_diamond.xml @@ -9,7 +9,7 @@ tools:layout_width="200dp" tools:background="#fd2772"> - - - - - - - + - - - + - - + - - - - + - - () { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminManageActivity.kt b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/SuperAdminManageActivity.kt similarity index 87% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminManageActivity.kt rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/SuperAdminManageActivity.kt index 4242deca0..bd05a2259 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminManageActivity.kt +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/SuperAdminManageActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.hall.activity +package com.mango.moshen.module_hall.hall.activity import android.annotation.SuppressLint import android.content.Context @@ -12,15 +12,15 @@ import android.widget.PopupWindow import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.StatusBarUtil import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.ActivitySuperAdminManegeBinding -import com.yizhuan.erban.module_hall.hall.adapter.ManageSuperAdminAdapter -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.R +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.ActivitySuperAdminManegeBinding +import com.mango.moshen.module_hall.hall.adapter.ManageSuperAdminAdapter +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.module_hall.hall.HallModel +import com.mango.core.module_hall.hall.bean.SuperAdminInfo +import com.mango.core.utils.toast class SuperAdminManageActivity : BaseViewBindingActivity() { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminRoomSetActivity.kt b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/SuperAdminRoomSetActivity.kt similarity index 85% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminRoomSetActivity.kt rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/SuperAdminRoomSetActivity.kt index 2b8dc8325..9f96ef7c7 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminRoomSetActivity.kt +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/SuperAdminRoomSetActivity.kt @@ -1,19 +1,19 @@ -package com.yizhuan.erban.module_hall.hall.activity +package com.mango.moshen.module_hall.hall.activity import android.annotation.SuppressLint import android.content.Context import android.content.Intent import androidx.recyclerview.widget.LinearLayoutManager import com.netease.nim.uikit.StatusBarUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.databinding.ActivitySuperAdminRoomSetBinding -import com.yizhuan.erban.module_hall.hall.adapter.ManageRoomSetAdapter -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall -import com.yizhuan.xchat_android_core.utils.toast +import com.mango.moshen.R +import com.mango.moshen.base.BaseViewBindingActivity +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.databinding.ActivitySuperAdminRoomSetBinding +import com.mango.moshen.module_hall.hall.adapter.ManageRoomSetAdapter +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.module_hall.hall.HallModel +import com.mango.core.module_hall.hall.bean.SuperAdminHall +import com.mango.core.utils.toast class SuperAdminRoomSetActivity : BaseViewBindingActivity() { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AuthSettingAdapter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/AuthSettingAdapter.java similarity index 88% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AuthSettingAdapter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/AuthSettingAdapter.java index 8efe5b086..3e4131d42 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AuthSettingAdapter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/AuthSettingAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.hall.adapter; +package com.mango.moshen.module_hall.hall.adapter; import android.content.Context; import android.text.TextUtils; @@ -7,9 +7,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; +import com.mango.moshen.R; +import com.mango.core.module_hall.hall.bean.AuthInfo; +import com.mango.xchat_android_library.widget.IOSSwitchView; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupListAdapter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/GroupListAdapter.java similarity index 75% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupListAdapter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/GroupListAdapter.java index e6638fb5e..fae402164 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupListAdapter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/GroupListAdapter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.module_hall.hall.adapter; +package com.mango.moshen.module_hall.hall.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.module_hall.hall.bean.HTeamInfo; public class GroupListAdapter extends BaseQuickAdapter { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupMemberListAdapter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/GroupMemberListAdapter.java similarity index 94% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupMemberListAdapter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/GroupMemberListAdapter.java index 26df922a8..cc30ea903 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupMemberListAdapter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/GroupMemberListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.hall.adapter; +package com.mango.moshen.module_hall.hall.adapter; import android.content.Context; import android.text.TextUtils; @@ -6,12 +6,12 @@ import android.widget.ImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -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.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.RoleType; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.utils.RegexUtil; +import com.mango.core.level.UserLevelVo; +import com.mango.core.module_hall.hall.bean.MemberInfo; +import com.mango.core.module_hall.hall.bean.RoleType; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/HallListAdapter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/HallListAdapter.java similarity index 75% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/HallListAdapter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/HallListAdapter.java index 7adfc7133..75d54b4ce 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/HallListAdapter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/HallListAdapter.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.module_hall.hall.adapter; +package com.mango.moshen.module_hall.hall.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.module_hall.hall.bean.HallInfo; public class HallListAdapter extends BaseQuickAdapter { public HallListAdapter() { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageRoomAdapter.kt b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/ManageRoomAdapter.kt similarity index 75% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageRoomAdapter.kt rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/ManageRoomAdapter.kt index 0603d6f87..652da0582 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageRoomAdapter.kt +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/ManageRoomAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.erban.module_hall.hall.adapter +package com.mango.moshen.module_hall.hall.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall +import com.mango.moshen.R +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.module_hall.hall.bean.SuperAdminHall class ManageRoomAdapter : BaseQuickAdapter(R.layout.item_manage_room) { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageRoomSetAdapter.kt b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/ManageRoomSetAdapter.kt similarity index 77% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageRoomSetAdapter.kt rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/ManageRoomSetAdapter.kt index 14d27d855..544188964 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageRoomSetAdapter.kt +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/ManageRoomSetAdapter.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.module_hall.hall.adapter +package com.mango.moshen.module_hall.hall.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall +import com.mango.moshen.R +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.module_hall.hall.bean.SuperAdminHall class ManageRoomSetAdapter : BaseQuickAdapter(R.layout.item_manage_room_set) { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/ManageSuperAdminAdapter.kt similarity index 78% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/ManageSuperAdminAdapter.kt index 9fb2e2675..25310ad0c 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/ManageSuperAdminAdapter.kt @@ -1,15 +1,15 @@ -package com.yizhuan.erban.module_hall.hall.adapter +package com.mango.moshen.module_hall.hall.adapter import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo +import com.mango.moshen.R +import com.mango.moshen.common.EmptyViewHelper +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.core.module_hall.hall.bean.SuperAdminHall +import com.mango.core.module_hall.hall.bean.SuperAdminInfo class ManageSuperAdminAdapter : BaseQuickAdapter(R.layout.item_manage_super_admin) { 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/mango/moshen/module_hall/hall/adapter/MemberViewHolder.java similarity index 95% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/MemberViewHolder.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/MemberViewHolder.java index 8f69d5c28..fa64c617a 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/mango/moshen/module_hall/hall/adapter/MemberViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.hall.adapter; +package com.mango.moshen.module_hall.hall.adapter; import androidx.appcompat.widget.AppCompatImageView; import android.view.View; @@ -7,7 +7,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; +import com.mango.moshen.R; public class MemberViewHolder extends BaseViewHolder { TextView userName; 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/mango/moshen/module_hall/hall/adapter/OptionAdapter.java similarity index 87% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/OptionAdapter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/OptionAdapter.java index 7bcf33e1f..f6d908fca 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/mango/moshen/module_hall/hall/adapter/OptionAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.hall.adapter; +package com.mango.moshen.module_hall.hall.adapter; import android.content.Context; import androidx.annotation.Nullable; @@ -7,8 +7,8 @@ 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.xchat_android_core.module_hall.hall.bean.OptionInfo; +import com.mango.moshen.R; +import com.mango.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/adapter/SearchAdminAdapter.kt b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/SearchAdminAdapter.kt similarity index 80% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/SearchAdminAdapter.kt rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/SearchAdminAdapter.kt index 762438875..f4116eab8 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/SearchAdminAdapter.kt +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/SearchAdminAdapter.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.module_hall.hall.adapter +package com.mango.moshen.module_hall.hall.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo +import com.mango.moshen.R +import com.mango.moshen.ui.utils.ImageLoadUtils +import com.mango.core.module_hall.hall.bean.SuperAdminInfo class SearchAdminAdapter : BaseQuickAdapter(R.layout.item_search_admin) { diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/AddMemberPresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/AddMemberPresenter.java new file mode 100644 index 000000000..e543de7c6 --- /dev/null +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/AddMemberPresenter.java @@ -0,0 +1,7 @@ +package com.mango.moshen.module_hall.hall.presenter; + +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.hall.view.IAddMemberView; + +public class AddMemberPresenter extends BaseMvpPresenter { +} diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AdminAddPresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/AdminAddPresenter.java similarity index 88% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AdminAddPresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/AdminAddPresenter.java index d446b5e82..7285a50af 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AdminAddPresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/AdminAddPresenter.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.module_hall.hall.presenter; +package com.mango.moshen.module_hall.hall.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.hall.view.IAdminAddView; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.hall.view.IAdminAddView; +import com.mango.core.module_hall.hall.HallModel; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AdminListPresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/AdminListPresenter.java similarity index 69% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AdminListPresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/AdminListPresenter.java index 5d39bb4a5..d548099ee 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AdminListPresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/AdminListPresenter.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.module_hall.hall.presenter; +package com.mango.moshen.module_hall.hall.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.hall.view.IAdminListView; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.hall.view.IAdminListView; +import com.mango.core.module_hall.hall.HallModel; +import com.mango.core.module_hall.hall.bean.ListMemberInfo; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.utils.ListUtils; public class AdminListPresenter extends BaseMvpPresenter { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AuthSettingPresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/AuthSettingPresenter.java similarity index 85% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AuthSettingPresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/AuthSettingPresenter.java index 460328f07..7741943f8 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AuthSettingPresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/AuthSettingPresenter.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.module_hall.hall.presenter; +package com.mango.moshen.module_hall.hall.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.hall.view.IAuthSettingView; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.hall.view.IAuthSettingView; +import com.mango.core.module_hall.hall.HallModel; +import com.mango.core.module_hall.hall.bean.AuthInfo; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/HallNamePresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/HallNamePresenter.java similarity index 80% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/HallNamePresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/HallNamePresenter.java index 14bc9b957..a9e021763 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/HallNamePresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/HallNamePresenter.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.module_hall.hall.presenter; +package com.mango.moshen.module_hall.hall.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.hall.view.IHallNameView; -import com.yizhuan.xchat_android_core.module_hall.hall.HallNameModel; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.hall.view.IHallNameView; +import com.mango.core.module_hall.hall.HallNameModel; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/ModuleHallPresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/ModuleHallPresenter.java similarity index 90% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/ModuleHallPresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/ModuleHallPresenter.java index b24b446b8..ae47308b2 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/ModuleHallPresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/ModuleHallPresenter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.hall.presenter; +package com.mango.moshen.module_hall.hall.presenter; import android.content.Context; import android.text.SpannableString; @@ -7,15 +7,14 @@ import android.text.style.ForegroundColorSpan; import androidx.core.content.ContextCompat; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.widget.MessageView; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.HallDataManager; -import com.yizhuan.erban.module_hall.hall.view.IModuleHallView; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; +import com.mango.moshen.R; +import com.mango.moshen.avroom.widget.MessageView; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.HallDataManager; +import com.mango.moshen.module_hall.hall.view.IModuleHallView; +import com.mango.core.auth.AuthModel; +import com.mango.core.module_hall.hall.bean.AuthInfo; +import com.mango.core.module_hall.hall.HallModel; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/RemoveMemberPresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/RemoveMemberPresenter.java similarity index 89% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/RemoveMemberPresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/RemoveMemberPresenter.java index 9ae8e579f..d8f8007e8 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/RemoveMemberPresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/presenter/RemoveMemberPresenter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.hall.presenter; +package com.mango.moshen.module_hall.hall.presenter; import android.content.Context; import android.text.SpannableString; @@ -7,11 +7,11 @@ import android.text.style.ForegroundColorSpan; import androidx.core.content.ContextCompat; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.hall.view.IRemoveMemberView; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.hall.view.IRemoveMemberView; +import com.mango.core.module_hall.hall.HallModel; +import com.mango.xchat_android_library.utils.SingleToastUtil; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IAddMemberView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IAddMemberView.java new file mode 100644 index 000000000..ed89f1228 --- /dev/null +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IAddMemberView.java @@ -0,0 +1,6 @@ +package com.mango.moshen.module_hall.hall.view; + +import com.mango.xchat_android_library.base.IMvpBaseView; + +public interface IAddMemberView extends IMvpBaseView { +} diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAdminAddView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IAdminAddView.java similarity index 67% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAdminAddView.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IAdminAddView.java index 564f1f6f7..37eb780e5 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAdminAddView.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IAdminAddView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.module_hall.hall.view; +package com.mango.moshen.module_hall.hall.view; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.module_hall.hall.bean.MemberInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAdminListView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IAdminListView.java similarity index 51% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAdminListView.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IAdminListView.java index 447f44fc5..6df2f0ec1 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAdminListView.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IAdminListView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.module_hall.hall.view; +package com.mango.moshen.module_hall.hall.view; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.module_hall.hall.bean.MemberInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAuthSettingView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IAuthSettingView.java similarity index 59% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAuthSettingView.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IAuthSettingView.java index 0bad63394..77f57d2e2 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAuthSettingView.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IAuthSettingView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.module_hall.hall.view; +package com.mango.moshen.module_hall.hall.view; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.module_hall.hall.bean.AuthInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IHallNameView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IHallNameView.java similarity index 58% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IHallNameView.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IHallNameView.java index 4c4c78c40..0e2b53a17 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IHallNameView.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IHallNameView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.module_hall.hall.view; +package com.mango.moshen.module_hall.hall.view; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; public interface IHallNameView extends IMvpBaseView { void updateHallNameSuccess(String message); diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IMemberSearchView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IMemberSearchView.java similarity index 51% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IMemberSearchView.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IMemberSearchView.java index 0aabf3241..b2ac244a4 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IMemberSearchView.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IMemberSearchView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.module_hall.hall.view; +package com.mango.moshen.module_hall.hall.view; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.module_hall.hall.bean.MemberInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IModuleHallView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IModuleHallView.java similarity index 61% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IModuleHallView.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IModuleHallView.java index de5bdf414..83c4911e9 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IModuleHallView.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IModuleHallView.java @@ -1,9 +1,8 @@ -package com.yizhuan.erban.module_hall.hall.view; +package com.mango.moshen.module_hall.hall.view; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.module_hall.hall.bean.AuthInfo; +import com.mango.core.module_hall.hall.bean.MemberInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IRemoveMemberView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IRemoveMemberView.java similarity index 56% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IRemoveMemberView.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IRemoveMemberView.java index fc112536e..a632c0a2c 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IRemoveMemberView.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/IRemoveMemberView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.module_hall.hall.view; +package com.mango.moshen.module_hall.hall.view; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; public interface IRemoveMemberView extends IMvpBaseView { void removeSuccess(String message); 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/mango/moshen/module_hall/hall/view/dialog/HallMenuDialog.java similarity index 96% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/HallMenuDialog.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/dialog/HallMenuDialog.java index 05c843d32..3dab33333 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/mango/moshen/module_hall/hall/view/dialog/HallMenuDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.hall.view.dialog; +package com.mango.moshen.module_hall.hall.view.dialog; import android.app.Dialog; import android.content.Context; @@ -13,9 +13,9 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.R; +import com.mango.core.module_hall.hall.bean.AuthInfo; +import com.mango.xchat_android_library.utils.SizeUtils; import java.util.List; 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/mango/moshen/module_hall/hall/view/dialog/TimePickerDialog.java similarity index 98% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerDialog.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/dialog/TimePickerDialog.java index 0946c1aad..66604b918 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/mango/moshen/module_hall/hall/view/dialog/TimePickerDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.hall.view.dialog; +package com.mango.moshen.module_hall.hall.view.dialog; import android.app.Activity; import android.app.Dialog; @@ -22,9 +22,9 @@ import com.jzxiang.pickerview.config.PickerConfig; import com.jzxiang.pickerview.data.Type; import com.jzxiang.pickerview.data.WheelCalendar; import com.jzxiang.pickerview.listener.OnDateSetListener; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.R; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.Calendar; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimeWheel.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/dialog/TimeWheel.java similarity index 99% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimeWheel.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/dialog/TimeWheel.java index 4815ba828..8778dc789 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimeWheel.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/dialog/TimeWheel.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.hall.view.dialog; +package com.mango.moshen.module_hall.hall.view.dialog; import android.content.Context; import android.view.View; @@ -10,7 +10,7 @@ import com.jzxiang.pickerview.utils.PickerContants; import com.jzxiang.pickerview.utils.Utils; import com.jzxiang.pickerview.wheel.OnWheelChangedListener; import com.jzxiang.pickerview.wheel.WheelView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; import java.util.Calendar; 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/mango/moshen/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java similarity index 80% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java index 11dc15f78..cce6a3c25 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/mango/moshen/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java @@ -1,17 +1,17 @@ -package com.yizhuan.erban.module_hall.hall.view.indicator; +package com.mango.moshen.module_hall.hall.view.indicator; import android.content.Context; import androidx.core.content.ContextCompat; 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.mango.moshen.R; +import com.mango.moshen.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/NimHelper.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/im/NimHelper.java similarity index 83% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/NimHelper.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/im/NimHelper.java index 12a075a40..516fede87 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/NimHelper.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/im/NimHelper.java @@ -1,23 +1,19 @@ -package com.yizhuan.erban.module_hall.im; +package com.mango.moshen.module_hall.im; import android.text.TextUtils; import com.netease.nim.uikit.api.NimUIKit; -import com.netease.nim.uikit.api.model.SimpleCallback; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.msg.MsgService; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.team.model.Team; import com.trello.rxlifecycle3.LifecycleProvider; -import com.trello.rxlifecycle3.android.ActivityEvent; -import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.module_hall.im.HallImMsgInfo; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.module_hall.im.HallImMsgInfo; import java.util.Map; import io.reactivex.Single; -import io.reactivex.SingleEmitter; import io.reactivex.SingleOnSubscribe; /** 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/mango/moshen/module_hall/im/msgholder/HallMsgViewHolder.java similarity index 91% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/im/msgholder/HallMsgViewHolder.java index ea92d5a3b..5360f6b59 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/mango/moshen/module_hall/im/msgholder/HallMsgViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.im.msgholder; +package com.mango.moshen.module_hall.im.msgholder; import android.graphics.Color; import androidx.constraintlayout.widget.ConstraintLayout; @@ -19,20 +19,20 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLo 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.module_hall.im.NimHelper; -import com.yizhuan.erban.ui.im.RouterHandler; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.event.HallInfoChangeEvent; -import com.yizhuan.xchat_android_core.module_hall.im.HallAttachment; -import com.yizhuan.xchat_android_core.module_hall.im.HallImMsgInfo; -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.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.module_hall.im.NimHelper; +import com.mango.moshen.ui.im.RouterHandler; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.event.HallInfoChangeEvent; +import com.mango.core.module_hall.im.HallAttachment; +import com.mango.core.module_hall.im.HallImMsgInfo; +import com.mango.core.module_hall.hall.HallModel; +import com.mango.core.module_hall.hall.bean.ApplyResult; +import com.mango.core.module_hall.im.bean.HallMsgComponent; +import com.mango.core.module_hall.im.bean.HallMsgLayout; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/ClanIncomeFragment.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/ClanIncomeFragment.java similarity index 85% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/ClanIncomeFragment.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/ClanIncomeFragment.java index f0b5636e3..56a736f8e 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/ClanIncomeFragment.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/ClanIncomeFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.income; +package com.mango.moshen.module_hall.income; import android.os.Bundle; import android.view.LayoutInflater; @@ -9,14 +9,14 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.module_hall.income.adapter.ClanIncomeAdapter; -import com.yizhuan.erban.module_hall.income.presenter.ClanIncomeFragmentPresenter; -import com.yizhuan.erban.module_hall.income.view.IClanIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.module_hall.income.adapter.ClanIncomeAdapter; +import com.mango.moshen.module_hall.income.presenter.ClanIncomeFragmentPresenter; +import com.mango.moshen.module_hall.income.view.IClanIncomeView; +import com.mango.core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import butterknife.BindView; import butterknife.ButterKnife; 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/mango/moshen/module_hall/income/DayIncomeFragment.java similarity index 89% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/DayIncomeFragment.java index 6502d6c4c..0e783354f 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/DayIncomeFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.income; +package com.mango.moshen.module_hall.income; import android.os.Bundle; import android.view.LayoutInflater; @@ -10,14 +10,14 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.module_hall.income.adapter.IncomeAdapter; -import com.yizhuan.erban.module_hall.income.presenter.IncomePresenter; -import com.yizhuan.erban.module_hall.income.view.IIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeTotalInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.module_hall.income.adapter.IncomeAdapter; +import com.mango.moshen.module_hall.income.presenter.IncomePresenter; +import com.mango.moshen.module_hall.income.view.IIncomeView; +import com.mango.core.module_hall.income.bean.IncomeInfo; +import com.mango.core.module_hall.income.bean.IncomeTotalInfo; +import com.mango.xchat_android_library.base.factory.CreatePresenter; import java.util.List; 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/mango/moshen/module_hall/income/IncomeDetailActivity.java similarity index 80% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/IncomeDetailActivity.java index 6a744a719..d80c990b8 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/IncomeDetailActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.income; +package com.mango.moshen.module_hall.income; import android.content.Context; import android.content.Intent; @@ -10,20 +10,20 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.module_hall.income.adapter.IncomeDetailAdapter; -import com.yizhuan.erban.module_hall.income.presenter.IncomeDetailPresenter; -import com.yizhuan.erban.module_hall.income.view.IIncomeDetailView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.SpacingDecoration; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeInfo; -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; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.module_hall.income.adapter.IncomeDetailAdapter; +import com.mango.moshen.module_hall.income.presenter.IncomeDetailPresenter; +import com.mango.moshen.module_hall.income.view.IIncomeDetailView; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.moshen.ui.widget.recyclerview.decoration.SpacingDecoration; +import com.mango.core.module_hall.income.bean.IncomeGiftInfo; +import com.mango.core.module_hall.income.bean.IncomeInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/SingleRoomIncomeFragment.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/SingleRoomIncomeFragment.java similarity index 86% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/SingleRoomIncomeFragment.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/SingleRoomIncomeFragment.java index 45c5d514d..18c8ac12b 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/SingleRoomIncomeFragment.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/SingleRoomIncomeFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.income; +package com.mango.moshen.module_hall.income; import android.os.Bundle; import android.view.LayoutInflater; @@ -9,14 +9,14 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.module_hall.income.adapter.SingleRoomIncomeAdapter; -import com.yizhuan.erban.module_hall.income.presenter.SingRoomIncomeFragmentPresenter; -import com.yizhuan.erban.module_hall.income.view.ISingRoomIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.module_hall.income.adapter.SingleRoomIncomeAdapter; +import com.mango.moshen.module_hall.income.presenter.SingRoomIncomeFragmentPresenter; +import com.mango.moshen.module_hall.income.view.ISingRoomIncomeView; +import com.mango.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/ClanIncomeAdapter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/adapter/ClanIncomeAdapter.java similarity index 89% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/ClanIncomeAdapter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/adapter/ClanIncomeAdapter.java index 2915f062e..592e23951 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/ClanIncomeAdapter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/adapter/ClanIncomeAdapter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.module_hall.income.adapter; +package com.mango.moshen.module_hall.income.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanIncomeInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.module_hall.income.bean.ClanIncomeInfo; import org.jetbrains.annotations.NotNull; 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/mango/moshen/module_hall/income/adapter/IncomeAdapter.java similarity index 88% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeAdapter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/adapter/IncomeAdapter.java index aacd773a6..253c8e6a9 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/mango/moshen/module_hall/income/adapter/IncomeAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.income.adapter; +package com.mango.moshen.module_hall.income.adapter; import android.content.Context; import androidx.annotation.Nullable; @@ -6,9 +6,9 @@ import android.text.TextUtils; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.module_hall.income.bean.IncomeInfo; import java.math.BigDecimal; import java.math.RoundingMode; 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/mango/moshen/module_hall/income/adapter/IncomeDetailAdapter.java similarity index 91% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/adapter/IncomeDetailAdapter.java index a7bef992e..91e606eee 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/mango/moshen/module_hall/income/adapter/IncomeDetailAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.income.adapter; +package com.mango.moshen.module_hall.income.adapter; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; @@ -7,9 +7,9 @@ import android.text.style.ForegroundColorSpan; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.module_hall.income.bean.IncomeGiftInfo; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/SingleRoomIncomeAdapter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/adapter/SingleRoomIncomeAdapter.java similarity index 86% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/SingleRoomIncomeAdapter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/adapter/SingleRoomIncomeAdapter.java index 70d9e6d96..8837bb001 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/SingleRoomIncomeAdapter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/adapter/SingleRoomIncomeAdapter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.module_hall.income.adapter; +package com.mango.moshen.module_hall.income.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomIncomeInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.module_hall.income.bean.SingleRoomIncomeInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/ClanIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/ClanIncomeFragmentPresenter.java similarity index 77% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/ClanIncomeFragmentPresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/ClanIncomeFragmentPresenter.java index 1f2c50f2c..8fad30f6a 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/ClanIncomeFragmentPresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/ClanIncomeFragmentPresenter.java @@ -1,13 +1,12 @@ -package com.yizhuan.erban.module_hall.income.presenter; +package com.mango.moshen.module_hall.income.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.income.view.IClanIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.IncomeModel; -import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.income.view.IClanIncomeView; +import com.mango.core.module_hall.income.IncomeModel; +import com.mango.core.module_hall.income.bean.ClanTotalIncomeInfo; import org.jetbrains.annotations.NotNull; -import io.reactivex.Single; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/ClanIncomePresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/ClanIncomePresenter.java similarity index 94% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/ClanIncomePresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/ClanIncomePresenter.java index ec7499055..fca7e7b09 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/ClanIncomePresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/ClanIncomePresenter.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.module_hall.income.presenter; +package com.mango.moshen.module_hall.income.presenter; import android.text.SpannableString; import android.text.style.RelativeSizeSpan; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.income.view.IIncomeStatisticsView; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.income.view.IIncomeStatisticsView; +import com.mango.xchat_android_library.utils.TimeUtils; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeDetailPresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/IncomeDetailPresenter.java similarity index 78% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeDetailPresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/IncomeDetailPresenter.java index 861550ee2..8887ba058 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeDetailPresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/IncomeDetailPresenter.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.module_hall.income.presenter; +package com.mango.moshen.module_hall.income.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.income.view.IIncomeDetailView; -import com.yizhuan.xchat_android_core.module_hall.income.IncomeModel; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.income.view.IIncomeDetailView; +import com.mango.core.module_hall.income.IncomeModel; +import com.mango.core.module_hall.income.bean.IncomeGiftInfo; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomePresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/IncomePresenter.java similarity index 77% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomePresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/IncomePresenter.java index 8de675ecd..03103af9b 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomePresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/IncomePresenter.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.module_hall.income.presenter; +package com.mango.moshen.module_hall.income.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.income.view.IIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.IncomeModel; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeTotalInfo; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.income.view.IIncomeView; +import com.mango.core.module_hall.income.IncomeModel; +import com.mango.core.module_hall.income.bean.IncomeTotalInfo; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeStatisticsPresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/IncomeStatisticsPresenter.java similarity index 94% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeStatisticsPresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/IncomeStatisticsPresenter.java index 870376146..b3fb9a0a4 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeStatisticsPresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/IncomeStatisticsPresenter.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.module_hall.income.presenter; +package com.mango.moshen.module_hall.income.presenter; import android.text.SpannableString; import android.text.style.RelativeSizeSpan; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.income.view.IIncomeStatisticsView; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.income.view.IIncomeStatisticsView; +import com.mango.xchat_android_library.utils.TimeUtils; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java similarity index 78% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java index f6e44db8f..717e045de 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.module_hall.income.presenter; +package com.mango.moshen.module_hall.income.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.income.view.ISingRoomIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.IncomeModel; -import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.income.view.ISingRoomIncomeView; +import com.mango.core.module_hall.income.IncomeModel; +import com.mango.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/SingleRoomIncomePresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/SingleRoomIncomePresenter.java similarity index 94% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/SingleRoomIncomePresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/SingleRoomIncomePresenter.java index 7cc03b00a..f37015151 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/SingleRoomIncomePresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/presenter/SingleRoomIncomePresenter.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.module_hall.income.presenter; +package com.mango.moshen.module_hall.income.presenter; import android.text.SpannableString; import android.text.style.RelativeSizeSpan; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.income.view.IIncomeStatisticsView; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.income.view.IIncomeStatisticsView; +import com.mango.xchat_android_library.utils.TimeUtils; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/IClanIncomeView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/IClanIncomeView.java new file mode 100644 index 000000000..68b5e3a9e --- /dev/null +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/IClanIncomeView.java @@ -0,0 +1,10 @@ +package com.mango.moshen.module_hall.income.view; + +import com.mango.core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; + +public interface IClanIncomeView extends IMvpBaseView { + + void incomeTotalSuccess(ClanTotalIncomeInfo clanTotalIncomeInfo); + void incomeTotalFail(String message); +} diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeDetailView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/IIncomeDetailView.java similarity index 51% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeDetailView.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/IIncomeDetailView.java index d9a9ca18a..0811455c4 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeDetailView.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/IIncomeDetailView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.module_hall.income.view; +package com.mango.moshen.module_hall.income.view; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.module_hall.income.bean.IncomeGiftInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/IIncomeStatisticsView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/IIncomeStatisticsView.java new file mode 100644 index 000000000..76ecc27a0 --- /dev/null +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/IIncomeStatisticsView.java @@ -0,0 +1,6 @@ +package com.mango.moshen.module_hall.income.view; + +import com.mango.xchat_android_library.base.IMvpBaseView; + +public interface IIncomeStatisticsView extends IMvpBaseView { +} diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/IIncomeView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/IIncomeView.java new file mode 100644 index 000000000..fdfbf9ceb --- /dev/null +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/IIncomeView.java @@ -0,0 +1,10 @@ +package com.mango.moshen.module_hall.income.view; + +import com.mango.core.module_hall.income.bean.IncomeTotalInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; + +public interface IIncomeView extends IMvpBaseView { + + void incomeTotalSuccess(IncomeTotalInfo incomeTotalInfo); + void incomeTotalFail(String message); +} diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/ISingRoomIncomeView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/ISingRoomIncomeView.java new file mode 100644 index 000000000..c23ad2921 --- /dev/null +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/income/view/ISingRoomIncomeView.java @@ -0,0 +1,10 @@ +package com.mango.moshen.module_hall.income.view; + +import com.mango.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; + +public interface ISingRoomIncomeView extends IMvpBaseView { + + void incomeTotalSuccess(SingleRoomTotalIncomeInfo incomeInfo); + void incomeTotalFail(String message); +} diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/PwdCodeMgr.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/PwdCodeMgr.java similarity index 87% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/PwdCodeMgr.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/PwdCodeMgr.java index f5a6a4d7c..6d00f5a09 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/PwdCodeMgr.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/PwdCodeMgr.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.secretcode; +package com.mango.moshen.module_hall.secretcode; import android.annotation.SuppressLint; import android.content.Context; @@ -7,28 +7,28 @@ import android.text.style.ForegroundColorSpan; import com.google.gson.Gson; import com.orhanobut.logger.Logger; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; -import com.yizhuan.erban.module_hall.hall.activity.HallSearchActivity; -import com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity; -import com.yizhuan.erban.other.activity.SplashActivity; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.erban.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.module_hall.secretcode.SecretCodeModel; -import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.CheckCodeResult; -import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.SecretCodeInfo; -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.utils.EmojiUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.UIUtils; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.friend.action.AbstractSelectFriendAction; +import com.mango.moshen.module_hall.hall.activity.HallSearchActivity; +import com.mango.moshen.module_hall.hall.activity.ModuleHallActivity; +import com.mango.moshen.other.activity.SplashActivity; +import com.mango.core.module_hall.hall.HallModel; +import com.mango.core.utils.ActivityUtil; +import com.mango.moshen.utils.SpannableBuilder; +import com.mango.core.auth.AuthModel; +import com.mango.core.module_hall.secretcode.SecretCodeModel; +import com.mango.core.module_hall.secretcode.bean.CheckCodeResult; +import com.mango.core.module_hall.secretcode.bean.SecretCodeInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.utils.EmojiUtil; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.UIUtils; import java.util.concurrent.TimeUnit; @@ -136,7 +136,7 @@ public class PwdCodeMgr { return; } //获取复制的文本 - String copyText = com.yizhuan.xchat_android_core.utils. + String copyText = com.mango.core.utils. TextUtils.getClipboardFirstText(context); if (TextUtils.isEmpty(copyText)) { return; @@ -151,7 +151,7 @@ public class PwdCodeMgr { } //调用接口则清除粘贴板 //清除粘贴板，防止下次打开还调用 - com.yizhuan.xchat_android_core.utils.TextUtils.clearClipboard(context); + com.mango.core.utils.TextUtils.clearClipboard(context); //将我们接口的暗号串，传回服务器校验 //noinspection ResultOfMethodCallIgnored SecretCodeModel.get().checkCode(copyText) 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/mango/moshen/module_hall/secretcode/SecretCodeDialog.java similarity index 87% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/SecretCodeDialog.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/SecretCodeDialog.java index aa8bbf688..0d1b5b3c3 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/SecretCodeDialog.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/SecretCodeDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.secretcode; +package com.mango.moshen.module_hall.secretcode; import android.content.Context; import android.graphics.Color; @@ -6,13 +6,13 @@ import android.view.View; 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.xchat_android_core.module_hall.secretcode.bean.SecretCodeInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.TextUtils; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.base.BaseBsDialog; +import com.mango.core.module_hall.secretcode.bean.SecretCodeInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.TextUtils; import butterknife.BindView; import butterknife.OnClick; 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/mango/moshen/module_hall/secretcode/ShareSecretCodeDialog.java similarity index 92% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/ShareSecretCodeDialog.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/ShareSecretCodeDialog.java index a521c4493..5f52c64e9 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/ShareSecretCodeDialog.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/ShareSecretCodeDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.secretcode; +package com.mango.moshen.module_hall.secretcode; import android.content.Context; import androidx.annotation.NonNull; @@ -6,9 +6,9 @@ import android.view.View; import android.widget.TextView; import com.coorchice.library.SuperTextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBsDialog; -import com.yizhuan.xchat_android_library.utils.StringUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBsDialog; +import com.mango.xchat_android_library.utils.StringUtils; import butterknife.BindView; import butterknife.OnClick; 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/mango/moshen/module_hall/team/HTeamDataManager.java similarity index 89% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/HTeamDataManager.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/team/HTeamDataManager.java index 2b4a67d9f..1d85ac55a 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/HTeamDataManager.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/HTeamDataManager.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.module_hall.team; +package com.mango.moshen.module_hall.team; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; +import com.mango.core.module_hall.hall.bean.HTeamInfo; /** * 厅群信息的管理，只针对单个群信息 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/mango/moshen/module_hall/team/activity/CreateHallTeamActivity.java similarity index 87% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/CreateHallTeamActivity.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/team/activity/CreateHallTeamActivity.java index 1bfefd737..83b926082 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/mango/moshen/module_hall/team/activity/CreateHallTeamActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.team.activity; +package com.mango.moshen.module_hall.team.activity; import android.content.Context; import android.content.Intent; @@ -15,22 +15,22 @@ import android.widget.TextView; import com.coorchice.library.SuperTextView; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpTakePhotoActivity; -import com.yizhuan.erban.base.list.BaseViewHolder; -import com.yizhuan.erban.base.list.CommonAdapter; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.module_hall.team.presenter.CreateHallTeamPresenter; -import com.yizhuan.erban.module_hall.team.view.ICreateHallTeamView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.utils.KeyBoardUtils; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -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.widget.decoration.RowColumnDifItemDecoration; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpTakePhotoActivity; +import com.mango.moshen.base.list.BaseViewHolder; +import com.mango.moshen.base.list.CommonAdapter; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.module_hall.team.presenter.CreateHallTeamPresenter; +import com.mango.moshen.module_hall.team.view.ICreateHallTeamView; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.utils.KeyBoardUtils; +import com.mango.core.module_hall.hall.bean.MemberInfo; +import com.mango.core.module_hall.team.HTeamModel; +import com.mango.core.module_hall.team.bean.HTeamChatLimit; +import com.mango.core.module_hall.hall.bean.HTeamInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.widget.decoration.RowColumnDifItemDecoration; import java.util.ArrayList; import java.util.List; 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/mango/moshen/module_hall/team/activity/HTeamMemberListActivity.java similarity index 93% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HTeamMemberListActivity.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/team/activity/HTeamMemberListActivity.java index 261f8963f..394125a62 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/mango/moshen/module_hall/team/activity/HTeamMemberListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.team.activity; +package com.mango.moshen.module_hall.team.activity; import android.app.Activity; import android.content.Context; @@ -13,25 +13,25 @@ import android.widget.TextView; import com.netease.nim.uikit.business.ait.AitContactType; import com.netease.nim.uikit.business.ait.selector.AitContactSelectorActivity; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.avroom.widget.MessageView; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.base.TitleBar; -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.RefreshRecyclerView; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.module_hall.HallConstant; -import com.yizhuan.erban.module_hall.team.adapter.HTeamMemberListAdapter; -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.HteamMemberNumChangeEvent; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.avroom.widget.MessageView; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.base.list.BaseViewHolder; +import com.mango.moshen.base.list.CommonAdapter; +import com.mango.moshen.base.list.IRecyclerListener; +import com.mango.moshen.base.list.LineColorDecoration; +import com.mango.moshen.base.list.RefreshRecyclerView; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.module_hall.HallConstant; +import com.mango.moshen.module_hall.team.adapter.HTeamMemberListAdapter; +import com.mango.moshen.team.bean.NimTeamMember; +import com.mango.core.module_hall.hall.bean.HTeamInfo; +import com.mango.core.module_hall.hall.bean.HTeamMember; +import com.mango.core.module_hall.team.HTeamModel; +import com.mango.core.module_hall.team.event.HteamMemberNumChangeEvent; +import com.mango.core.utils.net.BeanObserver; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HallTeamMessageActivity.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/activity/HallTeamMessageActivity.java similarity index 91% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HallTeamMessageActivity.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/team/activity/HallTeamMessageActivity.java index df840ebee..6d381cefe 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HallTeamMessageActivity.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/activity/HallTeamMessageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.team.activity; +package com.mango.moshen.module_hall.team.activity; import android.content.Context; import android.content.Intent; @@ -26,22 +26,22 @@ import com.netease.nimlib.sdk.team.constant.TeamTypeEnum; import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.team.model.TeamMember; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.module_hall.team.HTeamDataManager; -import com.yizhuan.erban.module_hall.team.adapter.HTeamMemberListAdapter; -import com.yizhuan.erban.team.view.NimTeamManagementActivity; -import com.yizhuan.erban.team.view.NimTeamMessageFragment; -import com.yizhuan.erban.team.viewmodel.TeamVM; -import com.yizhuan.erban.ui.im.avtivity.BaseMessageActivity; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.team.bean.TeamEvent; -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.mango.moshen.R; +import com.mango.moshen.module_hall.team.HTeamDataManager; +import com.mango.moshen.module_hall.team.adapter.HTeamMemberListAdapter; +import com.mango.moshen.team.view.NimTeamManagementActivity; +import com.mango.moshen.team.view.NimTeamMessageFragment; +import com.mango.moshen.team.viewmodel.TeamVM; +import com.mango.moshen.ui.im.avtivity.BaseMessageActivity; +import com.mango.core.initial.InitialModel; +import com.mango.core.initial.bean.InitInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.module_hall.hall.bean.HTeamInfo; +import com.mango.core.module_hall.team.HTeamModel; +import com.mango.core.team.bean.TeamEvent; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.rxbus.RxBus; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; 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/mango/moshen/module_hall/team/activity/SelectTeamMemberActivity.java similarity index 88% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/SelectTeamMemberActivity.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/team/activity/SelectTeamMemberActivity.java index 957c55bb4..d056eb4ce 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/mango/moshen/module_hall/team/activity/SelectTeamMemberActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.team.activity; +package com.mango.moshen.module_hall.team.activity; import android.content.Context; import android.content.Intent; @@ -10,22 +10,22 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.base.TitleBar; -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.RefreshRecyclerView; -import com.yizhuan.erban.module_hall.HallConstant; -import com.yizhuan.erban.module_hall.HallDataManager; -import com.yizhuan.erban.module_hall.team.adapter.SelectTeamMemberAdapter; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.base.list.BaseViewHolder; +import com.mango.moshen.base.list.CommonAdapter; +import com.mango.moshen.base.list.IRecyclerListener; +import com.mango.moshen.base.list.LineColorDecoration; +import com.mango.moshen.base.list.RefreshRecyclerView; +import com.mango.moshen.module_hall.HallConstant; +import com.mango.moshen.module_hall.HallDataManager; +import com.mango.moshen.module_hall.team.adapter.SelectTeamMemberAdapter; +import com.mango.core.module_hall.hall.HallModel; +import com.mango.core.module_hall.hall.bean.ListMemberInfo; +import com.mango.core.module_hall.hall.bean.MemberInfo; +import com.mango.core.module_hall.team.HTeamModel; +import com.mango.core.utils.net.BeanObserver; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamEditActivity.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/activity/TeamEditActivity.java similarity index 86% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamEditActivity.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/team/activity/TeamEditActivity.java index 9b659126c..a1b371b1d 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamEditActivity.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/activity/TeamEditActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.module_hall.team.activity; +package com.mango.moshen.module_hall.team.activity; import android.content.Context; import android.content.Intent; @@ -6,25 +6,22 @@ import android.os.Bundle; import android.text.TextUtils; import android.view.Gravity; import android.view.View; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.common.widget.LimitEditText; -import com.yizhuan.erban.module_hall.HallConstant; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ViewUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.common.widget.LimitEditText; +import com.mango.moshen.module_hall.HallConstant; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.module_hall.hall.bean.HTeamInfo; +import com.mango.core.module_hall.team.HTeamModel; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.RxHelper; import butterknife.BindView; import butterknife.ButterKnife; -import io.reactivex.functions.Action; /** * 群公告，群名称编辑 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/mango/moshen/module_hall/team/activity/TeamInfoShowActivity.java similarity index 90% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamInfoShowActivity.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/team/activity/TeamInfoShowActivity.java index 8b2f0e3c3..5c6a09dd9 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/mango/moshen/module_hall/team/activity/TeamInfoShowActivity.java @@ -1,9 +1,8 @@ -package com.yizhuan.erban.module_hall.team.activity; +package com.mango.moshen.module_hall.team.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.core.content.ContextCompat; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; @@ -14,26 +13,26 @@ import android.widget.TextView; import com.coorchice.library.SuperTextView; import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper; import com.orhanobut.logger.Logger; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpTakePhotoActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.common.widget.TutuSwitchView; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.module_hall.team.adapter.HTeamMemberListAdapter; -import com.yizhuan.erban.module_hall.team.presenter.TeamInfoShowPresenter; -import com.yizhuan.erban.module_hall.team.view.ITeamInfoShowView; -import com.yizhuan.erban.module_hall.team.view.widget.GridMemberView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.ButtonItem; -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.hall.bean.RoleType; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -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.mango.moshen.R; +import com.mango.moshen.base.BaseMvpTakePhotoActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.common.widget.TutuSwitchView; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.module_hall.team.adapter.HTeamMemberListAdapter; +import com.mango.moshen.module_hall.team.presenter.TeamInfoShowPresenter; +import com.mango.moshen.module_hall.team.view.ITeamInfoShowView; +import com.mango.moshen.module_hall.team.view.widget.GridMemberView; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.core.module_hall.hall.bean.HTeamInfo; +import com.mango.core.module_hall.hall.bean.HTeamMember; +import com.mango.core.module_hall.hall.bean.RoleType; +import com.mango.core.module_hall.team.HTeamModel; +import com.mango.core.module_hall.team.bean.HTeamType; +import com.mango.core.module_hall.team.event.HteamInfoUpdateInfoEvent; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.base.factory.CreatePresenter; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/adapter/HTeamMemberListAdapter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/adapter/HTeamMemberListAdapter.java similarity index 90% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/adapter/HTeamMemberListAdapter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/team/adapter/HTeamMemberListAdapter.java index 38b3cd809..38bdc7a1b 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/adapter/HTeamMemberListAdapter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/adapter/HTeamMemberListAdapter.java @@ -1,15 +1,15 @@ -package com.yizhuan.erban.module_hall.team.adapter; +package com.mango.moshen.module_hall.team.adapter; import android.view.View; import android.widget.ImageView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.list.BaseViewHolder; -import com.yizhuan.erban.base.list.CommonAdapter; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.UserInfoView; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamMember; -import com.yizhuan.xchat_android_core.user.UserModel; +import com.mango.moshen.R; +import com.mango.moshen.base.list.BaseViewHolder; +import com.mango.moshen.base.list.CommonAdapter; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.UserInfoView; +import com.mango.core.module_hall.hall.bean.HTeamMember; +import com.mango.core.user.UserModel; /** * 厅群成员列表 diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/adapter/SelectTeamMemberAdapter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/adapter/SelectTeamMemberAdapter.java similarity index 72% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/adapter/SelectTeamMemberAdapter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/team/adapter/SelectTeamMemberAdapter.java index db0d12e2c..6e3e7ae40 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/adapter/SelectTeamMemberAdapter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/adapter/SelectTeamMemberAdapter.java @@ -1,17 +1,16 @@ -package com.yizhuan.erban.module_hall.team.adapter; +package com.mango.moshen.module_hall.team.adapter; import android.view.View; import android.widget.ImageView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.list.BaseViewHolder; -import com.yizhuan.erban.base.list.CommonAdapter; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.UserInfoView; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.RoleType; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.base.list.BaseViewHolder; +import com.mango.moshen.base.list.CommonAdapter; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.UserInfoView; +import com.mango.core.module_hall.hall.bean.MemberInfo; +import com.mango.core.module_hall.hall.bean.RoleType; +import com.mango.core.user.UserModel; /** * 选择厅成员 diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/presenter/CreateHallTeamPresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/presenter/CreateHallTeamPresenter.java similarity index 69% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/presenter/CreateHallTeamPresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/team/presenter/CreateHallTeamPresenter.java index 7195a0b9e..3a3dcd772 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/presenter/CreateHallTeamPresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/presenter/CreateHallTeamPresenter.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.module_hall.team.presenter; +package com.mango.moshen.module_hall.team.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.HallDataManager; -import com.yizhuan.erban.module_hall.team.view.ICreateHallTeamView; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.base.PresenterEvent; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.HallDataManager; +import com.mango.moshen.module_hall.team.view.ICreateHallTeamView; +import com.mango.core.module_hall.hall.bean.MemberInfo; +import com.mango.core.module_hall.team.HTeamModel; +import com.mango.core.module_hall.hall.bean.HTeamInfo; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.base.PresenterEvent; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/presenter/TeamInfoShowPresenter.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/presenter/TeamInfoShowPresenter.java similarity index 78% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/presenter/TeamInfoShowPresenter.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/team/presenter/TeamInfoShowPresenter.java index 45d29c4d9..7d0492f17 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/presenter/TeamInfoShowPresenter.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/presenter/TeamInfoShowPresenter.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.module_hall.team.presenter; +package com.mango.moshen.module_hall.team.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.team.view.ITeamInfoShowView; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.base.PresenterEvent; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.module_hall.team.view.ITeamInfoShowView; +import com.mango.core.module_hall.team.HTeamModel; +import com.mango.core.module_hall.hall.bean.HTeamInfo; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.base.PresenterEvent; /** * diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/ICreateHallTeamView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/view/ICreateHallTeamView.java similarity index 53% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/ICreateHallTeamView.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/team/view/ICreateHallTeamView.java index a05486f70..cdf39e182 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/ICreateHallTeamView.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/view/ICreateHallTeamView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.module_hall.team.view; +package com.mango.moshen.module_hall.team.view; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.module_hall.hall.bean.HTeamInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/ITeamInfoShowView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/view/ITeamInfoShowView.java similarity index 62% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/ITeamInfoShowView.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/team/view/ITeamInfoShowView.java index cdebd0cf4..9672555f1 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/ITeamInfoShowView.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/view/ITeamInfoShowView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.module_hall.team.view; +package com.mango.moshen.module_hall.team.view; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.module_hall.hall.bean.HTeamInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * Created by lvzebiao on 2019/1/3. diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/widget/GridMemberView.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/view/widget/GridMemberView.java similarity index 79% rename from app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/widget/GridMemberView.java rename to app/src/module_labour_union/java/com/mango/moshen/module_hall/team/view/widget/GridMemberView.java index ce4ce1d70..d61534a08 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/widget/GridMemberView.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/team/view/widget/GridMemberView.java @@ -1,17 +1,13 @@ -package com.yizhuan.erban.module_hall.team.view.widget; +package com.mango.moshen.module_hall.team.view.widget; import android.content.Context; import android.util.AttributeSet; -import android.view.ViewGroup; -import android.widget.ImageView; import com.google.android.flexbox.FlexboxLayout; -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.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.UIUtils; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AddMemberPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AddMemberPresenter.java deleted file mode 100644 index 68a7bcfd0..000000000 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AddMemberPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.erban.module_hall.hall.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.hall.view.IAddMemberView; - -public class AddMemberPresenter extends BaseMvpPresenter { -} diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAddMemberView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAddMemberView.java deleted file mode 100644 index 450620322..000000000 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAddMemberView.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.erban.module_hall.hall.view; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface IAddMemberView extends IMvpBaseView { -} diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IClanIncomeView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IClanIncomeView.java deleted file mode 100644 index 203b9ecb9..000000000 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IClanIncomeView.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.yizhuan.erban.module_hall.income.view; - -import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface IClanIncomeView extends IMvpBaseView { - - void incomeTotalSuccess(ClanTotalIncomeInfo clanTotalIncomeInfo); - void incomeTotalFail(String message); -} diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeStatisticsView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeStatisticsView.java deleted file mode 100644 index 2237821ae..000000000 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeStatisticsView.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.erban.module_hall.income.view; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface IIncomeStatisticsView extends IMvpBaseView { -} diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeView.java deleted file mode 100644 index 03f118ff4..000000000 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeView.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.yizhuan.erban.module_hall.income.view; - -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeTotalInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface IIncomeView extends IMvpBaseView { - - void incomeTotalSuccess(IncomeTotalInfo incomeTotalInfo); - void incomeTotalFail(String message); -} diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ISingRoomIncomeView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ISingRoomIncomeView.java deleted file mode 100644 index 0d9938380..000000000 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ISingRoomIncomeView.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.yizhuan.erban.module_hall.income.view; - -import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface ISingRoomIncomeView extends IMvpBaseView { - - void incomeTotalSuccess(SingleRoomTotalIncomeInfo incomeInfo); - void incomeTotalFail(String message); -} 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 ba01f87b4..0e0f28102 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 @@ -61,7 +61,7 @@ - - + \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/activity_admin_add.xml b/app/src/module_labour_union/res/layout/activity_admin_add.xml index e8c60f0d0..3f6d54aef 100644 --- a/app/src/module_labour_union/res/layout/activity_admin_add.xml +++ b/app/src/module_labour_union/res/layout/activity_admin_add.xml @@ -5,13 +5,13 @@ android:orientation="vertical" android:background="@color/bg_normal_1c1b22"> - - + - @@ -43,6 +43,6 @@ - + \ No newline at end of file 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 0557ef144..382033993 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 @@ -5,15 +5,15 @@ android:background="@color/bg_normal_1c1b22" android:orientation="vertical"> - - + - @@ -30,6 +30,6 @@ - + \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/activity_auth_setting.xml b/app/src/module_labour_union/res/layout/activity_auth_setting.xml index 70851a481..cb94aefa3 100644 --- a/app/src/module_labour_union/res/layout/activity_auth_setting.xml +++ b/app/src/module_labour_union/res/layout/activity_auth_setting.xml @@ -5,13 +5,13 @@ android:layout_height="match_parent" android:background="@color/bg_normal_1c1b22"> - - + - - + - - @@ -25,7 +25,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="@+id/iv_team_icon" /> - - - - @@ -62,6 +62,6 @@ - + \ No newline at end of file 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 20c0eb288..b8bdb8f18 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 @@ -5,14 +5,14 @@ android:layout_height="match_parent" android:background="@color/bg_normal_1c1b22"> - - + - - - + - - + - - + \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/activity_income_detail.xml b/app/src/module_labour_union/res/layout/activity_income_detail.xml index b1430461e..7937748d3 100644 --- a/app/src/module_labour_union/res/layout/activity_income_detail.xml +++ b/app/src/module_labour_union/res/layout/activity_income_detail.xml @@ -5,7 +5,7 @@ android:background="@color/bg_normal_1c1b22" android:orientation="vertical"> - - - + - + tools:context="com.mango.moshen.module_hall.hall.activity.ModuleHallActivity"> + tools:context="com.mango.moshen.module_hall.hall.activity.ModuleHallActivity"> - + tools:context="com.mango.moshen.module_hall.hall.activity.ModuleHallActivity"> + tools:context="com.mango.moshen.module_hall.hall.activity.ModuleHallActivity"> - @@ -33,7 +33,7 @@ android:layout_height="match_parent" android:scaleType="centerCrop" /> - + - - - @@ -71,6 +71,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/activity_select_group_member.xml b/app/src/module_labour_union/res/layout/activity_select_group_member.xml index 22f9c2827..1de7a425c 100644 --- a/app/src/module_labour_union/res/layout/activity_select_group_member.xml +++ b/app/src/module_labour_union/res/layout/activity_select_group_member.xml @@ -5,7 +5,7 @@ android:orientation="vertical" xmlns:tools="http://schemas.android.com/tools"> - @@ -22,7 +22,7 @@ android:layout_height="@dimen/dp_30" tools:text="已选择人数 : 5人" /> - diff --git a/app/src/module_labour_union/res/layout/activity_single_room_income.xml b/app/src/module_labour_union/res/layout/activity_single_room_income.xml index 3c12e9b7c..547527352 100644 --- a/app/src/module_labour_union/res/layout/activity_single_room_income.xml +++ b/app/src/module_labour_union/res/layout/activity_single_room_income.xml @@ -6,15 +6,15 @@ android:background="@color/white" android:orientation="vertical"> - - + - - - - - + - - @@ -82,7 +82,7 @@ android:layout_height="0dp" android:layout_weight="1" /> - - - - - - - - - - - - + - - + - @@ -9,4 +9,4 @@ 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_labour_union/res/layout/item_auth_setting.xml b/app/src/module_labour_union/res/layout/item_auth_setting.xml index 415652b9c..4f51f296b 100644 --- a/app/src/module_labour_union/res/layout/item_auth_setting.xml +++ b/app/src/module_labour_union/res/layout/item_auth_setting.xml @@ -29,7 +29,7 @@ - - - - \ 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..193c4cf08 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 @@ -5,7 +5,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> - - - + type="com.mango.core.user.bean.LiveTagInfo.LiveSkillVoListBean" /> - - - - - - { diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/adapter/ResultMarqueeAdapter.java b/app/src/module_mentoring_relationship/java/com/mango/moshen/mentoring_relationship/adapter/ResultMarqueeAdapter.java similarity index 89% rename from app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/adapter/ResultMarqueeAdapter.java rename to app/src/module_mentoring_relationship/java/com/mango/moshen/mentoring_relationship/adapter/ResultMarqueeAdapter.java index ce1778e43..1289a3169 100644 --- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/adapter/ResultMarqueeAdapter.java +++ b/app/src/module_mentoring_relationship/java/com/mango/moshen/mentoring_relationship/adapter/ResultMarqueeAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.mentoring_relationship.adapter; +package com.mango.moshen.mentoring_relationship.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -6,9 +6,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.marqueeview.BetterMarqueeView; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringResultMarqueeInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.marqueeview.BetterMarqueeView; +import com.mango.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; import java.util.ArrayList; import java.util.List; 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/mango/moshen/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java similarity index 91% rename from app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java rename to app/src/module_mentoring_relationship/java/com/mango/moshen/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java index 9eac13119..1e34cf602 100644 --- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java +++ b/app/src/module_mentoring_relationship/java/com/mango/moshen/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.mentoring_relationship.dialog; +package com.mango.moshen.mentoring_relationship.dialog; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -13,8 +13,8 @@ import android.view.View; import android.view.ViewGroup; import android.view.Window; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; public class BuildMentoringRelationshipSuccessDialog extends DialogFragment { 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/mango/moshen/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java similarity index 90% rename from app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java rename to app/src/module_mentoring_relationship/java/com/mango/moshen/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java index 3a408bcb3..0fb0a6f1e 100644 --- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java +++ b/app/src/module_mentoring_relationship/java/com/mango/moshen/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.mentoring_relationship.dialog; +package com.mango.moshen.mentoring_relationship.dialog; import android.annotation.SuppressLint; import android.app.Dialog; @@ -21,13 +21,13 @@ import android.widget.ImageView; import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.MainActivity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.common.permission.StatusBarCompat; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; +import com.mango.moshen.MainActivity; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.common.permission.StatusBarCompat; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; import java.util.concurrent.TimeUnit; 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/mango/moshen/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java similarity index 92% rename from app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java rename to app/src/module_mentoring_relationship/java/com/mango/moshen/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java index 64bc4d188..574f998c4 100644 --- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java +++ b/app/src/module_mentoring_relationship/java/com/mango/moshen/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.mentoring_relationship.dialog; +package com.mango.moshen.mentoring_relationship.dialog; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -13,8 +13,8 @@ import android.view.View; import android.view.ViewGroup; import android.view.Window; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; public class ReleaseMentoringRelationshipSuccessDialog extends DialogFragment implements View.OnClickListener { diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/presenter/MentoringRelationshipPresenter.java b/app/src/module_mentoring_relationship/java/com/mango/moshen/mentoring_relationship/presenter/MentoringRelationshipPresenter.java similarity index 89% rename from app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/presenter/MentoringRelationshipPresenter.java rename to app/src/module_mentoring_relationship/java/com/mango/moshen/mentoring_relationship/presenter/MentoringRelationshipPresenter.java index 24085292a..51b5e6429 100644 --- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/presenter/MentoringRelationshipPresenter.java +++ b/app/src/module_mentoring_relationship/java/com/mango/moshen/mentoring_relationship/presenter/MentoringRelationshipPresenter.java @@ -1,15 +1,15 @@ -package com.yizhuan.tutu.mentoring_relationship.presenter; +package com.mango.moshen.mentoring_relationship.presenter; import android.annotation.SuppressLint; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringRankingDataInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.model.MentoringRelationshipModel; -import com.yizhuan.xchat_android_core.mentoring_relationship.view.IMentoringRelationshipView; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.Constants; +import com.mango.core.exception.FailReasonException; +import com.mango.core.mentoring_relationship.bean.MentoringRankingDataInfo; +import com.mango.core.mentoring_relationship.model.MentoringRelationshipModel; +import com.mango.core.mentoring_relationship.view.IMentoringRelationshipView; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.concurrent.atomic.AtomicInteger; 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..d4ba85b45 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 @@ -55,7 +55,7 @@ android:paddingStart="@dimen/dp_15" android:paddingEnd="@dimen/dp_15"> - - - + - - - - - + \ No newline at end of file diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/AllTopicActivity.java similarity index 81% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/AllTopicActivity.java index c186ea874..59e8a34ba 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/AllTopicActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.activity; +package com.mango.moshen.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -10,24 +10,24 @@ import androidx.viewpager.widget.ViewPager; import android.view.View; import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.miniworld.fragment.MiniWorldCategoryFragment; -import com.yizhuan.erban.miniworld.presenter.MiniWorldPresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldView; -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.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.erban.ui.widget.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.RoomContributeListAdapter; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.miniworld.fragment.MiniWorldCategoryFragment; +import com.mango.moshen.miniworld.presenter.MiniWorldPresenter; +import com.mango.moshen.miniworld.view.IMiniWorldView; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView; +import com.mango.core.miniworld.bean.MiniWorldCategoryInfo; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/AudioPartyDialog.java similarity index 91% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/AudioPartyDialog.java index 24e2777bf..848f3a1a7 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/AudioPartyDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.activity; +package com.mango.moshen.miniworld.activity; import android.app.Activity; import android.app.Dialog; @@ -19,20 +19,20 @@ import android.widget.ImageView; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.miniworld.adapter.AudioPartyAdapter; -import com.yizhuan.erban.miniworld.presenter.AudioPartyDialogPresenter; -import com.yizhuan.erban.miniworld.view.IAudioPartyDialogView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyItem; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldHelper; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.miniworld.adapter.AudioPartyAdapter; +import com.mango.moshen.miniworld.presenter.AudioPartyDialogPresenter; +import com.mango.moshen.miniworld.view.IAudioPartyDialogView; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.miniworld.bean.AudioPartyInfo; +import com.mango.core.miniworld.bean.AudioPartyItem; +import com.mango.core.miniworld.model.MiniWorldHelper; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MWTeamRoomMessageAct.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MWTeamRoomMessageAct.java similarity index 91% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MWTeamRoomMessageAct.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MWTeamRoomMessageAct.java index 2a5128c6b..2a30a9263 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MWTeamRoomMessageAct.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MWTeamRoomMessageAct.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.activity; +package com.mango.moshen.miniworld.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -9,7 +9,6 @@ import android.util.Log; import android.view.View; import android.view.ViewStub; import android.widget.ImageView; -import android.widget.RelativeLayout; import android.widget.TextView; import com.netease.nim.uikit.api.NimUIKit; @@ -30,54 +29,52 @@ import com.netease.nimlib.sdk.team.constant.TeamTypeEnum; import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.team.model.TeamMember; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.ButtonItemFactory; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.avroom.widget.EditRoomTitleDialog; -import com.yizhuan.erban.avroom.widget.ViewItem; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.home.presenter.MainFragmentPresenter; -import com.yizhuan.erban.miniworld.presenter.MWTeamMessagePresenter; -import com.yizhuan.erban.miniworld.view.IMWTeamMessageView; -import com.yizhuan.erban.team.view.NimTeamMessageFragment; -import com.yizhuan.erban.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper; -import com.yizhuan.erban.ui.im.avtivity.BaseMessageActivity; -import com.yizhuan.erban.ui.widget.GiftDialog; -import com.yizhuan.erban.ui.widget.UserInfoDialog; -import com.yizhuan.erban.ui.widget.dialog.OpenNobleDialog; -import com.yizhuan.erban.utils.CertificateHelper; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.toolbox.GiftToolbox; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.OpenAudioPartyAttachment; -import com.yizhuan.xchat_android_core.miniworld.event.MWChatTopicEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MWGroupChatMemberEvent; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldHelper; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; -import com.yizhuan.xchat_android_library.rxbus.RxBus; +import com.mango.moshen.R; +import com.mango.moshen.avroom.ButtonItemFactory; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.avroom.widget.EditRoomTitleDialog; +import com.mango.moshen.avroom.widget.ViewItem; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.home.presenter.MainFragmentPresenter; +import com.mango.moshen.miniworld.presenter.MWTeamMessagePresenter; +import com.mango.moshen.miniworld.view.IMWTeamMessageView; +import com.mango.moshen.team.view.NimTeamMessageFragment; +import com.mango.moshen.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper; +import com.mango.moshen.ui.im.avtivity.BaseMessageActivity; +import com.mango.moshen.ui.widget.GiftDialog; +import com.mango.moshen.ui.widget.UserInfoDialog; +import com.mango.moshen.ui.widget.dialog.OpenNobleDialog; +import com.mango.moshen.utils.CertificateHelper; +import com.mango.core.auth.AuthModel; +import com.mango.core.gift.GiftModel; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.toolbox.GiftToolbox; +import com.mango.core.initial.InitialModel; +import com.mango.core.initial.bean.InitInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.miniworld.bean.MWChatInfo; +import com.mango.core.miniworld.bean.OpenAudioPartyAttachment; +import com.mango.core.miniworld.event.MWChatTopicEvent; +import com.mango.core.miniworld.model.MiniWorldHelper; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.room.model.RoomSettingModel; +import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.team.bean.TeamEvent; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.ActivityUtil; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.xchat_android_library.rxbus.RxBus; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import butterknife.BindView; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldActivity.java similarity index 83% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldActivity.java index 62aa1e36c..4cc5516a4 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.activity; +package com.mango.moshen.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -9,24 +9,24 @@ import androidx.viewpager.widget.ViewPager; import android.os.Bundle; import android.view.View; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.miniworld.fragment.MiniWorldCategoryFragment; -import com.yizhuan.erban.miniworld.presenter.MiniWorldPresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldView; -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.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.erban.ui.widget.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.avroom.adapter.RoomContributeListAdapter; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.miniworld.fragment.MiniWorldCategoryFragment; +import com.mango.moshen.miniworld.presenter.MiniWorldPresenter; +import com.mango.moshen.miniworld.view.IMiniWorldView; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView; +import com.mango.core.miniworld.bean.MiniWorldCategoryInfo; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldEditActivity.java similarity index 94% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldEditActivity.java index 78a012b6a..eb9ad51e5 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldEditActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.activity; +package com.mango.moshen.miniworld.activity; import android.Manifest; import android.app.Activity; @@ -17,20 +17,20 @@ import android.widget.TextView; import com.jph.takephoto.model.TResult; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.ErbanTakePhotoActivity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.miniworld.presenter.MiniWorldEditPresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldEditView; -import com.yizhuan.erban.miniworld.viewmodel.MiniWorldEditableInfoVM; -import com.yizhuan.erban.miniworld.widget.MiniWorldEditChooseClassifyDialog; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_core.file.FileModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; +import com.mango.moshen.ErbanTakePhotoActivity; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.miniworld.presenter.MiniWorldEditPresenter; +import com.mango.moshen.miniworld.view.IMiniWorldEditView; +import com.mango.moshen.miniworld.viewmodel.MiniWorldEditableInfoVM; +import com.mango.moshen.miniworld.widget.MiniWorldEditChooseClassifyDialog; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.core.file.FileModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.base.factory.CreatePresenter; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGroupThemeActivity.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldGroupThemeActivity.java similarity index 87% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGroupThemeActivity.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldGroupThemeActivity.java index 3205c1150..b6f0760b4 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGroupThemeActivity.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldGroupThemeActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.activity; +package com.mango.moshen.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -9,15 +9,15 @@ import android.text.TextWatcher; import android.widget.EditText; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.miniworld.presenter.MWThemePresenter; -import com.yizhuan.erban.miniworld.view.IMWThemeView; -import com.yizhuan.xchat_android_core.miniworld.bean.TopicInfo; -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; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.miniworld.presenter.MWThemePresenter; +import com.mango.moshen.miniworld.view.IMWThemeView; +import com.mango.core.miniworld.bean.TopicInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.base.factory.CreatePresenter; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldGuestPageActivity.java similarity index 92% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldGuestPageActivity.java index 78cd6ae36..4cc4c024b 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldGuestPageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.activity; +package com.mango.moshen.miniworld.activity; import android.app.Activity; import android.content.Context; @@ -9,7 +9,6 @@ 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; @@ -35,55 +34,55 @@ import com.netease.nimlib.sdk.msg.MsgService; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.community.dynamic.view.WorldDynamicFragment; -import com.yizhuan.erban.community.publish.view.PublishActivity; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.miniworld.adapter.GuestAudioPartyAdapter; -import com.yizhuan.erban.miniworld.fragment.MiniWorldNoticeFrg; -import com.yizhuan.erban.miniworld.presenter.MiniWorldGuestPagePresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldGuestPage; -import com.yizhuan.erban.miniworld.viewmodel.MiniWorldDetailInfoVM; -import com.yizhuan.erban.miniworld.viewmodel.MiniWorldEditableInfoVM; -import com.yizhuan.erban.miniworld.widget.MWMagicIndicator; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.ShareDialog; -import com.yizhuan.erban.ui.widget.higuide.TuTuGuideHelper; -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.xchat_android_constants.XChatConstants; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.VerticalDecoration; -import com.yizhuan.erban.utils.AppBarStateChangeListener; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldJoinVerifiedEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldStateChangedEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldTeamExitEvent; -import com.yizhuan.xchat_android_core.miniworld.event.OpenedMyMiniWorldEvent; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.share.ShareModel; -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.utils.ActivityUtil; -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.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.base.TitleBar; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.community.dynamic.view.WorldDynamicFragment; +import com.mango.moshen.community.publish.view.PublishActivity; +import com.mango.moshen.friend.view.SelectFriendActivity; +import com.mango.moshen.miniworld.adapter.GuestAudioPartyAdapter; +import com.mango.moshen.miniworld.fragment.MiniWorldNoticeFrg; +import com.mango.moshen.miniworld.presenter.MiniWorldGuestPagePresenter; +import com.mango.moshen.miniworld.view.IMiniWorldGuestPage; +import com.mango.moshen.miniworld.viewmodel.MiniWorldDetailInfoVM; +import com.mango.moshen.miniworld.viewmodel.MiniWorldEditableInfoVM; +import com.mango.moshen.miniworld.widget.MWMagicIndicator; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.webview.CommonWebViewActivity; +import com.mango.moshen.ui.widget.ShareDialog; +import com.mango.moshen.ui.widget.higuide.TuTuGuideHelper; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.moshen.ui.widget.recyclerview.decoration.VerticalDecoration; +import com.mango.moshen.utils.AppBarStateChangeListener; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.home.bean.TabInfo; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.miniworld.bean.AudioPartyInfo; +import com.mango.core.miniworld.bean.MiniWorldDetailInfo; +import com.mango.core.miniworld.event.MiniWorldJoinVerifiedEvent; +import com.mango.core.miniworld.event.MiniWorldStateChangedEvent; +import com.mango.core.miniworld.event.MiniWorldTeamExitEvent; +import com.mango.core.miniworld.event.OpenedMyMiniWorldEvent; +import com.mango.core.miniworld.model.MiniWorldModel; +import com.mango.core.share.ShareModel; +import com.mango.core.share.bean.SessionType; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.ActivityUtil; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.SizeUtils; import com.zyyoona7.lib.EasyPopup; import com.zyyoona7.lib.HorizontalGravity; import com.zyyoona7.lib.VerticalGravity; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldMainActivity.java similarity index 88% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldMainActivity.java index a73592123..fe056b7ca 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldMainActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.activity; +package com.mango.moshen.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -15,30 +15,30 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView; -import com.yizhuan.erban.ui.widget.rollviewpager.Util; -import com.yizhuan.erban.ui.widget.rollviewpager.hintview.ColorPointHintView; +import com.mango.moshen.ui.widget.rollviewpager.RollPagerView; +import com.mango.moshen.ui.widget.rollviewpager.Util; +import com.mango.moshen.ui.widget.rollviewpager.hintview.ColorPointHintView; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.home.adapter.BannerAdapter; -import com.yizhuan.erban.miniworld.adapter.MiniWorldMainAdapter; -import com.yizhuan.erban.miniworld.listener.DoubleClickCheckListener; -import com.yizhuan.erban.miniworld.presenter.MiniWorldMainPresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldMainView; -import com.yizhuan.erban.ui.widget.higuide.TuTuGuideHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldStateChangedEvent; -import com.yizhuan.xchat_android_core.miniworld.event.OpenedMyMiniWorldEvent; -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; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.home.adapter.BannerAdapter; +import com.mango.moshen.miniworld.adapter.MiniWorldMainAdapter; +import com.mango.moshen.miniworld.listener.DoubleClickCheckListener; +import com.mango.moshen.miniworld.presenter.MiniWorldMainPresenter; +import com.mango.moshen.miniworld.view.IMiniWorldMainView; +import com.mango.moshen.ui.widget.higuide.TuTuGuideHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.home.bean.BannerInfo; +import com.mango.core.miniworld.bean.MiniWorldCategoryInfo; +import com.mango.core.miniworld.bean.MiniWorldInfo; +import com.mango.core.miniworld.bean.MiniWorldMainItemInfo; +import com.mango.core.miniworld.event.MiniWorldStateChangedEvent; +import com.mango.core.miniworld.event.OpenedMyMiniWorldEvent; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SizeUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldMemberListActivity.java similarity index 90% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldMemberListActivity.java index 4db8fd5a7..f19586aad 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldMemberListActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.activity; +package com.mango.moshen.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -13,20 +13,20 @@ import android.util.Log; import android.widget.EditText; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.miniworld.adapter.MiniWorldMemberListAdapter; -import com.yizhuan.erban.miniworld.presenter.MiniWorldMemberListPresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldMemberListView; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListMemberInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -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; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.miniworld.adapter.MiniWorldMemberListAdapter; +import com.mango.moshen.miniworld.presenter.MiniWorldMemberListPresenter; +import com.mango.moshen.miniworld.view.IMiniWorldMemberListView; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.miniworld.bean.MiniWorldMemberListMemberInfo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldSearchActivity.java similarity index 90% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldSearchActivity.java index 320cd534e..e3c63f3e8 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldSearchActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.activity; +package com.mango.moshen.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -19,19 +19,19 @@ import android.widget.ImageView; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.miniworld.adapter.MiniWorldListAdapter; -import com.yizhuan.erban.miniworld.listener.DoubleClickCheckListener; -import com.yizhuan.erban.miniworld.presenter.MiniWorldSearchPresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldSearchView; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -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; -import com.yizhuan.xchat_android_library.utils.ImeUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.miniworld.adapter.MiniWorldListAdapter; +import com.mango.moshen.miniworld.listener.DoubleClickCheckListener; +import com.mango.moshen.miniworld.presenter.MiniWorldSearchPresenter; +import com.mango.moshen.miniworld.view.IMiniWorldSearchView; +import com.mango.core.miniworld.bean.MiniWorldInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ImeUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.SizeUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldTeamMessageActivity.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldTeamMessageActivity.java similarity index 91% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldTeamMessageActivity.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldTeamMessageActivity.java index 9aaeda59a..4da9eb6d7 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldTeamMessageActivity.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/MiniWorldTeamMessageActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.activity; +package com.mango.moshen.miniworld.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -32,64 +32,63 @@ import com.netease.nimlib.sdk.team.constant.TeamTypeEnum; import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.team.model.TeamMember; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.ButtonItemFactory; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.avroom.widget.EditRoomTitleDialog; -import com.yizhuan.erban.avroom.widget.ViewItem; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.home.presenter.MainFragmentPresenter; -import com.yizhuan.erban.miniworld.presenter.MWTeamMessagePresenter; -import com.yizhuan.erban.miniworld.view.IMWTeamMessageView; -import com.yizhuan.erban.team.view.NimTeamMessageFragment; -import com.yizhuan.erban.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper; -import com.yizhuan.erban.ui.im.avtivity.BaseMessageActivity; -import com.yizhuan.erban.ui.patriarch.help.LimitEnterRoomHelper; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.erban.ui.widget.GiftDialog; -import com.yizhuan.erban.ui.widget.UserInfoDialog; -import com.yizhuan.erban.ui.widget.dialog.OpenNobleDialog; -import com.yizhuan.erban.utils.CertificateHelper; -import com.yizhuan.xchat_android_core.auth.AuthModel; -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; -import com.yizhuan.xchat_android_core.gift.toolbox.GiftToolbox; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.OpenAudioPartyAttachment; -import com.yizhuan.xchat_android_core.miniworld.event.AudioPartyOpenEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MWChatTopicEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MWGroupChatMemberEvent; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldHelper; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldTeamExitEvent; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.team.bean.TeamEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -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.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.avroom.ButtonItemFactory; +import com.mango.moshen.avroom.activity.AVRoomActivity; +import com.mango.moshen.avroom.widget.EditRoomTitleDialog; +import com.mango.moshen.avroom.widget.ViewItem; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.moshen.home.presenter.MainFragmentPresenter; +import com.mango.moshen.miniworld.presenter.MWTeamMessagePresenter; +import com.mango.moshen.miniworld.view.IMWTeamMessageView; +import com.mango.moshen.team.view.NimTeamMessageFragment; +import com.mango.moshen.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper; +import com.mango.moshen.ui.im.avtivity.BaseMessageActivity; +import com.mango.moshen.ui.patriarch.help.LimitEnterRoomHelper; +import com.mango.moshen.ui.widget.ButtonItem; +import com.mango.moshen.ui.widget.GiftDialog; +import com.mango.moshen.ui.widget.UserInfoDialog; +import com.mango.moshen.ui.widget.dialog.OpenNobleDialog; +import com.mango.moshen.utils.CertificateHelper; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.gift.GiftModel; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.toolbox.GiftToolbox; +import com.mango.core.initial.InitialModel; +import com.mango.core.initial.bean.InitInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.miniworld.bean.MWChatInfo; +import com.mango.core.miniworld.bean.OpenAudioPartyAttachment; +import com.mango.core.miniworld.event.AudioPartyOpenEvent; +import com.mango.core.miniworld.event.MWChatTopicEvent; +import com.mango.core.miniworld.event.MWGroupChatMemberEvent; +import com.mango.core.miniworld.model.MiniWorldHelper; +import com.mango.core.miniworld.event.MiniWorldTeamExitEvent; +import com.mango.core.miniworld.model.MiniWorldModel; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.room.model.RoomSettingModel; +import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.team.bean.TeamEvent; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.ActivityUtil; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import butterknife.BindView; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/TopicMainActivity.java similarity index 91% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/TopicMainActivity.java index fcb972f92..523eb004a 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/activity/TopicMainActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.activity; +package com.mango.moshen.miniworld.activity; import android.content.Context; import android.content.Intent; @@ -26,42 +26,42 @@ import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.CollapsingToolbarLayout; import com.netease.nim.uikit.StatusBarUtil; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.community.dynamic.view.WorldDynamicFragment; -import com.yizhuan.erban.community.publish.view.PublishActivity; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.miniworld.presenter.MiniWorldGuestPagePresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldGuestPage; -import com.yizhuan.erban.miniworld.viewmodel.MiniWorldDetailInfoVM; -import com.yizhuan.erban.miniworld.viewmodel.MiniWorldEditableInfoVM; -import com.yizhuan.erban.miniworld.widget.MWMagicIndicator; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.ShareDialog; -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_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldJoinVerifiedEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldStateChangedEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldTeamExitEvent; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.share.ShareModel; -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.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.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.community.dynamic.view.WorldDynamicFragment; +import com.mango.moshen.community.publish.view.PublishActivity; +import com.mango.moshen.friend.view.SelectFriendActivity; +import com.mango.moshen.miniworld.presenter.MiniWorldGuestPagePresenter; +import com.mango.moshen.miniworld.view.IMiniWorldGuestPage; +import com.mango.moshen.miniworld.viewmodel.MiniWorldDetailInfoVM; +import com.mango.moshen.miniworld.viewmodel.MiniWorldEditableInfoVM; +import com.mango.moshen.miniworld.widget.MWMagicIndicator; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.widget.ShareDialog; +import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; +import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.auth.AuthModel; +import com.mango.core.home.bean.TabInfo; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.miniworld.bean.AudioPartyInfo; +import com.mango.core.miniworld.bean.MiniWorldDetailInfo; +import com.mango.core.miniworld.event.MiniWorldJoinVerifiedEvent; +import com.mango.core.miniworld.event.MiniWorldStateChangedEvent; +import com.mango.core.miniworld.event.MiniWorldTeamExitEvent; +import com.mango.core.miniworld.model.MiniWorldModel; +import com.mango.core.share.ShareModel; +import com.mango.core.share.bean.SessionType; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; import com.zyyoona7.lib.EasyPopup; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AllTopicListAdapter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/AllTopicListAdapter.java similarity index 83% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AllTopicListAdapter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/AllTopicListAdapter.java index 80d63402c..d2ebcb3a1 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AllTopicListAdapter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/AllTopicListAdapter.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.miniworld.adapter; +package com.mango.moshen.miniworld.adapter; import androidx.annotation.Nullable; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; +import com.mango.moshen.R; +import com.mango.core.miniworld.bean.MiniWorldInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/AudioPartyAdapter.java similarity index 91% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/AudioPartyAdapter.java index ab337c637..75686f4db 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/AudioPartyAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.adapter; +package com.mango.moshen.miniworld.adapter; import android.content.Context; import androidx.core.content.ContextCompat; @@ -6,10 +6,10 @@ import android.widget.ImageView; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyItem; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.miniworld.bean.AudioPartyInfo; +import com.mango.core.miniworld.bean.AudioPartyItem; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/GuestAudioPartyAdapter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/GuestAudioPartyAdapter.java similarity index 72% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/GuestAudioPartyAdapter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/GuestAudioPartyAdapter.java index 4887d1df9..13e339c35 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/GuestAudioPartyAdapter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/GuestAudioPartyAdapter.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.miniworld.adapter; +package com.mango.moshen.miniworld.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.utils.ImageLoadUtilsV2; +import com.mango.core.miniworld.bean.AudioPartyInfo; public class GuestAudioPartyAdapter extends BaseQuickAdapter { diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/MiniWorldEditClassifyAdapter.java similarity index 89% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/MiniWorldEditClassifyAdapter.java index 5cd9ab17d..1abec6f1a 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/MiniWorldEditClassifyAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.adapter; +package com.mango.moshen.miniworld.adapter; import android.content.Context; import androidx.annotation.NonNull; @@ -9,9 +9,9 @@ import android.widget.ImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldEditClassifyInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.miniworld.bean.MiniWorldEditClassifyInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/MiniWorldListAdapter.java similarity index 90% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/MiniWorldListAdapter.java index fd167106b..ce786a5ba 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/MiniWorldListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.adapter; +package com.mango.moshen.miniworld.adapter; import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; @@ -8,10 +8,10 @@ import android.widget.ImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.miniworld.bean.MiniWorldInfo; +import com.mango.core.user.bean.UserInfo; import java.util.List; import java.util.Locale; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/MiniWorldMainAdapter.java similarity index 76% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/MiniWorldMainAdapter.java index e4b43f2cc..0ba7727bc 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/MiniWorldMainAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.adapter; +package com.mango.moshen.miniworld.adapter; import androidx.recyclerview.widget.GridLayoutManager; import android.text.TextUtils; @@ -7,23 +7,23 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.widget.MessageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo; -import com.yizhuan.xchat_android_library.utils.SizeUtils; +import com.mango.moshen.R; +import com.mango.moshen.avroom.widget.MessageView; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.miniworld.bean.MiniWorldCategoryInfo; +import com.mango.core.miniworld.bean.MiniWorldInfo; +import com.mango.core.miniworld.bean.MiniWorldMainItemInfo; +import com.mango.xchat_android_library.utils.SizeUtils; import java.util.List; -import static com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo.TYPE_BANNER; -import static com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo.TYPE_BOTTOM_PADDING; -import static com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo.TYPE_FIND; -import static com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo.TYPE_ITEM; -import static com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo.TYPE_PLACEHOLDER; -import static com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo.TYPE_TITLE; -import static com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo.TYPE_DIVIDER; +import static com.mango.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_BANNER; +import static com.mango.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_BOTTOM_PADDING; +import static com.mango.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_FIND; +import static com.mango.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_ITEM; +import static com.mango.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_PLACEHOLDER; +import static com.mango.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_TITLE; +import static com.mango.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_DIVIDER; public class MiniWorldMainAdapter extends BaseMultiItemQuickAdapter { diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/MiniWorldMemberListAdapter.java similarity index 94% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/MiniWorldMemberListAdapter.java index cafce7d13..f5cef9718 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/MiniWorldMemberListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.adapter; +package com.mango.moshen.miniworld.adapter; import android.content.Context; @@ -13,11 +13,11 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListMemberInfo; +import com.mango.moshen.R; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.level.UserLevelVo; +import com.mango.core.miniworld.bean.MiniWorldMemberListMemberInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/RecommendTopicListAdapter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/RecommendTopicListAdapter.java similarity index 81% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/RecommendTopicListAdapter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/RecommendTopicListAdapter.java index 0a410bb13..a7d649404 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/RecommendTopicListAdapter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/adapter/RecommendTopicListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.adapter; +package com.mango.moshen.miniworld.adapter; import androidx.annotation.Nullable; @@ -6,9 +6,9 @@ import android.widget.ImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.miniworld.bean.MiniWorldInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/fragment/MiniWorldCategoryFragment.java similarity index 86% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/fragment/MiniWorldCategoryFragment.java index 752051870..e41541005 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/fragment/MiniWorldCategoryFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.fragment; +package com.mango.moshen.miniworld.fragment; import android.app.Activity; @@ -11,24 +11,24 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.miniworld.activity.MiniWorldActivity; -import com.yizhuan.erban.miniworld.activity.TopicMainActivity; -import com.yizhuan.erban.miniworld.adapter.AllTopicListAdapter; -import com.yizhuan.erban.miniworld.listener.DoubleClickCheckListener; -import com.yizhuan.erban.miniworld.presenter.MiniWorldCategoryPresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldCategoryView; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldStateChangedEvent; -import com.yizhuan.xchat_android_core.miniworld.event.OpenedMyMiniWorldEvent; -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; -import com.yizhuan.xchat_android_library.utils.SizeUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.miniworld.activity.MiniWorldActivity; +import com.mango.moshen.miniworld.activity.TopicMainActivity; +import com.mango.moshen.miniworld.adapter.AllTopicListAdapter; +import com.mango.moshen.miniworld.listener.DoubleClickCheckListener; +import com.mango.moshen.miniworld.presenter.MiniWorldCategoryPresenter; +import com.mango.moshen.miniworld.view.IMiniWorldCategoryView; +import com.mango.core.miniworld.bean.MiniWorldCategoryInfo; +import com.mango.core.miniworld.bean.MiniWorldInfo; +import com.mango.core.miniworld.event.MiniWorldStateChangedEvent; +import com.mango.core.miniworld.event.OpenedMyMiniWorldEvent; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.SizeUtils; +import com.mango.xchat_android_library.utils.log.MLog; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldNoticeFrg.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/fragment/MiniWorldNoticeFrg.java similarity index 87% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldNoticeFrg.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/fragment/MiniWorldNoticeFrg.java index 2adaa2cc5..f0634932c 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldNoticeFrg.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/fragment/MiniWorldNoticeFrg.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.fragment; +package com.mango.moshen.miniworld.fragment; import android.graphics.drawable.Drawable; import androidx.core.content.ContextCompat; @@ -7,15 +7,15 @@ import android.view.View; import android.widget.ScrollView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.miniworld.presenter.MiniWorldNoticePresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldNoticeView; -import com.yizhuan.erban.miniworld.viewmodel.MiniWorldDetailInfoVM; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; +import com.mango.moshen.R; +import com.mango.moshen.UIHelper; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.common.widget.CircleImageView; +import com.mango.moshen.miniworld.presenter.MiniWorldNoticePresenter; +import com.mango.moshen.miniworld.view.IMiniWorldNoticeView; +import com.mango.moshen.miniworld.viewmodel.MiniWorldDetailInfoVM; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.xchat_android_library.base.factory.CreatePresenter; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/listener/DoubleClickCheckListener.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/listener/DoubleClickCheckListener.java similarity index 95% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/listener/DoubleClickCheckListener.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/listener/DoubleClickCheckListener.java index e2f4784ca..66aabbd57 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/listener/DoubleClickCheckListener.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/listener/DoubleClickCheckListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.listener; +package com.mango.moshen.miniworld.listener; import android.view.View; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/AudioPartyDialogPresenter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/AudioPartyDialogPresenter.java similarity index 89% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/AudioPartyDialogPresenter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/AudioPartyDialogPresenter.java index b73193939..5d08019ec 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/AudioPartyDialogPresenter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/AudioPartyDialogPresenter.java @@ -1,12 +1,11 @@ -package com.yizhuan.erban.miniworld.presenter; +package com.mango.moshen.miniworld.presenter; -import com.yizhuan.erban.miniworld.view.IAudioPartyDialogView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyItem; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyListInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.mango.moshen.miniworld.view.IAudioPartyDialogView; +import com.mango.core.Constants; +import com.mango.core.miniworld.bean.AudioPartyInfo; +import com.mango.core.miniworld.bean.AudioPartyItem; +import com.mango.core.miniworld.bean.AudioPartyListInfo; +import com.mango.core.miniworld.model.MiniWorldModel; import java.util.ArrayList; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MWTeamMessagePresenter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MWTeamMessagePresenter.java similarity index 84% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MWTeamMessagePresenter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MWTeamMessagePresenter.java index 5b7ff2c84..f2cecdab7 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MWTeamMessagePresenter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MWTeamMessagePresenter.java @@ -1,28 +1,25 @@ -package com.yizhuan.erban.miniworld.presenter; +package com.mango.moshen.miniworld.presenter; import android.annotation.SuppressLint; import android.content.Context; import com.trello.rxlifecycle3.LifecycleProvider; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.home.presenter.MainFragmentPresenter; -import com.yizhuan.erban.miniworld.view.IMWTeamMessageView; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.OpenSuccessInfo; -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.model.AvRoomModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.moshen.miniworld.view.IMWTeamMessageView; +import com.mango.core.auth.AuthModel; +import com.mango.core.miniworld.bean.MWChatInfo; +import com.mango.core.miniworld.model.MiniWorldModel; +import com.mango.core.patriarch.exception.PmRoomLimitException; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; -import static com.yizhuan.erban.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL; -import static com.yizhuan.erban.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL_ALREADY_OPENED_ROOM; -import static com.yizhuan.erban.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL_PM_LIMIT_TIME; -import static com.yizhuan.erban.home.presenter.MainFragmentPresenter.OPEN_ROOM_SUCCESS; +import static com.mango.moshen.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL; +import static com.mango.moshen.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL_ALREADY_OPENED_ROOM; +import static com.mango.moshen.home.presenter.MainFragmentPresenter.OPEN_ROOM_FAIL_PM_LIMIT_TIME; +import static com.mango.moshen.home.presenter.MainFragmentPresenter.OPEN_ROOM_SUCCESS; public class MWTeamMessagePresenter { private IMWTeamMessageView mView; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MWThemePresenter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MWThemePresenter.java similarity index 79% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MWThemePresenter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MWThemePresenter.java index 3f501510b..3bd2348ae 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MWThemePresenter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MWThemePresenter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.miniworld.presenter; +package com.mango.moshen.miniworld.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.miniworld.view.IMWThemeView; -import com.yizhuan.xchat_android_core.miniworld.bean.TopicInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.miniworld.view.IMWThemeView; +import com.mango.core.miniworld.bean.TopicInfo; +import com.mango.core.miniworld.model.MiniWorldModel; +import com.mango.core.utils.net.BeanObserver; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldCategoryPresenter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldCategoryPresenter.java similarity index 78% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldCategoryPresenter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldCategoryPresenter.java index 27280ddc1..24acaffe1 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldCategoryPresenter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldCategoryPresenter.java @@ -1,14 +1,14 @@ -package com.yizhuan.erban.miniworld.presenter; +package com.mango.moshen.miniworld.presenter; import android.annotation.SuppressLint; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldCategoryView; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.miniworld.view.IMiniWorldCategoryView; +import com.mango.core.miniworld.bean.MiniWorldInfo; +import com.mango.core.miniworld.model.MiniWorldModel; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldEditPresenter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldEditPresenter.java similarity index 91% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldEditPresenter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldEditPresenter.java index aa406d84b..666168649 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldEditPresenter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldEditPresenter.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.miniworld.presenter; +package com.mango.moshen.miniworld.presenter; import android.text.TextUtils; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldEditView; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.miniworld.view.IMiniWorldEditView; +import com.mango.core.miniworld.model.MiniWorldModel; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.utils.SingleToastUtil; /** * 编辑世界资料页面 diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldGuestPagePresenter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldGuestPagePresenter.java similarity index 88% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldGuestPagePresenter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldGuestPagePresenter.java index 9b322bd32..8889336da 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldGuestPagePresenter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldGuestPagePresenter.java @@ -1,29 +1,29 @@ -package com.yizhuan.erban.miniworld.presenter; +package com.mango.moshen.miniworld.presenter; import android.annotation.SuppressLint; import android.text.TextUtils; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldGuestPage; -import com.yizhuan.erban.miniworld.viewmodel.MiniWorldDetailInfoVM; -import com.yizhuan.erban.miniworld.viewmodel.MiniWorldEditableInfoVM; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldStateChangedEvent; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.miniworld.view.IMiniWorldGuestPage; +import com.mango.moshen.miniworld.viewmodel.MiniWorldDetailInfoVM; +import com.mango.moshen.miniworld.viewmodel.MiniWorldEditableInfoVM; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.exception.FailReasonException; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.miniworld.bean.AudioPartyInfo; +import com.mango.core.miniworld.bean.MiniWorldDetailInfo; +import com.mango.core.miniworld.event.MiniWorldStateChangedEvent; +import com.mango.core.miniworld.model.MiniWorldModel; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.BeanObserver; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldMainPresenter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldMainPresenter.java similarity index 85% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldMainPresenter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldMainPresenter.java index ce3a404c3..5aa4abb6f 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldMainPresenter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldMainPresenter.java @@ -1,21 +1,21 @@ -package com.yizhuan.erban.miniworld.presenter; +package com.mango.moshen.miniworld.presenter; import android.annotation.SuppressLint; import android.text.TextUtils; import android.util.Pair; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldMainView; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.miniworld.view.IMiniWorldMainView; +import com.mango.core.auth.AuthModel; +import com.mango.core.home.bean.BannerInfo; +import com.mango.core.miniworld.bean.MiniWorldCategoryInfo; +import com.mango.core.miniworld.bean.MiniWorldInfo; +import com.mango.core.miniworld.bean.MiniWorldMainInfo; +import com.mango.core.miniworld.bean.MiniWorldMainItemInfo; +import com.mango.core.miniworld.model.MiniWorldModel; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldMemberListPresenter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldMemberListPresenter.java similarity index 93% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldMemberListPresenter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldMemberListPresenter.java index 1ff40b893..4953e1f08 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldMemberListPresenter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldMemberListPresenter.java @@ -1,17 +1,17 @@ -package com.yizhuan.erban.miniworld.presenter; +package com.mango.moshen.miniworld.presenter; import android.text.TextUtils; import android.util.Log; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.miniworld.activity.MiniWorldMemberListActivity; -import com.yizhuan.erban.miniworld.view.IMiniWorldMemberListView; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListMemberInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.base.PresenterEvent; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.miniworld.activity.MiniWorldMemberListActivity; +import com.mango.moshen.miniworld.view.IMiniWorldMemberListView; +import com.mango.core.auth.AuthModel; +import com.mango.core.miniworld.bean.MiniWorldMemberListInfo; +import com.mango.core.miniworld.bean.MiniWorldMemberListMemberInfo; +import com.mango.core.miniworld.model.MiniWorldModel; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.base.PresenterEvent; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldNoticePresenter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldNoticePresenter.java similarity index 78% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldNoticePresenter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldNoticePresenter.java index 7fdad11ba..e2abcaa73 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldNoticePresenter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldNoticePresenter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.presenter; +package com.mango.moshen.miniworld.presenter; import android.content.Context; import android.graphics.drawable.Drawable; @@ -6,10 +6,10 @@ import android.text.SpannableString; import android.text.Spanned; import android.text.style.ImageSpan; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.common.widget.CustomImageSpan; -import com.yizhuan.erban.miniworld.view.IMiniWorldNoticeView; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.common.widget.CustomImageSpan; +import com.mango.moshen.miniworld.view.IMiniWorldNoticeView; public class MiniWorldNoticePresenter extends BaseMvpPresenter { diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldPresenter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldPresenter.java similarity index 76% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldPresenter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldPresenter.java index 1863ecc44..dc0d09241 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldPresenter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldPresenter.java @@ -1,15 +1,15 @@ -package com.yizhuan.erban.miniworld.presenter; +package com.mango.moshen.miniworld.presenter; import android.annotation.SuppressLint; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldView; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.utils.net.ServerException; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.miniworld.view.IMiniWorldView; +import com.mango.core.miniworld.bean.MiniWorldCategoryInfo; +import com.mango.core.miniworld.model.MiniWorldModel; +import com.mango.core.utils.net.RxHelper; +import com.mango.core.utils.net.ServerException; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldSearchPresenter.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldSearchPresenter.java similarity index 80% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldSearchPresenter.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldSearchPresenter.java index e08978f83..b09ded0e9 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldSearchPresenter.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/presenter/MiniWorldSearchPresenter.java @@ -1,14 +1,14 @@ -package com.yizhuan.erban.miniworld.presenter; +package com.mango.moshen.miniworld.presenter; import android.annotation.SuppressLint; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.miniworld.view.IMiniWorldSearchView; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.miniworld.view.IMiniWorldSearchView; +import com.mango.core.miniworld.bean.MiniWorldInfo; +import com.mango.core.miniworld.model.MiniWorldModel; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IAudioPartyDialogView.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IAudioPartyDialogView.java similarity index 64% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IAudioPartyDialogView.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IAudioPartyDialogView.java index 4a4f80765..9b06af4e7 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IAudioPartyDialogView.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IAudioPartyDialogView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.view; +package com.mango.moshen.miniworld.view; public interface IAudioPartyDialogView { void worldRoomListSuccess(); diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMWTeamMessageView.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMWTeamMessageView.java similarity index 66% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMWTeamMessageView.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMWTeamMessageView.java index f6924fe10..8da15ef21 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMWTeamMessageView.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMWTeamMessageView.java @@ -1,8 +1,7 @@ -package com.yizhuan.erban.miniworld.view; +package com.mango.moshen.miniworld.view; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.miniworld.bean.MWChatInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; public interface IMWTeamMessageView extends IMvpBaseView { diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMWThemeView.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMWThemeView.java similarity index 60% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMWThemeView.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMWThemeView.java index 3bebac99e..9984fd57f 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMWThemeView.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMWThemeView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.miniworld.view; +package com.mango.moshen.miniworld.view; -import com.yizhuan.xchat_android_core.miniworld.bean.TopicInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.miniworld.bean.TopicInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldCategoryView.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldCategoryView.java similarity index 61% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldCategoryView.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldCategoryView.java index 3bd3dfcfd..ef025eab0 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldCategoryView.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldCategoryView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.miniworld.view; +package com.mango.moshen.miniworld.view; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.miniworld.bean.MiniWorldInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldEditView.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldEditView.java similarity index 79% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldEditView.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldEditView.java index 59fa6aa8c..9d96583b8 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldEditView.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldEditView.java @@ -1,6 +1,6 @@ -package com.yizhuan.erban.miniworld.view; +package com.mango.moshen.miniworld.view; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * 编辑世界资料页面 diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldGuestPage.java similarity index 82% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldGuestPage.java index 1a0b92561..97b3e3096 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldGuestPage.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.miniworld.view; +package com.mango.moshen.miniworld.view; import androidx.annotation.NonNull; -import com.yizhuan.erban.miniworld.viewmodel.MiniWorldDetailInfoVM; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.moshen.miniworld.viewmodel.MiniWorldDetailInfoVM; +import com.mango.core.miniworld.bean.AudioPartyInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldMainView.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldMainView.java similarity index 50% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldMainView.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldMainView.java index dd495919b..f10042642 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldMainView.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldMainView.java @@ -1,8 +1,8 @@ -package com.yizhuan.erban.miniworld.view; +package com.mango.moshen.miniworld.view; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.home.bean.BannerInfo; +import com.mango.core.miniworld.bean.MiniWorldMainItemInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldMemberListView.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldMemberListView.java similarity index 83% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldMemberListView.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldMemberListView.java index be7798d4c..2abd84cc5 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldMemberListView.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldMemberListView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.miniworld.view; +package com.mango.moshen.miniworld.view; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListMemberInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.miniworld.bean.MiniWorldMemberListMemberInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldNoticeView.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldNoticeView.java new file mode 100644 index 000000000..3f066a550 --- /dev/null +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldNoticeView.java @@ -0,0 +1,6 @@ +package com.mango.moshen.miniworld.view; + +import com.mango.xchat_android_library.base.IMvpBaseView; + +public interface IMiniWorldNoticeView extends IMvpBaseView { +} diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldSearchView.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldSearchView.java similarity index 61% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldSearchView.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldSearchView.java index a148c98ee..6c861a3b6 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldSearchView.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldSearchView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.miniworld.view; +package com.mango.moshen.miniworld.view; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.miniworld.bean.MiniWorldInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldView.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldView.java similarity index 70% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldView.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldView.java index 3f58141dc..c1ea3c8b5 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldView.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/view/IMiniWorldView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.miniworld.view; +package com.mango.moshen.miniworld.view; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.miniworld.bean.MiniWorldCategoryInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/viewmodel/MiniWorldDetailInfoVM.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/viewmodel/MiniWorldDetailInfoVM.java similarity index 94% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/viewmodel/MiniWorldDetailInfoVM.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/viewmodel/MiniWorldDetailInfoVM.java index da6301583..697325330 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/viewmodel/MiniWorldDetailInfoVM.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/viewmodel/MiniWorldDetailInfoVM.java @@ -1,13 +1,13 @@ -package com.yizhuan.erban.miniworld.viewmodel; +package com.mango.moshen.miniworld.viewmodel; import android.text.TextUtils; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfoWithMemberInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.core.auth.AuthModel; +import com.mango.core.miniworld.bean.MiniWorldDetailInfo; +import com.mango.core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember; +import com.mango.core.miniworld.bean.MiniWorldDetailInfoWithMemberInfo; +import com.mango.xchat_android_library.utils.ListUtils; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/viewmodel/MiniWorldEditableInfoVM.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/viewmodel/MiniWorldEditableInfoVM.java similarity index 98% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/viewmodel/MiniWorldEditableInfoVM.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/viewmodel/MiniWorldEditableInfoVM.java index 17e80c77d..5d4c937d0 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/viewmodel/MiniWorldEditableInfoVM.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/viewmodel/MiniWorldEditableInfoVM.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.viewmodel; +package com.mango.moshen.miniworld.viewmodel; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/widget/MWMagicIndicator.java similarity index 79% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/widget/MWMagicIndicator.java index 266fa6541..e2dd5c1cf 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/widget/MWMagicIndicator.java @@ -1,16 +1,16 @@ -package com.yizhuan.erban.miniworld.widget; +package com.mango.moshen.miniworld.widget; import android.content.Context; import android.os.Build; import androidx.annotation.RequiresApi; import androidx.core.content.ContextCompat; -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 com.yizhuan.xchat_android_core.home.bean.TabInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import com.mango.core.home.bean.TabInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java b/app/src/module_mini_world/java/com/mango/moshen/miniworld/widget/MiniWorldEditChooseClassifyDialog.java similarity index 89% rename from app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java rename to app/src/module_mini_world/java/com/mango/moshen/miniworld/widget/MiniWorldEditChooseClassifyDialog.java index 9fcb1dfd3..029aaa2ab 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java +++ b/app/src/module_mini_world/java/com/mango/moshen/miniworld/widget/MiniWorldEditChooseClassifyDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.miniworld.widget; +package com.mango.moshen.miniworld.widget; import android.app.Dialog; import android.content.Context; @@ -14,13 +14,13 @@ import android.view.View; import android.view.ViewGroup; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.miniworld.adapter.MiniWorldEditClassifyAdapter; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.SpacingDecoration; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldEditClassifyInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.miniworld.adapter.MiniWorldEditClassifyAdapter; +import com.mango.moshen.ui.widget.recyclerview.decoration.SpacingDecoration; +import com.mango.core.miniworld.bean.MiniWorldEditClassifyInfo; +import com.mango.core.miniworld.model.MiniWorldModel; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldNoticeView.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldNoticeView.java deleted file mode 100644 index d31bc5297..000000000 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldNoticeView.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.erban.miniworld.view; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface IMiniWorldNoticeView extends IMvpBaseView { -} diff --git a/app/src/module_mini_world/res/layout/act_mini_world_group_theme.xml b/app/src/module_mini_world/res/layout/act_mini_world_group_theme.xml index 8eeb8d899..5402f6280 100644 --- a/app/src/module_mini_world/res/layout/act_mini_world_group_theme.xml +++ b/app/src/module_mini_world/res/layout/act_mini_world_group_theme.xml @@ -6,7 +6,7 @@ android:background="@color/white" android:orientation="vertical"> - diff --git a/app/src/module_mini_world/res/layout/activity_all_topic.xml b/app/src/module_mini_world/res/layout/activity_all_topic.xml index bb1d38740..0875ff5f9 100644 --- a/app/src/module_mini_world/res/layout/activity_all_topic.xml +++ b/app/src/module_mini_world/res/layout/activity_all_topic.xml @@ -6,20 +6,20 @@ android:layout_height="match_parent" android:background="@color/bg_normal_1c1b22" android:orientation="vertical" - tools:context="com.yizhuan.erban.miniworld.activity.MiniWorldActivity"> + tools:context="com.mango.moshen.miniworld.activity.MiniWorldActivity"> - - - - + 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..e5e6679ef 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 @@ -6,19 +6,19 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context="com.yizhuan.erban.miniworld.activity.MiniWorldActivity"> + tools:context="com.mango.moshen.miniworld.activity.MiniWorldActivity"> - - - - + diff --git a/app/src/module_mini_world/res/layout/activity_mini_world_edit.xml b/app/src/module_mini_world/res/layout/activity_mini_world_edit.xml index e4420c486..b7eec94a4 100644 --- a/app/src/module_mini_world/res/layout/activity_mini_world_edit.xml +++ b/app/src/module_mini_world/res/layout/activity_mini_world_edit.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - @@ -261,7 +261,7 @@ android:background="@drawable/bg_white_top_0_12" android:orientation="vertical"> - + tools:context="com.mango.moshen.miniworld.activity.MiniWorldMainActivity"> - @@ -84,6 +84,6 @@ - + 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..efd7fe81a 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 @@ -6,7 +6,7 @@ android:background="#ffffff" android:orientation="vertical"> - - @@ -83,6 +83,6 @@ - + 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 6a771d4e0..a9a17ece6 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 @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context="com.yizhuan.erban.miniworld.activity.MiniWorldSearchActivity"> + tools:context="com.mango.moshen.miniworld.activity.MiniWorldSearchActivity"> - @@ -96,5 +96,5 @@ - + diff --git a/app/src/module_mini_world/res/layout/activity_topic_main.xml b/app/src/module_mini_world/res/layout/activity_topic_main.xml index 25e9cfc5c..f57ae4e1b 100644 --- a/app/src/module_mini_world/res/layout/activity_topic_main.xml +++ b/app/src/module_mini_world/res/layout/activity_topic_main.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:background="@color/transparent" app:elevation="0dp" - app:layout_behavior="com.yizhuan.erban.ui.widget.AppBarLayoutBehavior"> + app:layout_behavior="com.mango.moshen.ui.widget.AppBarLayoutBehavior"> - - - + diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml index 26ee062aa..8d27458fa 100644 --- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml +++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml @@ -2,7 +2,7 @@ + tools:context="com.mango.moshen.avroom.fragment.HomePartyRoomFragment"> @@ -12,7 +12,7 @@ + type="com.mango.core.room.bean.RoomInfo" /> - - - - - - - + tools:context="com.mango.moshen.avroom.fragment.HomePartyRoomFragment"> @@ -12,7 +12,7 @@ + type="com.mango.core.room.bean.RoomInfo" /> - @@ -120,14 +120,14 @@ - - - - + tools:context="com.mango.moshen.miniworld.fragment.MiniWorldCategoryFragment"> - + diff --git a/app/src/module_mini_world/res/layout/fragment_single_room.xml b/app/src/module_mini_world/res/layout/fragment_single_room.xml index dfd370619..3611d889b 100644 --- a/app/src/module_mini_world/res/layout/fragment_single_room.xml +++ b/app/src/module_mini_world/res/layout/fragment_single_room.xml @@ -2,7 +2,7 @@ + tools:context="com.mango.moshen.avroom.fragment.SingleRoomFragment"> @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - - - - - - diff --git a/app/src/module_mini_world/res/layout/layout_mini_world_main_banner_header.xml b/app/src/module_mini_world/res/layout/layout_mini_world_main_banner_header.xml index 79a055723..49fdf7ece 100644 --- a/app/src/module_mini_world/res/layout/layout_mini_world_main_banner_header.xml +++ b/app/src/module_mini_world/res/layout/layout_mini_world_main_banner_header.xml @@ -6,7 +6,7 @@ android:paddingTop="20dp" android:paddingBottom="20dp"> - diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/adapter/AddLocalMusicListAdapter.java b/app/src/module_music/java/com/mango/moshen/music/adapter/AddLocalMusicListAdapter.java similarity index 97% rename from app/src/module_music/java/com/yizhuan/tutu/music/adapter/AddLocalMusicListAdapter.java rename to app/src/module_music/java/com/mango/moshen/music/adapter/AddLocalMusicListAdapter.java index b96302326..cc57cd4f9 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/adapter/AddLocalMusicListAdapter.java +++ b/app/src/module_music/java/com/mango/moshen/music/adapter/AddLocalMusicListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.music.adapter; +package com.mango.moshen.music.adapter; import android.content.Context; import androidx.recyclerview.widget.RecyclerView; @@ -8,8 +8,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; +import com.mango.moshen.R; +import com.mango.core.music.db.bean.LocalMusicBean; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/adapter/LocalMusicListAdapter.java b/app/src/module_music/java/com/mango/moshen/music/adapter/LocalMusicListAdapter.java similarity index 95% rename from app/src/module_music/java/com/yizhuan/tutu/music/adapter/LocalMusicListAdapter.java rename to app/src/module_music/java/com/mango/moshen/music/adapter/LocalMusicListAdapter.java index ab102ffb7..addeecef5 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/adapter/LocalMusicListAdapter.java +++ b/app/src/module_music/java/com/mango/moshen/music/adapter/LocalMusicListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.music.adapter; +package com.mango.moshen.music.adapter; import androidx.core.content.ContextCompat; import android.view.View; @@ -8,8 +8,8 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; +import com.mango.moshen.R; +import com.mango.core.music.db.bean.LocalMusicBean; /** * Created by chenran on 2017/11/1. diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/adapter/ShareMusicListAdapter.java b/app/src/module_music/java/com/mango/moshen/music/adapter/ShareMusicListAdapter.java similarity index 91% rename from app/src/module_music/java/com/yizhuan/tutu/music/adapter/ShareMusicListAdapter.java rename to app/src/module_music/java/com/mango/moshen/music/adapter/ShareMusicListAdapter.java index 9ff787275..f31187c16 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/adapter/ShareMusicListAdapter.java +++ b/app/src/module_music/java/com/mango/moshen/music/adapter/ShareMusicListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.music.adapter; +package com.mango.moshen.music.adapter; import android.view.View; import android.widget.ImageView; @@ -7,8 +7,8 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.music.bean.ShareMusicInfo; +import com.mango.moshen.R; +import com.mango.core.music.bean.ShareMusicInfo; public class ShareMusicListAdapter extends BaseQuickAdapter { diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/fragment/LocalMusicListFragment.java b/app/src/module_music/java/com/mango/moshen/music/fragment/LocalMusicListFragment.java similarity index 90% rename from app/src/module_music/java/com/yizhuan/tutu/music/fragment/LocalMusicListFragment.java rename to app/src/module_music/java/com/mango/moshen/music/fragment/LocalMusicListFragment.java index 66d5e4b7b..eede487a0 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/fragment/LocalMusicListFragment.java +++ b/app/src/module_music/java/com/mango/moshen/music/fragment/LocalMusicListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.music.fragment; +package com.mango.moshen.music.fragment; import android.app.Activity; import android.content.Intent; @@ -18,26 +18,26 @@ import com.netease.nim.uikit.common.util.sys.NetworkUtil; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.tutu.music.activity.AddLocalMusicListActivity; -import com.yizhuan.tutu.music.activity.MusicListActivity; -import com.yizhuan.tutu.music.adapter.LocalMusicListAdapter; -import com.yizhuan.tutu.music.presenter.LocalMusicListPresenter; -import com.yizhuan.tutu.music.widget.VoiceSeekDialog; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.event.CurrentMusicUpdateEvent; -import com.yizhuan.xchat_android_core.music.event.MusicPauseEvent; -import com.yizhuan.xchat_android_core.music.event.MusicPlayingEvent; -import com.yizhuan.xchat_android_core.music.event.MusicStopEvent; -import com.yizhuan.xchat_android_core.music.model.IPlayerModel; -import com.yizhuan.xchat_android_core.music.model.PlayerModel; -import com.yizhuan.xchat_android_core.music.view.ILocalMusicListView; -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; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.music.activity.AddLocalMusicListActivity; +import com.mango.moshen.music.activity.MusicListActivity; +import com.mango.moshen.music.adapter.LocalMusicListAdapter; +import com.mango.moshen.music.presenter.LocalMusicListPresenter; +import com.mango.moshen.music.widget.VoiceSeekDialog; +import com.mango.core.Constants; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.music.event.CurrentMusicUpdateEvent; +import com.mango.core.music.event.MusicPauseEvent; +import com.mango.core.music.event.MusicPlayingEvent; +import com.mango.core.music.event.MusicStopEvent; +import com.mango.core.music.model.IPlayerModel; +import com.mango.core.music.model.PlayerModel; +import com.mango.core.music.view.ILocalMusicListView; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/fragment/ShareMusicListFragment.java b/app/src/module_music/java/com/mango/moshen/music/fragment/ShareMusicListFragment.java similarity index 91% rename from app/src/module_music/java/com/yizhuan/tutu/music/fragment/ShareMusicListFragment.java rename to app/src/module_music/java/com/mango/moshen/music/fragment/ShareMusicListFragment.java index cdfdefb8c..e51df6996 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/fragment/ShareMusicListFragment.java +++ b/app/src/module_music/java/com/mango/moshen/music/fragment/ShareMusicListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.music.fragment; +package com.mango.moshen.music.fragment; import android.os.Bundle; import androidx.annotation.Nullable; @@ -21,21 +21,21 @@ import com.netease.nim.uikit.common.util.sys.NetworkUtil; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.utils.KeyBoardUtils; -import com.yizhuan.tutu.music.activity.MusicListActivity; -import com.yizhuan.tutu.music.adapter.ShareMusicListAdapter; -import com.yizhuan.tutu.music.presenter.ShareMusicListPresenter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.music.bean.ShareMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.view.IShareMusicListView; -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; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.utils.KeyBoardUtils; +import com.mango.moshen.music.activity.MusicListActivity; +import com.mango.moshen.music.adapter.ShareMusicListAdapter; +import com.mango.moshen.music.presenter.ShareMusicListPresenter; +import com.mango.core.Constants; +import com.mango.core.music.bean.ShareMusicInfo; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.music.view.IShareMusicListView; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.TextWatcherWrapper; import java.util.List; import java.util.Objects; diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/AddLocalMusicListPresenter.java b/app/src/module_music/java/com/mango/moshen/music/presenter/AddLocalMusicListPresenter.java similarity index 85% rename from app/src/module_music/java/com/yizhuan/tutu/music/presenter/AddLocalMusicListPresenter.java rename to app/src/module_music/java/com/mango/moshen/music/presenter/AddLocalMusicListPresenter.java index d5cac5d72..31f8a205f 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/AddLocalMusicListPresenter.java +++ b/app/src/module_music/java/com/mango/moshen/music/presenter/AddLocalMusicListPresenter.java @@ -1,14 +1,13 @@ -package com.yizhuan.tutu.music.presenter; +package com.mango.moshen.music.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.db.model.LocalMusicDbModel; -import com.yizhuan.xchat_android_core.music.view.IAddLocalMusicListView; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.base.PresenterEvent; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.music.db.model.LocalMusicDbModel; +import com.mango.core.music.view.IAddLocalMusicListView; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.base.PresenterEvent; import java.util.List; -import java.util.concurrent.TimeUnit; import io.reactivex.disposables.Disposable; diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/LocalMusicListPresenter.java b/app/src/module_music/java/com/mango/moshen/music/presenter/LocalMusicListPresenter.java similarity index 85% rename from app/src/module_music/java/com/yizhuan/tutu/music/presenter/LocalMusicListPresenter.java rename to app/src/module_music/java/com/mango/moshen/music/presenter/LocalMusicListPresenter.java index 39ba0e6b2..1806fb3a7 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/LocalMusicListPresenter.java +++ b/app/src/module_music/java/com/mango/moshen/music/presenter/LocalMusicListPresenter.java @@ -1,17 +1,17 @@ -package com.yizhuan.tutu.music.presenter; +package com.mango.moshen.music.presenter; import android.annotation.SuppressLint; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.tutu.database.AppDataBase; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.db.model.LocalMusicDbModel; -import com.yizhuan.xchat_android_core.music.model.PlayerModel; -import com.yizhuan.xchat_android_core.music.view.ILocalMusicListView; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.database.AppDataBase; +import com.mango.core.Constants; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.music.db.model.LocalMusicDbModel; +import com.mango.core.music.model.PlayerModel; +import com.mango.core.music.view.ILocalMusicListView; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.concurrent.atomic.AtomicInteger; diff --git a/app/src/module_music/java/com/mango/moshen/music/presenter/MusicListPresenter.java b/app/src/module_music/java/com/mango/moshen/music/presenter/MusicListPresenter.java new file mode 100644 index 000000000..fa40b3f55 --- /dev/null +++ b/app/src/module_music/java/com/mango/moshen/music/presenter/MusicListPresenter.java @@ -0,0 +1,7 @@ +package com.mango.moshen.music.presenter; + +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.music.view.IMusicListView; + +public class MusicListPresenter extends BaseMvpPresenter { +} diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/ShareMusicListPresenter.java b/app/src/module_music/java/com/mango/moshen/music/presenter/ShareMusicListPresenter.java similarity index 88% rename from app/src/module_music/java/com/yizhuan/tutu/music/presenter/ShareMusicListPresenter.java rename to app/src/module_music/java/com/mango/moshen/music/presenter/ShareMusicListPresenter.java index b4c8b5c53..573cf147b 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/ShareMusicListPresenter.java +++ b/app/src/module_music/java/com/mango/moshen/music/presenter/ShareMusicListPresenter.java @@ -1,23 +1,21 @@ -package com.yizhuan.tutu.music.presenter; +package com.mango.moshen.music.presenter; import android.annotation.SuppressLint; -import com.yizhuan.erban.BuildConfig; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.tutu.database.AppDataBase; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.music.bean.ShareMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.model.ShareMusicListModel; -import com.yizhuan.xchat_android_core.music.view.IShareMusicListView; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.moshen.database.AppDataBase; +import com.mango.core.Constants; +import com.mango.core.music.bean.ShareMusicInfo; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.music.model.ShareMusicListModel; +import com.mango.core.music.view.IShareMusicListView; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.functions.BiConsumer; import io.reactivex.functions.Function; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/widget/MusicPlayerView.java b/app/src/module_music/java/com/mango/moshen/music/widget/MusicPlayerView.java similarity index 91% rename from app/src/module_music/java/com/yizhuan/tutu/music/widget/MusicPlayerView.java rename to app/src/module_music/java/com/mango/moshen/music/widget/MusicPlayerView.java index 21780cfc8..5fba92722 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/widget/MusicPlayerView.java +++ b/app/src/module_music/java/com/mango/moshen/music/widget/MusicPlayerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.music.widget; +package com.mango.moshen.music.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -17,22 +17,22 @@ import android.widget.RelativeLayout; import android.widget.SeekBar; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.tutu.music.activity.MusicListActivity; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.event.CurrentMusicUpdateEvent; -import com.yizhuan.xchat_android_core.music.event.MusicPauseEvent; -import com.yizhuan.xchat_android_core.music.event.MusicPlayingEvent; -import com.yizhuan.xchat_android_core.music.event.MusicStopEvent; -import com.yizhuan.xchat_android_core.music.model.IPlayerModel; -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.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpActivity; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.moshen.music.activity.MusicListActivity; +import com.mango.core.DemoCache; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.music.event.CurrentMusicUpdateEvent; +import com.mango.core.music.event.MusicPauseEvent; +import com.mango.core.music.event.MusicPlayingEvent; +import com.mango.core.music.event.MusicStopEvent; +import com.mango.core.music.model.IPlayerModel; +import com.mango.core.music.model.PlayerModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/widget/VoiceSeekDialog.java b/app/src/module_music/java/com/mango/moshen/music/widget/VoiceSeekDialog.java similarity index 94% rename from app/src/module_music/java/com/yizhuan/tutu/music/widget/VoiceSeekDialog.java rename to app/src/module_music/java/com/mango/moshen/music/widget/VoiceSeekDialog.java index f17130b8a..6b082f38b 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/widget/VoiceSeekDialog.java +++ b/app/src/module_music/java/com/mango/moshen/music/widget/VoiceSeekDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.music.widget; +package com.mango.moshen.music.widget; import android.content.Context; import android.os.Bundle; @@ -10,9 +10,9 @@ import android.widget.FrameLayout; import android.widget.SeekBar; import android.widget.TextView; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.marqueeview.Utils; -import com.yizhuan.xchat_android_core.music.model.PlayerModel; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.marqueeview.Utils; +import com.mango.core.music.model.PlayerModel; /** diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/TEMP.java b/app/src/module_music/java/com/yizhuan/tutu/music/TEMP.java deleted file mode 100644 index ae405f44b..000000000 --- a/app/src/module_music/java/com/yizhuan/tutu/music/TEMP.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.tutu.music; - -public class TEMP { -} diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/MusicListPresenter.java b/app/src/module_music/java/com/yizhuan/tutu/music/presenter/MusicListPresenter.java deleted file mode 100644 index e2f745b62..000000000 --- a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/MusicListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.tutu.music.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.music.view.IMusicListView; - -public class MusicListPresenter extends BaseMvpPresenter { -} 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..5e8e3ff04 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 @@ -68,7 +68,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - + + type="com.mango.core.noble.AllServiceGiftProtocol.DataBean" /> - 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..044b6ab30 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 @@ -86,7 +86,7 @@ - @@ -96,6 +96,6 @@ 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..98ffe60a4 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 @@ -1,5 +1,5 @@ - @@ -17,4 +17,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message_view.xml b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message_view.xml index 27428df2d..c55ac2b2d 100644 --- a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message_view.xml +++ b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message_view.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -23,6 +23,6 @@ - + \ 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 6519dfb97..629229694 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 @@ -6,7 +6,7 @@ android:layout_height="82dp" android:background="@drawable/bg_common_touch_while"> - - - - - - { diff --git a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java b/app/src/module_quick_pass/java/com/mango/moshen/quick_pass/QuickLoginUiConfig.java similarity index 97% rename from app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java rename to app/src/module_quick_pass/java/com/mango/moshen/quick_pass/QuickLoginUiConfig.java index c4d93f28a..5bb3ee7bc 100644 --- a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java +++ b/app/src/module_quick_pass/java/com/mango/moshen/quick_pass/QuickLoginUiConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.quick_pass; +package com.mango.moshen.quick_pass; import android.content.Context; import android.graphics.Color; @@ -6,8 +6,8 @@ import android.graphics.Color; import androidx.core.content.ContextCompat; import com.netease.nis.quicklogin.helper.UnifyUiConfig; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.PreferencesUtils; +import com.mango.moshen.R; +import com.mango.core.PreferencesUtils; /** * Created by hzhuqi on 2019/12/31 diff --git a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java b/app/src/module_quick_pass/java/com/mango/moshen/quick_pass/QuickPassLoginAct.java similarity index 93% rename from app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java rename to app/src/module_quick_pass/java/com/mango/moshen/quick_pass/QuickPassLoginAct.java index 72008f342..eb844a075 100644 --- a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java +++ b/app/src/module_quick_pass/java/com/mango/moshen/quick_pass/QuickPassLoginAct.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.quick_pass; +package com.mango.moshen.quick_pass; import android.content.Context; import android.content.Intent; @@ -17,19 +17,18 @@ import com.netease.nim.uikit.StatusBarUtil; import com.netease.nis.quicklogin.QuickLogin; import com.netease.nis.quicklogin.listener.QuickLoginPreMobileListener; import com.netease.nis.quicklogin.listener.QuickLoginTokenListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseLoginAct; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.login.LoginPhoneActivity; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.auth.exception.AccountCancelException; -import com.yizhuan.xchat_android_core.auth.exception.BanAccountException; -import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseLoginAct; +import com.mango.moshen.ui.login.LoginPhoneActivity; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.DemoCache; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.event.LoginEvent; +import com.mango.core.auth.exception.AccountCancelException; +import com.mango.core.auth.exception.BanAccountException; +import com.mango.core.auth.exception.IsSuperAdminException; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_quick_pass/res/layout/activity_give_gold_to_user.xml b/app/src/module_quick_pass/res/layout/activity_give_gold_to_user.xml index 6e3015b18..54af6d88c 100644 --- a/app/src/module_quick_pass/res/layout/activity_give_gold_to_user.xml +++ b/app/src/module_quick_pass/res/layout/activity_give_gold_to_user.xml @@ -8,7 +8,7 @@ android:orientation="vertical" tools:context=".pay.activity.GiveGoldToUserActivity"> - - - { diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgTeamRecentViewHolder.java b/app/src/module_room_chat/java/com/mango/moshen/room_chat/adapter/RoomMsgTeamRecentViewHolder.java similarity index 96% rename from app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgTeamRecentViewHolder.java rename to app/src/module_room_chat/java/com/mango/moshen/room_chat/adapter/RoomMsgTeamRecentViewHolder.java index 3d2b95ff1..e3f633295 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgTeamRecentViewHolder.java +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/adapter/RoomMsgTeamRecentViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.room_chat.adapter; +package com.mango.moshen.room_chat.adapter; import android.graphics.drawable.AnimationDrawable; import android.os.Handler; @@ -21,10 +21,10 @@ import com.netease.nimlib.sdk.msg.model.RecentContact; import com.netease.nimlib.sdk.team.TeamService; import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum; import com.netease.nimlib.sdk.team.model.Team; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.im.recent.TeamExt; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.mango.moshen.R; +import com.mango.moshen.ui.im.recent.TeamExt; +import com.mango.core.im.custom.bean.LuckyMoneyAttachment; +import com.mango.core.im.custom.bean.LuckyMoneyTipsAttachment; import static android.view.View.GONE; import static android.view.View.VISIBLE; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieListAdapter.java b/app/src/module_room_chat/java/com/mango/moshen/room_chat/adapter/RoomNewbieListAdapter.java similarity index 92% rename from app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieListAdapter.java rename to app/src/module_room_chat/java/com/mango/moshen/room_chat/adapter/RoomNewbieListAdapter.java index 6bdcd51b5..58ed17276 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieListAdapter.java +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/adapter/RoomNewbieListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.room_chat.adapter; +package com.mango.moshen.room_chat.adapter; import android.graphics.drawable.GradientDrawable; import android.text.TextUtils; @@ -9,10 +9,10 @@ import androidx.appcompat.widget.AppCompatImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.user.UserInfoActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.core.bean.RoomNewbieInfo; /** * @author jack diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieMessageAdapter.java b/app/src/module_room_chat/java/com/mango/moshen/room_chat/adapter/RoomNewbieMessageAdapter.java similarity index 89% rename from app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieMessageAdapter.java rename to app/src/module_room_chat/java/com/mango/moshen/room_chat/adapter/RoomNewbieMessageAdapter.java index 9541423f7..faa1f9d72 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieMessageAdapter.java +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/adapter/RoomNewbieMessageAdapter.java @@ -1,11 +1,11 @@ -package com.yizhuan.tutu.room_chat.adapter; +package com.mango.moshen.room_chat.adapter; import android.widget.RadioButton; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo; +import com.mango.moshen.R; +import com.mango.core.bean.RoomNewbieMessageInfo; /** * @author jack diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/event/ChangeNewbieMessageEvent.java b/app/src/module_room_chat/java/com/mango/moshen/room_chat/event/ChangeNewbieMessageEvent.java similarity index 50% rename from app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/event/ChangeNewbieMessageEvent.java rename to app/src/module_room_chat/java/com/mango/moshen/room_chat/event/ChangeNewbieMessageEvent.java index 551242869..b4ce2a177 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/event/ChangeNewbieMessageEvent.java +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/event/ChangeNewbieMessageEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.room_chat.event; +package com.mango.moshen.room_chat.event; public class ChangeNewbieMessageEvent { } diff --git a/app/src/module_room_chat/java/com/mango/moshen/room_chat/event/ClickRootViewEvent.java b/app/src/module_room_chat/java/com/mango/moshen/room_chat/event/ClickRootViewEvent.java new file mode 100644 index 000000000..690ebf886 --- /dev/null +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/event/ClickRootViewEvent.java @@ -0,0 +1,4 @@ +package com.mango.moshen.room_chat.event; + +public class ClickRootViewEvent { +} diff --git a/app/src/module_room_chat/java/com/mango/moshen/room_chat/event/SendHelloEvent.java b/app/src/module_room_chat/java/com/mango/moshen/room_chat/event/SendHelloEvent.java new file mode 100644 index 000000000..132651b48 --- /dev/null +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/event/SendHelloEvent.java @@ -0,0 +1,4 @@ +package com.mango.moshen.room_chat.event; + +public class SendHelloEvent { +} diff --git a/app/src/module_room_chat/java/com/mango/moshen/room_chat/event/SendHelloSuccessEvent.java b/app/src/module_room_chat/java/com/mango/moshen/room_chat/event/SendHelloSuccessEvent.java new file mode 100644 index 000000000..961447b2e --- /dev/null +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/event/SendHelloSuccessEvent.java @@ -0,0 +1,4 @@ +package com.mango.moshen.room_chat.event; + +public class SendHelloSuccessEvent { +} diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/NewbieFilterDialog.kt b/app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/NewbieFilterDialog.kt similarity index 88% rename from app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/NewbieFilterDialog.kt rename to app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/NewbieFilterDialog.kt index 72a168096..a8781f824 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/NewbieFilterDialog.kt +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/NewbieFilterDialog.kt @@ -1,10 +1,10 @@ -package com.yizhuan.tutu.room_chat.fragment +package com.mango.moshen.room_chat.fragment import android.view.Gravity import android.view.WindowManager -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogNewbieFilterBinding +import com.mango.moshen.R +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogNewbieFilterBinding class NewbieFilterDialog : BaseDialog() { 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/mango/moshen/room_chat/fragment/RoomMsgAttentionFragment.java similarity index 88% rename from app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgAttentionFragment.java rename to app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomMsgAttentionFragment.java index b78e56705..a57355874 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgAttentionFragment.java +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomMsgAttentionFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.room_chat.fragment; +package com.mango.moshen.room_chat.fragment; import android.os.Bundle; import androidx.annotation.Nullable; @@ -7,19 +7,19 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; -import com.yizhuan.tutu.room_chat.adapter.RoomMsgAttentionListAdapter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.friend.view.SelectFriendActivity; +import com.mango.moshen.room_chat.activity.NimRoomP2PMessageActivity; +import com.mango.moshen.room_chat.adapter.RoomMsgAttentionListAdapter; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.praise.event.PraiseEvent; +import com.mango.core.user.AttentionModel; +import com.mango.core.user.bean.AttentionInfo; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -31,7 +31,7 @@ import java.util.List; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; -import static com.yizhuan.erban.R.id.swipe_refresh; +import static com.mango.moshen.R.id.swipe_refresh; /** * 房间私聊用的关注界面 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/mango/moshen/room_chat/fragment/RoomMsgFansListFragment.java similarity index 89% rename from app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java rename to app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomMsgFansListFragment.java index d485c54f3..52d43e2a1 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomMsgFansListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.room_chat.fragment; +package com.mango.moshen.room_chat.fragment; import android.annotation.SuppressLint; import android.content.Context; @@ -10,20 +10,20 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; -import com.yizhuan.tutu.room_chat.adapter.RoomMsgFansViewAdapter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.SystemUidUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.room_chat.activity.NimRoomP2PMessageActivity; +import com.mango.moshen.room_chat.adapter.RoomMsgFansViewAdapter; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.praise.event.PraiseEvent; +import com.mango.core.user.AttentionModel; +import com.mango.core.user.bean.FansInfo; +import com.mango.core.user.bean.FansListInfo; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.core.utils.SystemUidUtil; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; 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/mango/moshen/room_chat/fragment/RoomMsgFriendListFragment.java similarity index 90% rename from app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFriendListFragment.java rename to app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomMsgFriendListFragment.java index 80e9d935f..4559b79ca 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFriendListFragment.java +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomMsgFriendListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.room_chat.fragment; +package com.mango.moshen.room_chat.fragment; import android.os.Bundle; import androidx.annotation.Nullable; @@ -8,18 +8,18 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.orhanobut.logger.Logger; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; -import com.yizhuan.tutu.room_chat.adapter.RoomMsgFriendListAdapter; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RelationShipEvent; -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.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.common.NoDataFragment; +import com.mango.moshen.room_chat.activity.NimRoomP2PMessageActivity; +import com.mango.moshen.room_chat.adapter.RoomMsgFriendListAdapter; +import com.mango.core.im.friend.IMFriendModel; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RelationShipEvent; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; 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/mango/moshen/room_chat/fragment/RoomMsgRecentContactsFragment.java similarity index 98% rename from app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentContactsFragment.java rename to app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomMsgRecentContactsFragment.java index 4dd4fe8c5..02fbcc8b7 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentContactsFragment.java +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomMsgRecentContactsFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.room_chat.fragment; +package com.mango.moshen.room_chat.fragment; import android.os.Bundle; @@ -30,21 +30,18 @@ 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; import com.netease.nimlib.sdk.msg.MsgServiceObserve; -import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.team.model.TeamMember; -import com.yizhuan.erban.R; -import com.yizhuan.tutu.room_chat.adapter.RoomMsgRecentContactAdapter; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.room_chat.adapter.RoomMsgRecentContactAdapter; import java.util.ArrayList; import java.util.Collections; @@ -57,8 +54,6 @@ import java.util.Set; import me.everything.android.ui.overscroll.OverScrollDecoratorHelper; -import static com.netease.nim.uikit.common.ui.dialog.CustomAlertDialog.onSeparateItemClickListener; - /** * 房间私聊用的最近联系人列表(会话列表) * 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/mango/moshen/room_chat/fragment/RoomMsgRecentListFragment.java similarity index 57% rename from app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java rename to app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomMsgRecentListFragment.java index 3e6062925..1e642ad5a 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomMsgRecentListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.room_chat.fragment; +package com.mango.moshen.room_chat.fragment; import android.annotation.SuppressLint; import android.os.Bundle; @@ -14,75 +14,33 @@ import android.widget.ImageView; import com.google.gson.Gson; import com.netease.nim.uikit.business.recent.RecentContactsCallback; -import com.netease.nimlib.sdk.msg.attachment.AudioAttachment; -import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.miniworld.activity.MWTeamRoomMessageAct; -import com.yizhuan.erban.module_hall.im.NimHelper; -import com.yizhuan.erban.ui.im.recent.TeamExt; -import com.yizhuan.tutu.room_chat.activity.NimHallTeamRoomMessageActivity; -import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; -import com.yizhuan.tutu.room_chat.activity.NimTeamRoomMessageActivity; -import com.yizhuan.tutu.room_chat.activity.RoomNewbieActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatHintAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NoticeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgVoiceAttachment; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitMeAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitMeInfo; -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.LoadLoginUserInfoEvent; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseFragment; +import com.mango.moshen.miniworld.activity.MWTeamRoomMessageAct; +import com.mango.moshen.module_hall.im.NimHelper; +import com.mango.moshen.ui.im.recent.TeamExt; +import com.mango.moshen.room_chat.activity.NimHallTeamRoomMessageActivity; +import com.mango.moshen.room_chat.activity.NimRoomP2PMessageActivity; +import com.mango.moshen.room_chat.activity.NimTeamRoomMessageActivity; +import com.mango.moshen.room_chat.activity.RoomNewbieActivity; +import com.mango.core.auth.event.LoginEvent; +import com.mango.core.initial.InitialModel; +import com.mango.core.level.UserLevelVo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.user.event.LoadLoginUserInfoEvent; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.BeanObserver; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; -import java.util.Objects; - import io.reactivex.Single; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_MINI_WORLD; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY; - /** * 房间内私聊显示用的最近聊天列表 * 发现萌新 diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieListFragment.java b/app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomNewbieListFragment.java similarity index 90% rename from app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieListFragment.java rename to app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomNewbieListFragment.java index dc5aa9cba..53a8c3407 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieListFragment.java +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomNewbieListFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.room_chat.fragment; +package com.mango.moshen.room_chat.fragment; import android.os.Bundle; import android.view.View; @@ -9,17 +9,17 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo; -import com.yizhuan.erban.avroom.presenter.RoomNewbiePresenter; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.module.IRoomNewbieView; -import com.yizhuan.tutu.room_chat.activity.RoomNewbieMessageActivity; -import com.yizhuan.tutu.room_chat.adapter.RoomNewbieListAdapter; -import com.yizhuan.tutu.room_chat.event.SendHelloSuccessEvent; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.core.bean.RoomNewbieInfo; +import com.mango.moshen.avroom.presenter.RoomNewbiePresenter; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.module.IRoomNewbieView; +import com.mango.moshen.room_chat.activity.RoomNewbieMessageActivity; +import com.mango.moshen.room_chat.adapter.RoomNewbieListAdapter; +import com.mango.moshen.room_chat.event.SendHelloSuccessEvent; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieMessageFragment.java b/app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomNewbieMessageFragment.java similarity index 89% rename from app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieMessageFragment.java rename to app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomNewbieMessageFragment.java index 34c5fd5e6..a09d5dc2e 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieMessageFragment.java +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/fragment/RoomNewbieMessageFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.room_chat.fragment; +package com.mango.moshen.room_chat.fragment; import android.os.Bundle; import android.view.View; @@ -9,18 +9,18 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo; -import com.yizhuan.erban.avroom.presenter.RoomNewbieHellowWordPresenter; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.module.IRoomNewbieMessageView; -import com.yizhuan.erban.module.RoomNewbieModel; -import com.yizhuan.tutu.room_chat.adapter.RoomNewbieMessageAdapter; -import com.yizhuan.tutu.room_chat.event.ChangeNewbieMessageEvent; -import com.yizhuan.tutu.room_chat.event.SendHelloEvent; -import com.yizhuan.tutu.room_chat.event.SendHelloSuccessEvent; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.core.bean.RoomNewbieMessageInfo; +import com.mango.moshen.avroom.presenter.RoomNewbieHellowWordPresenter; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.module.IRoomNewbieMessageView; +import com.mango.moshen.module.RoomNewbieModel; +import com.mango.moshen.room_chat.adapter.RoomNewbieMessageAdapter; +import com.mango.moshen.room_chat.event.ChangeNewbieMessageEvent; +import com.mango.moshen.room_chat.event.SendHelloEvent; +import com.mango.moshen.room_chat.event.SendHelloSuccessEvent; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/utils/InViteFansTimer.java b/app/src/module_room_chat/java/com/mango/moshen/room_chat/utils/InViteFansTimer.java similarity index 94% rename from app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/utils/InViteFansTimer.java rename to app/src/module_room_chat/java/com/mango/moshen/room_chat/utils/InViteFansTimer.java index 6c6c1f846..7f9df8cca 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/utils/InViteFansTimer.java +++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/utils/InViteFansTimer.java @@ -1,12 +1,11 @@ -package com.yizhuan.tutu.room_chat.utils; +package com.mango.moshen.room_chat.utils; import android.content.Context; import android.os.CountDownTimer; import android.text.Html; -import android.view.View; import android.widget.TextView; -import com.yizhuan.erban.R; +import com.mango.moshen.R; /** diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/TEMP.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/TEMP.java deleted file mode 100644 index 52aa8bbf0..000000000 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/TEMP.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.tutu.room_chat; - -public class TEMP { -} diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/event/ClickRootViewEvent.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/event/ClickRootViewEvent.java deleted file mode 100644 index cb5c0ba4d..000000000 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/event/ClickRootViewEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.tutu.room_chat.event; - -public class ClickRootViewEvent { -} diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/event/SendHelloEvent.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/event/SendHelloEvent.java deleted file mode 100644 index 1abe5eb98..000000000 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/event/SendHelloEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.tutu.room_chat.event; - -public class SendHelloEvent { -} diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/event/SendHelloSuccessEvent.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/event/SendHelloSuccessEvent.java deleted file mode 100644 index 84d6fa835..000000000 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/event/SendHelloSuccessEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.tutu.room_chat.event; - -public class SendHelloSuccessEvent { -} diff --git a/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/RoomSAdminManagerActivity.java b/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/RoomSAdminManagerActivity.java index 4e7b3e0b7..d25ba7cd6 100644 --- a/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/RoomSAdminManagerActivity.java +++ b/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/RoomSAdminManagerActivity.java @@ -6,25 +6,24 @@ import android.os.Bundle; import android.view.View; import com.coorchice.library.SuperTextView; -import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.RoomBlackListActivity; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.common.widget.TutuSwitchView; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.base.CancelNoToastException; -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.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -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.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.moshen.R; +import com.mango.moshen.avroom.activity.RoomBlackListActivity; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.common.widget.TutuSwitchView; +import com.mango.moshen.common.widget.dialog.DialogManager; +import com.mango.core.base.CancelNoToastException; +import com.mango.core.kick.KickModel; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.super_admin.model.ISuperAdminModel; +import com.mango.core.super_admin.model.SuperAdminModel; +import com.mango.core.super_admin.util.SaAttachmentFactory; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/utils/SaAttachmentToMsgUtil.java b/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/utils/SaAttachmentToMsgUtil.java index ac25b099e..b34de7ef3 100644 --- a/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/utils/SaAttachmentToMsgUtil.java +++ b/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/utils/SaAttachmentToMsgUtil.java @@ -4,11 +4,11 @@ import android.text.TextUtils; import android.text.style.ForegroundColorSpan; import android.widget.TextView; -import com.yizhuan.erban.avroom.widget.MessageView; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.super_admin.attachment.SuperAdminOpAttachment; -import com.yizhuan.xchat_android_core.super_admin.bean.SaOpInfo; +import com.mango.moshen.avroom.widget.MessageView; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.super_admin.attachment.SuperAdminOpAttachment; +import com.mango.core.super_admin.bean.SaOpInfo; /** * 超管自定义消息 to 公屏消息 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..03570fafe 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 @@ -5,13 +5,13 @@ android:layout_height="match_parent" android:background="@color/color_FAFAFA"> - - + - () { diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingActivity.java b/app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishRankingActivity.java similarity index 83% rename from app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingActivity.java rename to app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishRankingActivity.java index f1ccd4998..a78fc1bfb 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingActivity.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishRankingActivity.java @@ -1,24 +1,22 @@ -package com.yizhuan.erban.shipantics; +package com.mango.moshen.shipantics; import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.widget.ImageView; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; import com.flyco.tablayout.SlidingTabLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.common.ViewPagerAdapter; -import com.yizhuan.erban.decoration.view.widgets.CarMagicIndicator; -import com.yizhuan.tutu.room_chat.event.ClickRootViewEvent; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.treasure_box.event.RefreshBoxRankingEvent; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.common.ViewPagerAdapter; +import com.mango.moshen.decoration.view.widgets.CarMagicIndicator; +import com.mango.moshen.room_chat.event.ClickRootViewEvent; +import com.mango.core.home.bean.TabInfo; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingFragment.java b/app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishRankingFragment.java similarity index 90% rename from app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingFragment.java rename to app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishRankingFragment.java index b6acbffec..1eb80ce13 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingFragment.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishRankingFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.shipantics; +package com.mango.moshen.shipantics; import android.os.Bundle; import android.view.View; @@ -9,13 +9,12 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.treasure_box.adapter.BoxRankingListAdapter; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; -import com.yizhuan.xchat_android_core.room.treasure_box.event.RefreshBoxRankingEvent; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.core.room.treasure_box.bean.BoxRankingInfo; +import com.mango.core.room.treasure_box.event.RefreshBoxRankingEvent; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingListAdapter.java b/app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishRankingListAdapter.java similarity index 91% rename from app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingListAdapter.java rename to app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishRankingListAdapter.java index 53807e76f..af27402de 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingListAdapter.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishRankingListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.shipantics; +package com.mango.moshen.shipantics; import android.content.Context; import android.view.View; @@ -7,9 +7,9 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadKt; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadKt; +import com.mango.core.room.treasure_box.bean.BoxRankingInfo; /** * @author jack diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingPresenter.java b/app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishRankingPresenter.java similarity index 86% rename from app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingPresenter.java rename to app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishRankingPresenter.java index 3fcaa7ecc..eb325435f 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingPresenter.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishRankingPresenter.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.shipantics; +package com.mango.moshen.shipantics; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.treasure_box.model.RadishModel; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.treasure_box.model.RadishModel; +import com.mango.core.Constants; +import com.mango.core.room.treasure_box.bean.BoxRankingInfo; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishResultDialog.kt b/app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishResultDialog.kt similarity index 84% rename from app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishResultDialog.kt rename to app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishResultDialog.kt index f8774040f..9efcdf04a 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishResultDialog.kt +++ b/app/src/module_treasure_box/java/com/mango/moshen/shipantics/RadishResultDialog.kt @@ -1,21 +1,19 @@ -package com.yizhuan.erban.shipantics +package com.mango.moshen.shipantics import android.os.Bundle -import android.view.WindowManager import android.widget.ImageView import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder -import com.yizhuan.erban.R -import com.yizhuan.erban.base.BaseDialog -import com.yizhuan.erban.databinding.DialogRadishResultBinding -import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.erban.ui.utils.load -import com.yizhuan.treasure_box.bean.OpenBoxResult -import com.yizhuan.treasure_box.bean.PrizeInfo -import com.yizhuan.xchat_android_core.DemoCache +import com.mango.moshen.R +import com.mango.moshen.base.BaseDialog +import com.mango.moshen.databinding.DialogRadishResultBinding +import com.mango.moshen.ui.utils.RVDelegate +import com.mango.moshen.ui.utils.load +import com.mango.treasure_box.bean.OpenBoxResult +import com.mango.treasure_box.bean.PrizeInfo class RadishResultDialog : BaseDialog() { diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxRankingActivity.java b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/BoxRankingActivity.java similarity index 83% rename from app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxRankingActivity.java rename to app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/BoxRankingActivity.java index 01ed41d7f..b66800388 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxRankingActivity.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/BoxRankingActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.treasure_box.activity; +package com.mango.moshen.treasure_box.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -10,16 +10,16 @@ import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; import com.flyco.tablayout.SlidingTabLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.common.ViewPagerAdapter; -import com.yizhuan.erban.decoration.view.widgets.CarMagicIndicator; -import com.yizhuan.xchat_android_core.room.treasure_box.event.RefreshBoxRankingEvent; -import com.yizhuan.erban.treasure_box.fragment.BoxRankingFragment; -import com.yizhuan.tutu.room_chat.event.ClickRootViewEvent; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseActivity; +import com.mango.moshen.common.ViewPagerAdapter; +import com.mango.moshen.decoration.view.widgets.CarMagicIndicator; +import com.mango.core.room.treasure_box.event.RefreshBoxRankingEvent; +import com.mango.moshen.treasure_box.fragment.BoxRankingFragment; +import com.mango.moshen.room_chat.event.ClickRootViewEvent; +import com.mango.core.home.bean.TabInfo; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxActivity.java similarity index 91% rename from app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java rename to app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxActivity.java index 77d42eab9..bf06ebe8c 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.treasure_box.activity; +package com.mango.moshen.treasure_box.activity; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -20,27 +20,27 @@ import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.databinding.ActivityTreasureBoxBinding; -import com.yizhuan.erban.treasure_box.widget.dialog.BoxMoreDialog; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.webview.DialogWebViewActivity; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.treasure_box.bean.PrizeInfo; -import com.yizhuan.treasure_box.model.BoxModel; -import com.yizhuan.treasure_box.model.IBoxModel; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.utils.StringUtils; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.databinding.ActivityTreasureBoxBinding; +import com.mango.moshen.treasure_box.widget.dialog.BoxMoreDialog; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.webview.DialogWebViewActivity; +import com.mango.moshen.utils.UserUtils; +import com.mango.treasure_box.bean.PrizeInfo; +import com.mango.treasure_box.model.BoxModel; +import com.mango.treasure_box.model.IBoxModel; +import com.mango.core.DemoCache; +import com.mango.core.UriProvider; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.pay.PayModel; +import com.mango.core.pay.bean.WalletInfo; +import com.mango.core.utils.StringUtils; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.TextWatcherWrapper; import java.util.ArrayList; import java.util.concurrent.TimeUnit; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxHonourActivity.java similarity index 90% rename from app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java rename to app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxHonourActivity.java index abddbe640..c6553bfef 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxHonourActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.treasure_box.activity; +package com.mango.moshen.treasure_box.activity; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -20,26 +20,26 @@ import android.widget.TextView; import com.netease.nim.uikit.StatusBarUtil; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.databinding.ActivityTreasureBoxHonourBinding; -import com.yizhuan.erban.treasure_box.widget.dialog.BoxMoreDialog; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.webview.DialogWebViewActivity; -import com.yizhuan.treasure_box.bean.PrizeInfo; -import com.yizhuan.treasure_box.model.BoxModel; -import com.yizhuan.treasure_box.model.IBoxModel; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.utils.StringUtils; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseBindingActivity; +import com.mango.moshen.databinding.ActivityTreasureBoxHonourBinding; +import com.mango.moshen.treasure_box.widget.dialog.BoxMoreDialog; +import com.mango.moshen.ui.utils.ImageLoadUtils; +import com.mango.moshen.ui.webview.DialogWebViewActivity; +import com.mango.treasure_box.bean.PrizeInfo; +import com.mango.treasure_box.model.BoxModel; +import com.mango.treasure_box.model.IBoxModel; +import com.mango.core.DemoCache; +import com.mango.core.UriProvider; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.pay.PayModel; +import com.mango.core.pay.bean.WalletInfo; +import com.mango.core.utils.StringUtils; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.FormatUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.TextWatcherWrapper; import java.util.ArrayList; import java.util.concurrent.TimeUnit; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/adapter/BoxRankingListAdapter.java b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/adapter/BoxRankingListAdapter.java similarity index 91% rename from app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/adapter/BoxRankingListAdapter.java rename to app/src/module_treasure_box/java/com/mango/moshen/treasure_box/adapter/BoxRankingListAdapter.java index 8fe28b0d7..4c5c9a715 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/adapter/BoxRankingListAdapter.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/adapter/BoxRankingListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.treasure_box.adapter; +package com.mango.moshen.treasure_box.adapter; import android.content.Context; import android.view.View; @@ -7,9 +7,9 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadKt; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; +import com.mango.moshen.R; +import com.mango.moshen.ui.utils.ImageLoadKt; +import com.mango.core.room.treasure_box.bean.BoxRankingInfo; /** * @author jack diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/BoxRankingFragment.java b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/fragment/BoxRankingFragment.java similarity index 88% rename from app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/BoxRankingFragment.java rename to app/src/module_treasure_box/java/com/mango/moshen/treasure_box/fragment/BoxRankingFragment.java index 8e95edfe6..d3d2320a8 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/BoxRankingFragment.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/fragment/BoxRankingFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.treasure_box.fragment; +package com.mango.moshen.treasure_box.fragment; import android.os.Bundle; import android.view.View; @@ -9,15 +9,15 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.treasure_box.adapter.BoxRankingListAdapter; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; -import com.yizhuan.xchat_android_core.room.treasure_box.event.RefreshBoxRankingEvent; -import com.yizhuan.erban.treasure_box.module.IBoxRankingView; -import com.yizhuan.erban.treasure_box.presenter.BoxRankingPresenter; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.moshen.R; +import com.mango.moshen.base.BaseMvpFragment; +import com.mango.moshen.treasure_box.adapter.BoxRankingListAdapter; +import com.mango.core.room.treasure_box.bean.BoxRankingInfo; +import com.mango.core.room.treasure_box.event.RefreshBoxRankingEvent; +import com.mango.moshen.treasure_box.module.IBoxRankingView; +import com.mango.moshen.treasure_box.presenter.BoxRankingPresenter; +import com.mango.xchat_android_library.base.factory.CreatePresenter; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; 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/mango/moshen/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java similarity index 87% rename from app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java rename to app/src/module_treasure_box/java/com/mango/moshen/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java index 0680cd5cd..7b389fc7f 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java @@ -1,15 +1,13 @@ -package com.yizhuan.erban.treasure_box.fragment; +package com.mango.moshen.treasure_box.fragment; import android.app.Dialog; import android.os.Bundle; -import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.Window; -import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; @@ -18,19 +16,13 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.fragment.app.DialogFragment; import com.coorchice.library.utils.LogUtils; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.webview.DialogWebViewActivity; -import com.yizhuan.treasure_box.bean.BoxOpenStatusInfo; -import com.yizhuan.treasure_box.model.BoxModel; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_library.utils.LogUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; +import com.mango.moshen.R; +import com.mango.moshen.ui.webview.DialogWebViewActivity; +import com.mango.core.UriProvider; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.xchat_android_library.utils.TimeUtils; public class ChooseTreasureBoxDialogFragment extends DialogFragment implements View.OnClickListener { diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/module/BoxRankingModel.java b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/module/BoxRankingModel.java similarity index 75% rename from app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/module/BoxRankingModel.java rename to app/src/module_treasure_box/java/com/mango/moshen/treasure_box/module/BoxRankingModel.java index 6ca4fad48..4c7f32e9f 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/module/BoxRankingModel.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/module/BoxRankingModel.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.treasure_box.module; +package com.mango.moshen.treasure_box.module; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.CommunityConstant; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.room.treasure_box.bean.BoxRankingInfo; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.community.CommunityConstant; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import retrofit2.http.GET; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/module/IBoxRankingView.java b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/module/IBoxRankingView.java similarity index 59% rename from app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/module/IBoxRankingView.java rename to app/src/module_treasure_box/java/com/mango/moshen/treasure_box/module/IBoxRankingView.java index 75b8113d1..95e8f5935 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/module/IBoxRankingView.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/module/IBoxRankingView.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.treasure_box.module; +package com.mango.moshen.treasure_box.module; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.room.treasure_box.bean.BoxRankingInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; public interface IBoxRankingView extends IMvpBaseView { void getBoxRankingSuccess(BoxRankingInfo list); diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/presenter/BoxRankingPresenter.java b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/presenter/BoxRankingPresenter.java similarity index 83% rename from app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/presenter/BoxRankingPresenter.java rename to app/src/module_treasure_box/java/com/mango/moshen/treasure_box/presenter/BoxRankingPresenter.java index 7b39c6709..ceb5f43e9 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/presenter/BoxRankingPresenter.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/presenter/BoxRankingPresenter.java @@ -1,10 +1,10 @@ -package com.yizhuan.erban.treasure_box.presenter; +package com.mango.moshen.treasure_box.presenter; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; -import com.yizhuan.erban.treasure_box.module.BoxRankingModel; -import com.yizhuan.erban.treasure_box.module.IBoxRankingView; -import com.yizhuan.xchat_android_core.Constants; +import com.mango.moshen.base.BaseMvpPresenter; +import com.mango.core.room.treasure_box.bean.BoxRankingInfo; +import com.mango.moshen.treasure_box.module.BoxRankingModel; +import com.mango.moshen.treasure_box.module.IBoxRankingView; +import com.mango.core.Constants; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/widget/GoldBoxHelper.java similarity index 79% rename from app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java rename to app/src/module_treasure_box/java/com/mango/moshen/treasure_box/widget/GoldBoxHelper.java index ad549b148..4a39ac084 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/widget/GoldBoxHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.treasure_box.widget; +package com.mango.moshen.treasure_box.widget; import android.content.Context; @@ -6,21 +6,21 @@ import androidx.annotation.Nullable; import androidx.fragment.app.FragmentActivity; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.treasure_box.activity.TreasureBoxActivity; -import com.yizhuan.erban.treasure_box.activity.TreasureBoxHonourActivity; -import com.yizhuan.erban.treasure_box.fragment.ChooseTreasureBoxDialogFragment; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -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.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.moshen.treasure_box.activity.TreasureBoxActivity; +import com.mango.moshen.treasure_box.activity.TreasureBoxHonourActivity; +import com.mango.moshen.treasure_box.fragment.ChooseTreasureBoxDialogFragment; +import com.mango.core.initial.InitialModel; +import com.mango.core.initial.bean.InitInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.market_verify.MarketVerifyModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.TimeUtils; import io.reactivex.Single; 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/mango/moshen/treasure_box/widget/dialog/BaseBindingDialog.java similarity index 95% rename from app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BaseBindingDialog.java rename to app/src/module_treasure_box/java/com/mango/moshen/treasure_box/widget/dialog/BaseBindingDialog.java index d86d93fd7..83dda698f 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/mango/moshen/treasure_box/widget/dialog/BaseBindingDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.treasure_box.widget.dialog; +package com.mango.moshen.treasure_box.widget.dialog; import android.content.Context; import androidx.databinding.DataBindingUtil; @@ -14,7 +14,7 @@ import android.view.Window; import android.view.WindowManager; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.annatation.ActLayoutRes; /** * Created by huangmeng1 on 2018/4/12. diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxMoreDialog.java b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/widget/dialog/BoxMoreDialog.java similarity index 82% rename from app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxMoreDialog.java rename to app/src/module_treasure_box/java/com/mango/moshen/treasure_box/widget/dialog/BoxMoreDialog.java index bf10b0d2a..8f92d5212 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxMoreDialog.java +++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/widget/dialog/BoxMoreDialog.java @@ -1,19 +1,18 @@ -package com.yizhuan.erban.treasure_box.widget.dialog; +package com.mango.moshen.treasure_box.widget.dialog; import android.content.Context; import android.view.Gravity; -import android.view.View; import android.view.Window; import android.view.WindowManager; -import com.yizhuan.erban.R; -import com.yizhuan.erban.databinding.DialogBoxMoreBinding; -import com.yizhuan.erban.ui.webview.DialogWebViewActivity; -import com.yizhuan.erban.utils.UserUtils; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.databinding.DialogBoxMoreBinding; +import com.mango.moshen.ui.webview.DialogWebViewActivity; +import com.mango.moshen.utils.UserUtils; +import com.mango.core.DemoCache; +import com.mango.core.UriProvider; +import com.mango.xchat_android_library.annatation.ActLayoutRes; +import com.mango.xchat_android_library.utils.SingleToastUtil; @ActLayoutRes(R.layout.dialog_box_more) public class BoxMoreDialog extends BaseBindingDialog { 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 0518031ad..53b06cd64 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 @@ -20,11 +20,11 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.orhanobut.logger.Logger; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo; -import com.yizhuan.xchat_android_core.upgrade.model.UpgradeModel; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.moshen.R; +import com.mango.moshen.ui.widget.magicindicator.buildins.UIUtil; +import com.mango.core.upgrade.bean.NewestVersionInfo; +import com.mango.core.upgrade.model.UpgradeModel; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.io.File; diff --git a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeDataMrg.java b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeDataMrg.java index 403a67ff3..e3e3caee8 100644 --- a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeDataMrg.java +++ b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeDataMrg.java @@ -4,9 +4,9 @@ import android.text.TextUtils; import com.google.gson.Gson; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.xchat_android_core.upgrade.bean.UpgradeCache; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_library.utils.TimeUtils; +import com.mango.core.upgrade.bean.UpgradeCache; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.xchat_android_library.utils.TimeUtils; import java.util.Objects; diff --git a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java index 16ceb966f..7d465a769 100644 --- a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java +++ b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java @@ -4,11 +4,11 @@ import android.annotation.SuppressLint; import com.trello.rxlifecycle3.android.ActivityEvent; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo; -import com.yizhuan.xchat_android_core.upgrade.bean.UpgradeCache; -import com.yizhuan.xchat_android_core.upgrade.model.UpgradeModel; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.core.upgrade.bean.NewestVersionInfo; +import com.mango.core.upgrade.bean.UpgradeCache; +import com.mango.core.upgrade.model.UpgradeModel; +import com.mango.core.utils.ActivityUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; /** * @author jack diff --git a/app/src/test/java/com/yizhuan/erban/ExampleUnitTest.java b/app/src/test/java/com/mango/moshen/ExampleUnitTest.java similarity index 97% rename from app/src/test/java/com/yizhuan/erban/ExampleUnitTest.java rename to app/src/test/java/com/mango/moshen/ExampleUnitTest.java index 7a8ae30ce..13c676a2e 100644 --- a/app/src/test/java/com/yizhuan/erban/ExampleUnitTest.java +++ b/app/src/test/java/com/mango/moshen/ExampleUnitTest.java @@ -1,9 +1,4 @@ -package com.yizhuan.erban; - -import android.text.TextUtils; - -import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.utils.EmojiUtil; +package com.mango.moshen; import org.junit.Test; @@ -20,11 +15,9 @@ import io.reactivex.Single; import io.reactivex.SingleEmitter; import io.reactivex.SingleObserver; import io.reactivex.SingleOnSubscribe; -import io.reactivex.SingleSource; import io.reactivex.disposables.Disposable; import io.reactivex.functions.Action; import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; import io.reactivex.schedulers.Schedulers; import static org.junit.Assert.*; diff --git a/library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java b/core/src/androidTest/java/com/mango/core/ExampleInstrumentedTest.java similarity index 83% rename from library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java rename to core/src/androidTest/java/com/mango/core/ExampleInstrumentedTest.java index c872788b5..ac55baf0b 100644 --- a/library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java +++ b/core/src/androidTest/java/com/mango/core/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library; +package com.mango.core; import android.content.Context; import androidx.test.platform.app.InstrumentationRegistry; @@ -21,6 +21,6 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("com.yizhuan.xchat_android_library", appContext.getPackageName()); + assertEquals("com.moshen.core.test", appContext.getPackageName()); } } diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java b/core/src/diff_src_erban/java/com/mango/core/UriProvider.java similarity index 99% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java rename to core/src/diff_src_erban/java/com/mango/core/UriProvider.java index e98a65ba9..935ff9dd0 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java +++ b/core/src/diff_src_erban/java/com/mango/core/UriProvider.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core; +package com.mango.core; import android.text.TextUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; +import com.mango.core.manager.AvRoomDataManager; /** * 请求接口接口地址 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/AudioModel.java b/core/src/diff_src_erban/java/com/mango/core/audio/AudioModel.java similarity index 89% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/AudioModel.java rename to core/src/diff_src_erban/java/com/mango/core/audio/AudioModel.java index 99aca030b..195d52eb9 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/AudioModel.java +++ b/core/src/diff_src_erban/java/com/mango/core/audio/AudioModel.java @@ -1,16 +1,16 @@ -package com.yizhuan.xchat_android_core.audio; +package com.mango.core.audio; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.audio.bean.HistoryVoiceInfo; -import com.yizhuan.xchat_android_core.audio.bean.SaveVoiceSuccessResultInfo; -import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo; -import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo; -import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.audio.bean.HistoryVoiceInfo; +import com.mango.core.audio.bean.SaveVoiceSuccessResultInfo; +import com.mango.core.audio.bean.UserVoiceInfo; +import com.mango.core.audio.bean.VoiceCardInfo; +import com.mango.core.audio.bean.VoiceMatchInfo; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.ArrayList; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/IAudioModel.java b/core/src/diff_src_erban/java/com/mango/core/audio/IAudioModel.java similarity index 82% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/IAudioModel.java rename to core/src/diff_src_erban/java/com/mango/core/audio/IAudioModel.java index a37a159a0..bb5a8a4ba 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/IAudioModel.java +++ b/core/src/diff_src_erban/java/com/mango/core/audio/IAudioModel.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.audio; +package com.mango.core.audio; -import com.yizhuan.xchat_android_core.audio.bean.HistoryVoiceInfo; -import com.yizhuan.xchat_android_core.audio.bean.SaveVoiceSuccessResultInfo; -import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo; -import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo; -import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo; -import com.yizhuan.xchat_android_core.base.IModel; +import com.mango.core.audio.bean.HistoryVoiceInfo; +import com.mango.core.audio.bean.SaveVoiceSuccessResultInfo; +import com.mango.core.audio.bean.UserVoiceInfo; +import com.mango.core.audio.bean.VoiceCardInfo; +import com.mango.core.audio.bean.VoiceMatchInfo; +import com.mango.core.base.IModel; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/HistoryVoiceInfo.java b/core/src/diff_src_erban/java/com/mango/core/audio/bean/HistoryVoiceInfo.java similarity index 98% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/HistoryVoiceInfo.java rename to core/src/diff_src_erban/java/com/mango/core/audio/bean/HistoryVoiceInfo.java index f2dba8d0e..75cb509a1 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/HistoryVoiceInfo.java +++ b/core/src/diff_src_erban/java/com/mango/core/audio/bean/HistoryVoiceInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.bean; +package com.mango.core.audio.bean; /** * 查询旧版本个人介绍声音 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/SaveVoiceSuccessResultInfo.java b/core/src/diff_src_erban/java/com/mango/core/audio/bean/SaveVoiceSuccessResultInfo.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/SaveVoiceSuccessResultInfo.java rename to core/src/diff_src_erban/java/com/mango/core/audio/bean/SaveVoiceSuccessResultInfo.java index 0e9732abf..4b5d7119d 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/SaveVoiceSuccessResultInfo.java +++ b/core/src/diff_src_erban/java/com/mango/core/audio/bean/SaveVoiceSuccessResultInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.bean; +package com.mango.core.audio.bean; /** * 保存声音成功时 接口返回的声音信息 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/UserVoiceInfo.java b/core/src/diff_src_erban/java/com/mango/core/audio/bean/UserVoiceInfo.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/UserVoiceInfo.java rename to core/src/diff_src_erban/java/com/mango/core/audio/bean/UserVoiceInfo.java index 656bfd303..701819ed1 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/UserVoiceInfo.java +++ b/core/src/diff_src_erban/java/com/mango/core/audio/bean/UserVoiceInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.bean; +package com.mango.core.audio.bean; /** * 我的声音列表 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/VoiceCardInfo.java b/core/src/diff_src_erban/java/com/mango/core/audio/bean/VoiceCardInfo.java similarity index 95% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/VoiceCardInfo.java rename to core/src/diff_src_erban/java/com/mango/core/audio/bean/VoiceCardInfo.java index 7483a3559..67275393d 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/VoiceCardInfo.java +++ b/core/src/diff_src_erban/java/com/mango/core/audio/bean/VoiceCardInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.bean; +package com.mango.core.audio.bean; /** * 声音卡片的信息 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/VoiceMatchInfo.java b/core/src/diff_src_erban/java/com/mango/core/audio/bean/VoiceMatchInfo.java similarity index 94% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/VoiceMatchInfo.java rename to core/src/diff_src_erban/java/com/mango/core/audio/bean/VoiceMatchInfo.java index a7b819472..3abc1832b 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/VoiceMatchInfo.java +++ b/core/src/diff_src_erban/java/com/mango/core/audio/bean/VoiceMatchInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.bean; +package com.mango.core.audio.bean; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/channel/ChannelModel.java b/core/src/diff_src_erban/java/com/mango/core/channel/ChannelModel.java similarity index 85% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/channel/ChannelModel.java rename to core/src/diff_src_erban/java/com/mango/core/channel/ChannelModel.java index 8df574a15..834541677 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/channel/ChannelModel.java +++ b/core/src/diff_src_erban/java/com/mango/core/channel/ChannelModel.java @@ -1,13 +1,12 @@ -package com.yizhuan.xchat_android_core.channel; +package com.mango.core.channel; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -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_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.user.event.CurrentUserInfoCompleteEvent; +import com.mango.xchat_android_library.utils.AppMetaDataUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/core/src/diff_src_erban/java/com/mango/core/channel/IChannelModel.java b/core/src/diff_src_erban/java/com/mango/core/channel/IChannelModel.java new file mode 100644 index 000000000..f05b5e922 --- /dev/null +++ b/core/src/diff_src_erban/java/com/mango/core/channel/IChannelModel.java @@ -0,0 +1,6 @@ +package com.mango.core.channel; + +import com.mango.core.base.IModel; + +public interface IChannelModel extends IModel { +} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/helper/AtProxy.java b/core/src/diff_src_erban/java/com/mango/core/helper/AtProxy.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/helper/AtProxy.java rename to core/src/diff_src_erban/java/com/mango/core/helper/AtProxy.java index 47b0c0086..98f84307a 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/helper/AtProxy.java +++ b/core/src/diff_src_erban/java/com/mango/core/helper/AtProxy.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.helper; +package com.mango.core.helper; import android.widget.EditText; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/helper/ImHelperUtils.java b/core/src/diff_src_erban/java/com/mango/core/helper/ImHelperUtils.java similarity index 73% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/helper/ImHelperUtils.java rename to core/src/diff_src_erban/java/com/mango/core/helper/ImHelperUtils.java index a34d00527..706005310 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/helper/ImHelperUtils.java +++ b/core/src/diff_src_erban/java/com/mango/core/helper/ImHelperUtils.java @@ -1,26 +1,26 @@ -package com.yizhuan.xchat_android_core.helper; +package com.mango.core.helper; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_NOTICE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY; import androidx.annotation.NonNull; @@ -34,26 +34,26 @@ import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.netease.nimlib.sdk.msg.attachment.NotificationAttachment; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.RecentContact; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarveUpGoldThirdLevelAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatHintAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ImTipAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NoticeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgVoiceAttachment; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitMeAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitMeInfo; +import com.mango.core.auth.AuthModel; +import com.mango.core.community.im.WorldDynamicAttachment; +import com.mango.core.im.custom.bean.AssistantAttachment; +import com.mango.core.im.custom.bean.CarAttachment; +import com.mango.core.im.custom.bean.CarveUpGoldThirdLevelAttachment; +import com.mango.core.im.custom.bean.ChatHintAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.ImTipAttachment; +import com.mango.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.mango.core.im.custom.bean.MatchAttachment; +import com.mango.core.im.custom.bean.NewbieHelloAttachment; +import com.mango.core.im.custom.bean.NobleAttachment; +import com.mango.core.im.custom.bean.NoticeAttachment; +import com.mango.core.im.custom.bean.RedPacketAttachment; +import com.mango.core.im.custom.bean.SysMsgVoiceAttachment; +import com.mango.core.luckymoney.LuckyMoneyInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.public_chat_hall.attachment.AitMeAttachment; +import com.mango.core.public_chat_hall.bean.AitMeInfo; import java.util.ArrayList; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeTabMapView.java b/core/src/diff_src_erban/java/com/mango/core/home/IHomeTabMapView.java similarity index 63% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeTabMapView.java rename to core/src/diff_src_erban/java/com/mango/core/home/IHomeTabMapView.java index ffc56d351..0a8ad8d38 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeTabMapView.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/IHomeTabMapView.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.home; +package com.mango.core.home; -import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.home.bean.HomeTabMapInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/BannerInfo.java b/core/src/diff_src_erban/java/com/mango/core/home/bean/BannerInfo.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/BannerInfo.java rename to core/src/diff_src_erban/java/com/mango/core/home/bean/BannerInfo.java index ed3d1fce5..b9e8becb6 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/BannerInfo.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/bean/BannerInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.mango.core.home.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CollectionRoomInfo.java b/core/src/diff_src_erban/java/com/mango/core/home/bean/CollectionRoomInfo.java similarity index 94% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CollectionRoomInfo.java rename to core/src/diff_src_erban/java/com/mango/core/home/bean/CollectionRoomInfo.java index a9cbe3551..81baf539d 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CollectionRoomInfo.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/bean/CollectionRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.mango.core.home.bean; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeConcernsInfo.java b/core/src/diff_src_erban/java/com/mango/core/home/bean/HomeConcernsInfo.java similarity index 83% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeConcernsInfo.java rename to core/src/diff_src_erban/java/com/mango/core/home/bean/HomeConcernsInfo.java index 859a71544..ee0589ae6 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeConcernsInfo.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/bean/HomeConcernsInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.mango.core.home.bean; import java.io.Serializable; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeRoomInfo.java b/core/src/diff_src_erban/java/com/mango/core/home/bean/HomeRoomInfo.java similarity index 96% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeRoomInfo.java rename to core/src/diff_src_erban/java/com/mango/core/home/bean/HomeRoomInfo.java index f4ed70e0f..ccd220b80 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeRoomInfo.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/bean/HomeRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.mango.core.home.bean; import android.text.TextUtils; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java b/core/src/diff_src_erban/java/com/mango/core/home/bean/HomeTabMapInfo.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java rename to core/src/diff_src_erban/java/com/mango/core/home/bean/HomeTabMapInfo.java index d6ff5f2ac..65ef7dfcb 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/bean/HomeTabMapInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.mango.core.home.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTagInfo.java b/core/src/diff_src_erban/java/com/mango/core/home/bean/HomeTagInfo.java similarity index 92% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTagInfo.java rename to core/src/diff_src_erban/java/com/mango/core/home/bean/HomeTagInfo.java index 12c1729d5..d25e4bf93 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTagInfo.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/bean/HomeTagInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.mango.core.home.bean; public class HomeTagInfo { diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MainTabInfo.kt b/core/src/diff_src_erban/java/com/mango/core/home/bean/MainTabInfo.kt similarity index 79% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MainTabInfo.kt rename to core/src/diff_src_erban/java/com/mango/core/home/bean/MainTabInfo.kt index badbb6940..52ba6cc93 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MainTabInfo.kt +++ b/core/src/diff_src_erban/java/com/mango/core/home/bean/MainTabInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean +package com.mango.core.home.bean data class MainTabInfo( val tabIcon: String = "", diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MainTabType.java b/core/src/diff_src_erban/java/com/mango/core/home/bean/MainTabType.java similarity index 82% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MainTabType.java rename to core/src/diff_src_erban/java/com/mango/core/home/bean/MainTabType.java index 56aa7939f..435a5a44b 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MainTabType.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/bean/MainTabType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.mango.core.home.bean; public interface MainTabType { //tabType(1-派对，2-广场，3-赛事，4-消息，5-我的) diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MicUsersBean.java b/core/src/diff_src_erban/java/com/mango/core/home/bean/MicUsersBean.java similarity index 85% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MicUsersBean.java rename to core/src/diff_src_erban/java/com/mango/core/home/bean/MicUsersBean.java index b4d216349..bb93b97f9 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MicUsersBean.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/bean/MicUsersBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.mango.core.home.bean; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/ResourceInfo.kt b/core/src/diff_src_erban/java/com/mango/core/home/bean/ResourceInfo.kt similarity index 81% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/ResourceInfo.kt rename to core/src/diff_src_erban/java/com/mango/core/home/bean/ResourceInfo.kt index 128ca20cb..ef54034cc 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/ResourceInfo.kt +++ b/core/src/diff_src_erban/java/com/mango/core/home/bean/ResourceInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean +package com.mango.core.home.bean data class ResourceInfo( val icon: String? = null, diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/TabInfo.java b/core/src/diff_src_erban/java/com/mango/core/home/bean/TabInfo.java similarity index 98% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/TabInfo.java rename to core/src/diff_src_erban/java/com/mango/core/home/bean/TabInfo.java index 63bc1783f..cee938e6a 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/TabInfo.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/bean/TabInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.mango.core.home.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/TagListInfo.java b/core/src/diff_src_erban/java/com/mango/core/home/bean/TagListInfo.java similarity index 79% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/TagListInfo.java rename to core/src/diff_src_erban/java/com/mango/core/home/bean/TagListInfo.java index c56f81d47..b93133e35 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/TagListInfo.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/bean/TagListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.mango.core.home.bean; import java.io.Serializable; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/VisitorInfo.kt b/core/src/diff_src_erban/java/com/mango/core/home/bean/VisitorInfo.kt similarity index 80% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/VisitorInfo.kt rename to core/src/diff_src_erban/java/com/mango/core/home/bean/VisitorInfo.kt index 9021a8212..865879feb 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/VisitorInfo.kt +++ b/core/src/diff_src_erban/java/com/mango/core/home/bean/VisitorInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean +package com.mango.core.home.bean data class VisitorInfo( val avatar: String? = null, diff --git a/core/src/diff_src_erban/java/com/mango/core/home/event/FollowRoomEvent.java b/core/src/diff_src_erban/java/com/mango/core/home/event/FollowRoomEvent.java new file mode 100644 index 000000000..6d3a0abb3 --- /dev/null +++ b/core/src/diff_src_erban/java/com/mango/core/home/event/FollowRoomEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.home.event; + +public class FollowRoomEvent { +} diff --git a/core/src/diff_src_erban/java/com/mango/core/home/event/RefreshHomeDataEvent.java b/core/src/diff_src_erban/java/com/mango/core/home/event/RefreshHomeDataEvent.java new file mode 100644 index 000000000..d105a35b1 --- /dev/null +++ b/core/src/diff_src_erban/java/com/mango/core/home/event/RefreshHomeDataEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.home.event; + +public class RefreshHomeDataEvent { +} diff --git a/core/src/diff_src_erban/java/com/mango/core/home/event/ShareRoomEvent.java b/core/src/diff_src_erban/java/com/mango/core/home/event/ShareRoomEvent.java new file mode 100644 index 000000000..e2a869375 --- /dev/null +++ b/core/src/diff_src_erban/java/com/mango/core/home/event/ShareRoomEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.home.event; + +public class ShareRoomEvent { +} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/VisitorUnreadCountEvent.java b/core/src/diff_src_erban/java/com/mango/core/home/event/VisitorUnreadCountEvent.java similarity index 74% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/VisitorUnreadCountEvent.java rename to core/src/diff_src_erban/java/com/mango/core/home/event/VisitorUnreadCountEvent.java index d8fd75801..7f6080b0f 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/VisitorUnreadCountEvent.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/event/VisitorUnreadCountEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.event; +package com.mango.core.home.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CollectionRoomModel.java b/core/src/diff_src_erban/java/com/mango/core/home/model/CollectionRoomModel.java similarity index 87% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CollectionRoomModel.java rename to core/src/diff_src_erban/java/com/mango/core/home/model/CollectionRoomModel.java index 97f172861..c01566287 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CollectionRoomModel.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/model/CollectionRoomModel.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.home.model; +package com.mango.core.home.model; -import com.yizhuan.xchat_android_core.home.bean.CollectionRoomInfo; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.home.bean.CollectionRoomInfo; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import io.reactivex.SingleSource; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CommunityNoticeModel.java b/core/src/diff_src_erban/java/com/mango/core/home/model/CommunityNoticeModel.java similarity index 89% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CommunityNoticeModel.java rename to core/src/diff_src_erban/java/com/mango/core/home/model/CommunityNoticeModel.java index eecf0052b..776133874 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CommunityNoticeModel.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/model/CommunityNoticeModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.home.model; +package com.mango.core.home.model; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.community.bean.CommunityNoticeInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java b/core/src/diff_src_erban/java/com/mango/core/home/model/GameHomeModel.java similarity index 83% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java rename to core/src/diff_src_erban/java/com/mango/core/home/model/GameHomeModel.java index 230417359..a624acfa0 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/model/GameHomeModel.java @@ -1,14 +1,14 @@ -package com.yizhuan.xchat_android_core.home.model; +package com.mango.core.home.model; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.CommunityConstant; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.community.CommunityConstant; +import com.mango.core.home.bean.BannerInfo; +import com.mango.core.home.bean.HomeRoomInfo; +import com.mango.core.home.bean.HomeTabMapInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.kt b/core/src/diff_src_erban/java/com/mango/core/home/model/HomeModel.kt similarity index 91% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.kt rename to core/src/diff_src_erban/java/com/mango/core/home/model/HomeModel.kt index 9cdc2f593..688af613b 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.kt +++ b/core/src/diff_src_erban/java/com/mango/core/home/model/HomeModel.kt @@ -1,20 +1,20 @@ -package com.yizhuan.xchat_android_core.home.model +package com.mango.core.home.model -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.community.CommunityConstant -import com.yizhuan.xchat_android_core.community.bean.UnReadCountInfo -import com.yizhuan.xchat_android_core.home.bean.* -import com.yizhuan.xchat_android_core.room.bean.AnchorInfo -import com.yizhuan.xchat_android_core.room.bean.HomeLiveTopInfo -import com.yizhuan.xchat_android_core.room.bean.MeCenterInfo -import com.yizhuan.xchat_android_core.room.bean.SingleRoomSortInfo -import com.yizhuan.xchat_android_core.room.game.GameInfo -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.utils.net.RxHelper -import com.yizhuan.xchat_android_core.utils.net.launchRequest -import com.yizhuan.xchat_android_library.net.rxnet.RxNet +import com.mango.core.auth.AuthModel +import com.mango.core.base.BaseModel +import com.mango.core.bean.response.ServiceResult +import com.mango.core.community.CommunityConstant +import com.mango.core.community.bean.UnReadCountInfo +import com.mango.core.home.bean.* +import com.mango.core.room.bean.AnchorInfo +import com.mango.core.room.bean.HomeLiveTopInfo +import com.mango.core.room.bean.MeCenterInfo +import com.mango.core.room.bean.SingleRoomSortInfo +import com.mango.core.room.game.GameInfo +import com.mango.core.user.bean.UserInfo +import com.mango.core.utils.net.RxHelper +import com.mango.core.utils.net.launchRequest +import com.mango.xchat_android_library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.GET import retrofit2.http.POST diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/ICommunityNoticeModel.java b/core/src/diff_src_erban/java/com/mango/core/home/model/ICommunityNoticeModel.java similarity index 56% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/ICommunityNoticeModel.java rename to core/src/diff_src_erban/java/com/mango/core/home/model/ICommunityNoticeModel.java index e5c39e3b6..46e4e8605 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/ICommunityNoticeModel.java +++ b/core/src/diff_src_erban/java/com/mango/core/home/model/ICommunityNoticeModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.home.model; +package com.mango.core.home.model; -import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.community.bean.CommunityNoticeInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/AudioEngineManager.java b/core/src/diff_src_erban/java/com/mango/core/manager/AudioEngineManager.java similarity index 94% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/AudioEngineManager.java rename to core/src/diff_src_erban/java/com/mango/core/manager/AudioEngineManager.java index c05f2c33c..113977a04 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/AudioEngineManager.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/AudioEngineManager.java @@ -1,14 +1,13 @@ -package com.yizhuan.xchat_android_core.manager; +package com.mango.core.manager; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.xchat_android_core.manager.agora.RtcEngineManager; -import com.yizhuan.xchat_android_core.manager.trtc.TRtcEngineManager; -import com.yizhuan.xchat_android_core.manager.zego.ZegoEngineManager; -import com.yizhuan.xchat_android_core.room.bean.RoomAudioSdkType; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.LogUtils; +import com.mango.core.manager.agora.RtcEngineManager; +import com.mango.core.manager.trtc.TRtcEngineManager; +import com.mango.core.manager.zego.ZegoEngineManager; +import com.mango.core.room.bean.RoomAudioSdkType; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.utils.LogUtils; import io.agora.rtc.Constants; import io.agora.rtc.video.VideoCanvas; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/BaseEngine.java b/core/src/diff_src_erban/java/com/mango/core/manager/BaseEngine.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/BaseEngine.java rename to core/src/diff_src_erban/java/com/mango/core/manager/BaseEngine.java index 8f45a8610..fdc9d7970 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/BaseEngine.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/BaseEngine.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager; +package com.mango.core.manager; import java.util.ArrayList; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/EngineType.java b/core/src/diff_src_erban/java/com/mango/core/manager/EngineType.java similarity index 71% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/EngineType.java rename to core/src/diff_src_erban/java/com/mango/core/manager/EngineType.java index 7022dcae0..f3d5f155b 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/EngineType.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/EngineType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager; +package com.mango.core.manager; public enum EngineType { TYPE_AGORA, diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IAudioEngine.java b/core/src/diff_src_erban/java/com/mango/core/manager/IAudioEngine.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IAudioEngine.java rename to core/src/diff_src_erban/java/com/mango/core/manager/IAudioEngine.java index a9c1eeebd..f39c989ca 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IAudioEngine.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/IAudioEngine.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager; +package com.mango.core.manager; public interface IAudioEngine { 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/mango/core/manager/IMNetEaseManager.java similarity index 95% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java rename to core/src/diff_src_erban/java/com/mango/core/manager/IMNetEaseManager.java index 641275b89..8ad77e27f 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/IMNetEaseManager.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.manager; +package com.mango.core.manager; -import static com.yizhuan.xchat_android_constants.XChatConstants.SELECT_ANIM_DURATION; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.*; +import static com.mango.xchat_android_constants.XChatConstants.SELECT_ANIM_DURATION; +import static com.mango.core.im.custom.bean.CustomAttachment.*; import android.annotation.SuppressLint; import android.graphics.BitmapFactory; @@ -59,126 +59,126 @@ import com.netease.nimlib.sdk.msg.model.NIMAntiSpamOption; import com.netease.nimlib.sdk.util.Entry; import com.netease.nimlib.sdk.util.api.RequestResult; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.BuildConfig; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.R; -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.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.exception.ErrorThrowable; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.event.FamilyMineEvent; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.helper.AtProxy; -import com.yizhuan.xchat_android_core.im.custom.bean.ActivityTimerAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.DatingAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.DatingPublishAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftBatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingFamilyAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingMiniWorldAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingRoomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingTeamAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicAllMicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicBatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterAttackAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterHuntingResultAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterStatusAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiLuckyGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MusicInfoAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomGiftValueAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomInfoAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPKAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomTipAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RouterType; -import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.WelcomeAttachment; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.toolbox.MagicToolbox; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldJoinVerifiedEvent; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgInfo; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgParamKey; -import com.yizhuan.xchat_android_core.msg.sysv2.ErbanSysMsgV2Info; -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.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.retry.ImRetryManager; -import com.yizhuan.xchat_android_core.retry.ReconnectListener; -import com.yizhuan.xchat_android_core.retry.RetryChatRoomMessage; -import com.yizhuan.xchat_android_core.room.activitytimer.ActivityTimerEvent; -import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionInfo; -import com.yizhuan.xchat_android_core.room.bean.LeaveModeAttachment; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.exception.AntiSpamHitException; -import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; -import com.yizhuan.xchat_android_core.room.ktv.event.KtvEvent; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.MicQueueModel; -import com.yizhuan.xchat_android_core.room.pk.attachment.RoomPkAttachment; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -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.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.room.queuing_mic.attachment.QueuingMicAttachment; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicInfo; -import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicEmptyEvent; -import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicNotEmptyEvent; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingFamilyInfo; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingMiniWorldInfo; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingRoomInfo; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingTeamInfo; -import com.yizhuan.xchat_android_core.share.bean.SessionType; -import com.yizhuan.xchat_android_core.statistic.StatLogKey; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.super_admin.SuperAdminDataMrg; -import com.yizhuan.xchat_android_core.super_admin.attachment.SuperAdminOpAttachment; -import com.yizhuan.xchat_android_core.super_admin.bean.SaOpInfo; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.BaseInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.ExtensionUtils; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.vip.VipBroadcastMsgEvent; -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 com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.BuildConfig; +import com.mango.core.Constants; +import com.mango.core.R; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.RoomMicInfo; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.exception.ErrorThrowable; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.event.FamilyMineEvent; +import com.mango.core.gift.GiftModel; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.helper.AtProxy; +import com.mango.core.im.custom.bean.ActivityTimerAttachment; +import com.mango.core.im.custom.bean.AssistantAttachment; +import com.mango.core.im.custom.bean.CarAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.DatingAttachment; +import com.mango.core.im.custom.bean.DatingPublishAttachment; +import com.mango.core.im.custom.bean.GiftAttachment; +import com.mango.core.im.custom.bean.GiftBatchAttachment; +import com.mango.core.im.custom.bean.InAppSharingFamilyAttachment; +import com.mango.core.im.custom.bean.InAppSharingMiniWorldAttachment; +import com.mango.core.im.custom.bean.InAppSharingRoomAttachment; +import com.mango.core.im.custom.bean.InAppSharingTeamAttachment; +import com.mango.core.im.custom.bean.LuckyMoneyAttachment; +import com.mango.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.mango.core.im.custom.bean.MagicAllMicAttachment; +import com.mango.core.im.custom.bean.MagicAttachment; +import com.mango.core.im.custom.bean.MagicBatchAttachment; +import com.mango.core.im.custom.bean.MonsterAttackAttachment; +import com.mango.core.im.custom.bean.MonsterHuntingResultAttachment; +import com.mango.core.im.custom.bean.MonsterStatusAttachment; +import com.mango.core.im.custom.bean.MultiGiftAttachment; +import com.mango.core.im.custom.bean.MultiLuckyGiftAttachment; +import com.mango.core.im.custom.bean.MusicInfoAttachment; +import com.mango.core.im.custom.bean.NobleAttachment; +import com.mango.core.im.custom.bean.RoomBoxPrizeAttachment; +import com.mango.core.im.custom.bean.RoomGiftValueAttachment; +import com.mango.core.im.custom.bean.RoomInfoAttachment; +import com.mango.core.im.custom.bean.RoomPKAttachment; +import com.mango.core.im.custom.bean.RoomPkBean; +import com.mango.core.im.custom.bean.RoomTipAttachment; +import com.mango.core.im.custom.bean.RouterType; +import com.mango.core.im.custom.bean.SysMsgAttachment; +import com.mango.core.im.custom.bean.WelcomeAttachment; +import com.mango.core.level.UserLevelVo; +import com.mango.core.luckymoney.LuckyMoneyInfo; +import com.mango.core.magic.MagicModel; +import com.mango.core.magic.bean.MagicInfo; +import com.mango.core.magic.toolbox.MagicToolbox; +import com.mango.core.miniworld.bean.MiniWorldDetailInfo; +import com.mango.core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember; +import com.mango.core.miniworld.event.MiniWorldJoinVerifiedEvent; +import com.mango.core.monsterhunting.bean.MonsterInfo; +import com.mango.core.monsterhunting.bean.MonsterProtocol; +import com.mango.core.msg.sys.ErbanSysMsgInfo; +import com.mango.core.msg.sys.ErbanSysMsgParamKey; +import com.mango.core.msg.sysv2.ErbanSysMsgV2Info; +import com.mango.core.noble.NobleInfo; +import com.mango.core.noble.NobleResourceType; +import com.mango.core.noble.NobleUtil; +import com.mango.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.mango.core.retry.ImRetryManager; +import com.mango.core.retry.ReconnectListener; +import com.mango.core.retry.RetryChatRoomMessage; +import com.mango.core.room.activitytimer.ActivityTimerEvent; +import com.mango.core.room.activitytimer.TimerBean; +import com.mango.core.room.auction.bean.AuctionInfo; +import com.mango.core.room.bean.LeaveModeAttachment; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.exception.AntiSpamHitException; +import com.mango.core.room.face.DynamicFaceModel; +import com.mango.core.room.giftvalue.helper.GiftValueMrg; +import com.mango.core.room.ktv.bean.MusicInfo; +import com.mango.core.room.ktv.event.KtvEvent; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.room.model.MicQueueModel; +import com.mango.core.room.pk.attachment.RoomPkAttachment; +import com.mango.core.room.pk.bean.PKTeamInfo; +import com.mango.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.mango.core.room.pk.bean.RoomPkData; +import com.mango.core.room.pk.model.PkModel; +import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.room.queuing_mic.attachment.QueuingMicAttachment; +import com.mango.core.room.queuing_mic.bean.QueuingMicInfo; +import com.mango.core.room.queuing_mic.event.QueuingMicEmptyEvent; +import com.mango.core.room.queuing_mic.event.QueuingMicNotEmptyEvent; +import com.mango.core.share.bean.InAppSharingFamilyInfo; +import com.mango.core.share.bean.InAppSharingMiniWorldInfo; +import com.mango.core.share.bean.InAppSharingRoomInfo; +import com.mango.core.share.bean.InAppSharingTeamInfo; +import com.mango.core.share.bean.SessionType; +import com.mango.core.statistic.StatLogKey; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.super_admin.SuperAdminDataMrg; +import com.mango.core.super_admin.attachment.SuperAdminOpAttachment; +import com.mango.core.super_admin.bean.SaOpInfo; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.core.team.bean.TeamInfo; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.BaseInfo; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.ExtensionUtils; +import com.mango.core.utils.LogUtils; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.core.vip.VipBroadcastMsgEvent; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.NetworkUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.log.MLog; import org.greenrobot.eventbus.EventBus; import org.reactivestreams.Publisher; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/VolumeSetting.java b/core/src/diff_src_erban/java/com/mango/core/manager/VolumeSetting.java similarity index 84% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/VolumeSetting.java rename to core/src/diff_src_erban/java/com/mango/core/manager/VolumeSetting.java index a0c328e92..b825594b9 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/VolumeSetting.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/VolumeSetting.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.manager; +package com.mango.core.manager; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.pref.CommonPref; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.pref.CommonPref; /** * Created by MadisonRong on 2019-12-26 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/EngineEventHandler.java b/core/src/diff_src_erban/java/com/mango/core/manager/agora/EngineEventHandler.java similarity index 94% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/EngineEventHandler.java rename to core/src/diff_src_erban/java/com/mango/core/manager/agora/EngineEventHandler.java index 74ba1b73d..567eea388 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/EngineEventHandler.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/agora/EngineEventHandler.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.manager.agora; +package com.mango.core.manager.agora; import android.os.Message; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.xchat_android_library.utils.SingleToastUtil; import io.agora.rtc.Constants; import io.agora.rtc.IRtcEngineEventHandler; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineHandler.java b/core/src/diff_src_erban/java/com/mango/core/manager/agora/RtcEngineHandler.java similarity index 88% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineHandler.java rename to core/src/diff_src_erban/java/com/mango/core/manager/agora/RtcEngineHandler.java index 324aa1843..d0fbf74d4 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineHandler.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/agora/RtcEngineHandler.java @@ -1,16 +1,16 @@ -package com.yizhuan.xchat_android_core.manager.agora; +package com.mango.core.manager.agora; import android.os.Environment; import android.os.Handler; import android.os.Message; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.core.auth.AuthModel; +import com.mango.core.manager.AudioEngineManager; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.room.bean.RoomInfo; +import com.mango.xchat_android_library.utils.config.BasicConfig; import org.jetbrains.annotations.NotNull; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineManager.java b/core/src/diff_src_erban/java/com/mango/core/manager/agora/RtcEngineManager.java similarity index 95% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineManager.java rename to core/src/diff_src_erban/java/com/mango/core/manager/agora/RtcEngineManager.java index 137325b80..58ad17b10 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineManager.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/agora/RtcEngineManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.agora; +package com.mango.core.manager.agora; import android.os.Environment; import android.os.Handler; @@ -9,11 +9,11 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.manager.BaseEngine; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.model.PlayerModel; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.manager.BaseEngine; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.music.model.PlayerModel; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.io.File; import java.util.Locale; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAdapterImpl.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/BaseAdapterImpl.java similarity index 99% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAdapterImpl.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/BaseAdapterImpl.java index 5a5710ff0..e38b487b8 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAdapterImpl.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/BaseAdapterImpl.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; import android.graphics.Bitmap; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAgoraHandlerInterface.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/BaseAgoraHandlerInterface.java similarity index 98% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAgoraHandlerInterface.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/BaseAgoraHandlerInterface.java index 72e8441ce..42b031d52 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAgoraHandlerInterface.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/BaseAgoraHandlerInterface.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; import android.graphics.Rect; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAgoraInterface.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/BaseAgoraInterface.java similarity index 99% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAgoraInterface.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/BaseAgoraInterface.java index b54c4b3ef..470dac9d6 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAgoraInterface.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/BaseAgoraInterface.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; import io.agora.rtc.IAudioEffectManager; import io.agora.rtc.IAudioFrameObserver; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/IRTCEngine.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/IRTCEngine.java similarity index 96% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/IRTCEngine.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/IRTCEngine.java index 82ef282cb..221566551 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/IRTCEngine.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/IRTCEngine.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; import android.graphics.Bitmap; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/IRTCEngineHandler.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/IRTCEngineHandler.java similarity index 91% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/IRTCEngineHandler.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/IRTCEngineHandler.java index e27a99c57..26dec1115 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/IRTCEngineHandler.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/IRTCEngineHandler.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; import com.tencent.trtc.TRTCCloudDef; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/RoomIdHelper.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/RoomIdHelper.java similarity index 73% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/RoomIdHelper.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/RoomIdHelper.java index dcfe1e69b..c04762b16 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/RoomIdHelper.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/RoomIdHelper.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; -import com.yizhuan.xchat_android_core.utils.StringUtils; +import com.mango.core.utils.StringUtils; public class RoomIdHelper { /** diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/SDKConfig.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/SDKConfig.java similarity index 95% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/SDKConfig.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/SDKConfig.java index 70deb0d6d..c4e478160 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/SDKConfig.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/SDKConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; public class SDKConfig { /** diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEffectManager.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRTCEffectManager.java similarity index 98% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEffectManager.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRTCEffectManager.java index 81e85f8c5..482296b3c 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEffectManager.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRTCEffectManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; import com.tencent.liteav.audio.TXAudioEffectManager; import com.tencent.trtc.TRTCCloud; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEngineAdapter.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRTCEngineAdapter.java similarity index 99% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEngineAdapter.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRTCEngineAdapter.java index 3faf792ce..fa17079f9 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEngineAdapter.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRTCEngineAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; import android.content.Context; import android.graphics.Bitmap; @@ -6,7 +6,6 @@ import android.graphics.BitmapFactory; import android.opengl.EGL14; import android.os.Bundle; import android.text.TextUtils; -import android.util.Log; import android.view.SurfaceView; import com.tencent.liteav.TXLiteAVCode; @@ -18,8 +17,8 @@ import com.tencent.trtc.TRTCCloud; import com.tencent.trtc.TRTCCloudDef; import com.tencent.trtc.TRTCCloudListener; import com.tencent.trtc.TRTCStatistics; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.utils.LogUtils; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.utils.LogUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineEventHandler.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRtcEngineEventHandler.java similarity index 95% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineEventHandler.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRtcEngineEventHandler.java index 11439278d..3568a8aca 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineEventHandler.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRtcEngineEventHandler.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; import android.graphics.Rect; import android.os.Message; @@ -6,13 +6,13 @@ import android.os.Message; import com.orhanobut.logger.Logger; import com.tencent.bugly.crashreport.CrashReport; import com.tencent.trtc.TRTCCloudDef; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.manager.agora.RtcEngineHandler; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.core.im.custom.bean.RoomPkBean; +import com.mango.core.manager.AudioEngineManager; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.manager.agora.RtcEngineHandler; +import com.mango.xchat_android_library.utils.SingleToastUtil; import io.agora.rtc.Constants; import io.agora.rtc.IRtcEngineEventHandler; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineHandler.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRtcEngineHandler.java similarity index 87% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineHandler.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRtcEngineHandler.java index c59e92c85..cc3a1f744 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineHandler.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRtcEngineHandler.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; import static io.agora.rtc.Constants.AUDIO_RECORDING_QUALITY_LOW; @@ -6,14 +6,13 @@ import android.os.Environment; import android.os.Handler; import android.os.Message; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.manager.agora.RtcEngineManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.core.auth.AuthModel; +import com.mango.core.manager.AudioEngineManager; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.room.bean.RoomInfo; +import com.mango.xchat_android_library.utils.config.BasicConfig; import org.jetbrains.annotations.NotNull; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineManager.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRtcEngineManager.java similarity index 93% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineManager.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRtcEngineManager.java index 2e1de5155..786e62c51 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineManager.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRtcEngineManager.java @@ -1,9 +1,8 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; import static io.agora.rtc.Constants.AUDIO_PROFILE_MUSIC_STANDARD; import static io.agora.rtc.Constants.AUDIO_SCENARIO_GAME_STREAMING; -import android.os.Environment; import android.os.Handler; import android.text.TextUtils; import android.util.Log; @@ -12,16 +11,11 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.BaseEngine; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.model.PlayerModel; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; - -import java.io.File; -import java.util.Locale; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.BaseEngine; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.music.model.PlayerModel; +import com.mango.xchat_android_library.utils.config.BasicConfig; import io.agora.rtc.Constants; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Unsupport.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/Unsupport.java similarity index 74% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Unsupport.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/Unsupport.java index f2fa56420..0a6b44e08 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Unsupport.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/Unsupport.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Utils.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/Utils.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Utils.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/Utils.java index af5a134eb..730a2378a 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Utils.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/Utils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; import android.graphics.Bitmap; import android.graphics.BitmapFactory; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Version.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/Version.java similarity index 80% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Version.java rename to core/src/diff_src_erban/java/com/mango/core/manager/trtc/Version.java index f10b9b9bd..da0aab684 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Version.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/Version.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.mango.core.manager.trtc; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/zego/ZegoAudioRoomDelegateWrapper.java b/core/src/diff_src_erban/java/com/mango/core/manager/zego/ZegoAudioRoomDelegateWrapper.java similarity index 95% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/zego/ZegoAudioRoomDelegateWrapper.java rename to core/src/diff_src_erban/java/com/mango/core/manager/zego/ZegoAudioRoomDelegateWrapper.java index 5c96b8550..394ef3c68 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/zego/ZegoAudioRoomDelegateWrapper.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/zego/ZegoAudioRoomDelegateWrapper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.zego; +package com.mango.core.manager.zego; import com.zego.zegoaudioroom.ZegoAudioRoomDelegate; import com.zego.zegoaudioroom.ZegoAudioStream; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/zego/ZegoEngineManager.java b/core/src/diff_src_erban/java/com/mango/core/manager/zego/ZegoEngineManager.java similarity index 94% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/zego/ZegoEngineManager.java rename to core/src/diff_src_erban/java/com/mango/core/manager/zego/ZegoEngineManager.java index 8c256b49c..638e144ff 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/zego/ZegoEngineManager.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/zego/ZegoEngineManager.java @@ -1,29 +1,28 @@ -package com.yizhuan.xchat_android_core.manager.zego; +package com.mango.core.manager.zego; import android.text.TextUtils; import android.util.Log; import com.tencent.bugly.crashreport.CrashReport; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.BuildConfig; -import com.yizhuan.xchat_android_core.Env; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.BaseEngine; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.model.PlayerModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.pref.CommonPref; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.BuildConfig; +import com.mango.core.Env; +import com.mango.core.auth.AuthModel; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.BaseEngine; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.music.model.PlayerModel; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.utils.LogUtils; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.pref.CommonPref; import com.zego.zegoaudioroom.ZegoAudioLivePublisherDelegate; import com.zego.zegoaudioroom.ZegoAudioRoom; import com.zego.zegoaudioroom.ZegoAudioStream; import com.zego.zegoaudioroom.ZegoAudioStreamType; -import com.zego.zegoaudioroom.ZegoAuxData; import com.zego.zegoavkit2.ZegoMediaPlayer; import com.zego.zegoavkit2.soundlevel.IZegoSoundLevelCallback; import com.zego.zegoavkit2.soundlevel.ZegoSoundLevelInfo; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/zego/ZegoMediaPlayerCallbackWrapper.java b/core/src/diff_src_erban/java/com/mango/core/manager/zego/ZegoMediaPlayerCallbackWrapper.java similarity index 95% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/zego/ZegoMediaPlayerCallbackWrapper.java rename to core/src/diff_src_erban/java/com/mango/core/manager/zego/ZegoMediaPlayerCallbackWrapper.java index f53d7178c..c3c8362e2 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/zego/ZegoMediaPlayerCallbackWrapper.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/zego/ZegoMediaPlayerCallbackWrapper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.zego; +package com.mango.core.manager.zego; import android.graphics.Bitmap; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/IMarketVerifyModel.java b/core/src/diff_src_erban/java/com/mango/core/market_verify/IMarketVerifyModel.java similarity index 76% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/IMarketVerifyModel.java rename to core/src/diff_src_erban/java/com/mango/core/market_verify/IMarketVerifyModel.java index b58034c0d..3f5cac89f 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/IMarketVerifyModel.java +++ b/core/src/diff_src_erban/java/com/mango/core/market_verify/IMarketVerifyModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.market_verify; +package com.mango.core.market_verify; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.LoginTipsInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.LoginTipsInfo; import io.reactivex.Single; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/MarketVerifyModel.java b/core/src/diff_src_erban/java/com/mango/core/market_verify/MarketVerifyModel.java similarity index 85% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/MarketVerifyModel.java rename to core/src/diff_src_erban/java/com/mango/core/market_verify/MarketVerifyModel.java index c6a0eb5a8..a8de9a758 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/MarketVerifyModel.java +++ b/core/src/diff_src_erban/java/com/mango/core/market_verify/MarketVerifyModel.java @@ -1,25 +1,20 @@ -package com.yizhuan.xchat_android_core.market_verify; +package com.mango.core.market_verify; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.LoginTipsInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.market_verify.bean.VersionConfig; -import com.yizhuan.xchat_android_core.market_verify.event.MarketVerifyUpdateEvent; -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.AppMetaDataUtil; +import com.mango.core.auth.event.LoginEvent; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.LoginTipsInfo; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.market_verify.bean.VersionConfig; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import io.reactivex.Single; -import io.reactivex.SingleObserver; import io.reactivex.SingleSource; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; import io.reactivex.functions.Function; import io.reactivex.schedulers.Schedulers; import retrofit2.http.GET; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/bean/VersionConfig.java b/core/src/diff_src_erban/java/com/mango/core/market_verify/bean/VersionConfig.java similarity index 90% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/bean/VersionConfig.java rename to core/src/diff_src_erban/java/com/mango/core/market_verify/bean/VersionConfig.java index 9a3368d5f..46d50523a 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/bean/VersionConfig.java +++ b/core/src/diff_src_erban/java/com/mango/core/market_verify/bean/VersionConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.market_verify.bean; +package com.mango.core.market_verify.bean; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/mango/core/market_verify/event/MarketVerifyUpdateEvent.java b/core/src/diff_src_erban/java/com/mango/core/market_verify/event/MarketVerifyUpdateEvent.java new file mode 100644 index 000000000..90b2160ce --- /dev/null +++ b/core/src/diff_src_erban/java/com/mango/core/market_verify/event/MarketVerifyUpdateEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.market_verify.event; + +public class MarketVerifyUpdateEvent { +} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ImRetryManager.java b/core/src/diff_src_erban/java/com/mango/core/retry/ImRetryManager.java similarity index 85% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ImRetryManager.java rename to core/src/diff_src_erban/java/com/mango/core/retry/ImRetryManager.java index 7f858a31b..20fba7c2b 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ImRetryManager.java +++ b/core/src/diff_src_erban/java/com/mango/core/retry/ImRetryManager.java @@ -1,19 +1,14 @@ -package com.yizhuan.xchat_android_core.retry; +package com.mango.core.retry; -import android.text.TextUtils; import android.util.Log; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; import io.reactivex.Single; -import io.reactivex.SingleEmitter; -import io.reactivex.SingleOnSubscribe; /** * 云信消息重发的一个管理 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ReconnectListener.java b/core/src/diff_src_erban/java/com/mango/core/retry/ReconnectListener.java similarity index 85% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ReconnectListener.java rename to core/src/diff_src_erban/java/com/mango/core/retry/ReconnectListener.java index ddf389d2b..07919f048 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ReconnectListener.java +++ b/core/src/diff_src_erban/java/com/mango/core/retry/ReconnectListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.retry; +package com.mango.core.retry; /** * 重发的回调，暂时引入是为了埋点 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/RetryChatRoomMessage.java b/core/src/diff_src_erban/java/com/mango/core/retry/RetryChatRoomMessage.java similarity index 85% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/RetryChatRoomMessage.java rename to core/src/diff_src_erban/java/com/mango/core/retry/RetryChatRoomMessage.java index 087a8c12c..69b44100a 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/RetryChatRoomMessage.java +++ b/core/src/diff_src_erban/java/com/mango/core/retry/RetryChatRoomMessage.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.retry; +package com.mango.core.retry; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java similarity index 99% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java rename to core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java index ce988b775..0ffe91d72 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_constants; +package com.mango.xchat_android_constants; -import com.yizhuan.xchat_android_core.BuildConfig; +import com.mango.core.BuildConfig; /** * Created by MadisonRong on 09/08/2018. diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/channel/IChannelModel.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/channel/IChannelModel.java deleted file mode 100644 index 1c971f66d..000000000 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/channel/IChannelModel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.xchat_android_core.channel; - -import com.yizhuan.xchat_android_core.base.IModel; - -public interface IChannelModel extends IModel { -} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/FollowRoomEvent.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/FollowRoomEvent.java deleted file mode 100644 index 13c16b0b9..000000000 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/FollowRoomEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.home.event; - -public class FollowRoomEvent { -} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/RefreshHomeDataEvent.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/RefreshHomeDataEvent.java deleted file mode 100644 index 711fa8366..000000000 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/RefreshHomeDataEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.home.event; - -public class RefreshHomeDataEvent { -} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/ShareRoomEvent.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/ShareRoomEvent.java deleted file mode 100644 index 0ebfd2468..000000000 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/ShareRoomEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.home.event; - -public class ShareRoomEvent { -} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/event/MarketVerifyUpdateEvent.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/event/MarketVerifyUpdateEvent.java deleted file mode 100644 index 337574da4..000000000 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/event/MarketVerifyUpdateEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.market_verify.event; - -public class MarketVerifyUpdateEvent { -} diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml index efe73c43f..d5a8a3518 100644 --- a/core/src/main/AndroidManifest.xml +++ b/core/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="com.mango.core" > diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java b/core/src/main/java/com/mango/core/Constants.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/Constants.java rename to core/src/main/java/com/mango/core/Constants.java index 58bf2cce1..db149eafb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java +++ b/core/src/main/java/com/mango/core/Constants.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core; +package com.mango.core; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.pref.CommonPref; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.pref.CommonPref; import java.io.File; import java.util.Arrays; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java b/core/src/main/java/com/mango/core/DemoCache.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java rename to core/src/main/java/com/mango/core/DemoCache.java index c296b2fb4..90095270c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java +++ b/core/src/main/java/com/mango/core/DemoCache.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core; +package com.mango.core; import android.text.TextUtils; @@ -7,19 +7,19 @@ import androidx.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.netease.nimlib.sdk.StatusBarNotificationConfig; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.entity.AccountInfo; -import com.yizhuan.xchat_android_core.auth.entity.TicketInfo; -import com.yizhuan.xchat_android_core.home.bean.MainTabInfo; -import com.yizhuan.xchat_android_core.initial.SplashComponent; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.noble.NobleConfig; -import com.yizhuan.xchat_android_core.noble.NobleRight; -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_library.utils.pref.ObjectPref; -import com.yizhuan.xchat_android_library.utils.pref.SettingsPref; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.entity.AccountInfo; +import com.mango.core.auth.entity.TicketInfo; +import com.mango.core.home.bean.MainTabInfo; +import com.mango.core.initial.SplashComponent; +import com.mango.core.initial.bean.InitInfo; +import com.mango.core.noble.NobleConfig; +import com.mango.core.noble.NobleRight; +import com.mango.core.utils.CurrentTimeUtils; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.xchat_android_library.utils.pref.ObjectPref; +import com.mango.xchat_android_library.utils.pref.SettingsPref; import java.util.HashMap; import java.util.Iterator; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/Env.java b/core/src/main/java/com/mango/core/Env.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/Env.java rename to core/src/main/java/com/mango/core/Env.java index 3b64569c5..ddcaddf5b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/Env.java +++ b/core/src/main/java/com/mango/core/Env.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core; +package com.mango.core; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.pref.CommonPref; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.pref.CommonPref; /** * 环境配置类 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/OldHttpObserver.java b/core/src/main/java/com/mango/core/OldHttpObserver.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/OldHttpObserver.java rename to core/src/main/java/com/mango/core/OldHttpObserver.java index af93c85f9..b0ffe651e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/OldHttpObserver.java +++ b/core/src/main/java/com/mango/core/OldHttpObserver.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core; +package com.mango.core; -import com.yizhuan.xchat_android_core.bean.response.RequestError; -import com.yizhuan.xchat_android_core.bean.response.ResponseData; +import com.mango.core.bean.response.RequestError; +import com.mango.core.bean.response.ResponseData; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/PreferencesUtils.java b/core/src/main/java/com/mango/core/PreferencesUtils.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/PreferencesUtils.java rename to core/src/main/java/com/mango/core/PreferencesUtils.java index 8fca9cf56..c651ba788 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/PreferencesUtils.java +++ b/core/src/main/java/com/mango/core/PreferencesUtils.java @@ -1,14 +1,14 @@ -package com.yizhuan.xchat_android_core; +package com.mango.core; import android.content.Context; import com.netease.nimlib.sdk.StatusBarNotificationConfig; import com.netease.nimlib.sdk.auth.LoginInfo; -import com.yizhuan.xchat_android_core.auth.entity.AccountInfo; -import com.yizhuan.xchat_android_core.auth.entity.TicketInfo; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.pref.ObjectPref; -import com.yizhuan.xchat_android_library.utils.pref.SettingsPref; +import com.mango.core.auth.entity.AccountInfo; +import com.mango.core.auth.entity.TicketInfo; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.pref.ObjectPref; +import com.mango.xchat_android_library.utils.pref.SettingsPref; /** * Created by zhouxiangfeng on 2017/5/19. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/activity/bean/LotteryInfo.java b/core/src/main/java/com/mango/core/activity/bean/LotteryInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/activity/bean/LotteryInfo.java rename to core/src/main/java/com/mango/core/activity/bean/LotteryInfo.java index 83b9e81ce..5b9a81852 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/activity/bean/LotteryInfo.java +++ b/core/src/main/java/com/mango/core/activity/bean/LotteryInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.activity.bean; +package com.mango.core.activity.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/activity/event/ActivityEvent.java b/core/src/main/java/com/mango/core/activity/event/ActivityEvent.java similarity index 64% rename from core/src/main/java/com/yizhuan/xchat_android_core/activity/event/ActivityEvent.java rename to core/src/main/java/com/mango/core/activity/event/ActivityEvent.java index 65a3fa1d6..07b25b9b7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/activity/event/ActivityEvent.java +++ b/core/src/main/java/com/mango/core/activity/event/ActivityEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.activity.event; +package com.mango.core.activity.event; -import com.yizhuan.xchat_android_core.activity.bean.LotteryInfo; +import com.mango.core.activity.bean.LotteryInfo; public class ActivityEvent { diff --git a/core/src/main/java/com/mango/core/activity/model/ActivityModel.java b/core/src/main/java/com/mango/core/activity/model/ActivityModel.java new file mode 100644 index 000000000..264dbf9ec --- /dev/null +++ b/core/src/main/java/com/mango/core/activity/model/ActivityModel.java @@ -0,0 +1,6 @@ +package com.mango.core.activity.model; + +import com.mango.core.base.BaseModel; + +public class ActivityModel extends BaseModel implements IActivityModel { +} diff --git a/core/src/main/java/com/mango/core/activity/model/IActivityModel.java b/core/src/main/java/com/mango/core/activity/model/IActivityModel.java new file mode 100644 index 000000000..368c91909 --- /dev/null +++ b/core/src/main/java/com/mango/core/activity/model/IActivityModel.java @@ -0,0 +1,6 @@ +package com.mango.core.activity.model; + +import com.mango.core.base.IModel; + +public interface IActivityModel extends IModel { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/audio/AudioPlayAndRecordManager.java b/core/src/main/java/com/mango/core/audio/AudioPlayAndRecordManager.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/audio/AudioPlayAndRecordManager.java rename to core/src/main/java/com/mango/core/audio/AudioPlayAndRecordManager.java index 0046e4930..9823709a6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/audio/AudioPlayAndRecordManager.java +++ b/core/src/main/java/com/mango/core/audio/AudioPlayAndRecordManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio; +package com.mango.core.audio; import android.content.Context; import android.media.AudioManager; @@ -8,7 +8,7 @@ import com.netease.nimlib.sdk.media.player.OnPlayListener; import com.netease.nimlib.sdk.media.record.AudioRecorder; import com.netease.nimlib.sdk.media.record.IAudioRecordCallback; import com.netease.nimlib.sdk.media.record.RecordType; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.config.BasicConfig; /** * @author zhouxiangfeng diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/audio/bean/SysMsgVoiceInfo.java b/core/src/main/java/com/mango/core/audio/bean/SysMsgVoiceInfo.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/audio/bean/SysMsgVoiceInfo.java rename to core/src/main/java/com/mango/core/audio/bean/SysMsgVoiceInfo.java index 326ec9a15..e5995172e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/audio/bean/SysMsgVoiceInfo.java +++ b/core/src/main/java/com/mango/core/audio/bean/SysMsgVoiceInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.bean; +package com.mango.core.audio.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/audio/bean/VoiceBottleSayHiInfo.java b/core/src/main/java/com/mango/core/audio/bean/VoiceBottleSayHiInfo.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/audio/bean/VoiceBottleSayHiInfo.java rename to core/src/main/java/com/mango/core/audio/bean/VoiceBottleSayHiInfo.java index 0e73ff44c..b3ebc7944 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/audio/bean/VoiceBottleSayHiInfo.java +++ b/core/src/main/java/com/mango/core/audio/bean/VoiceBottleSayHiInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.bean; +package com.mango.core.audio.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/audio/event/VoiceShakeHeartEvent.java b/core/src/main/java/com/mango/core/audio/event/VoiceShakeHeartEvent.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/audio/event/VoiceShakeHeartEvent.java rename to core/src/main/java/com/mango/core/audio/event/VoiceShakeHeartEvent.java index 0316bd862..90af85a27 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/audio/event/VoiceShakeHeartEvent.java +++ b/core/src/main/java/com/mango/core/audio/event/VoiceShakeHeartEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.event; +package com.mango.core.audio.event; public class VoiceShakeHeartEvent { public String showTextHint; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java b/core/src/main/java/com/mango/core/auth/AuthModel.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java rename to core/src/main/java/com/mango/core/auth/AuthModel.java index 5fa646f96..8fea75c3c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java +++ b/core/src/main/java/com/mango/core/auth/AuthModel.java @@ -1,9 +1,8 @@ -package com.yizhuan.xchat_android_core.auth; +package com.mango.core.auth; import android.text.TextUtils; import android.util.Log; -import com.google.gson.Gson; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.common.util.string.StringUtil; @@ -19,44 +18,43 @@ import com.netease.nimlib.sdk.auth.LoginInfo; import com.netease.nimlib.sdk.mixpush.MixPushService; import com.netease.nimlib.sdk.msg.MsgService; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.entity.AccountInfo; -import com.yizhuan.xchat_android_core.auth.entity.ThirdUserInfo; -import com.yizhuan.xchat_android_core.auth.entity.TicketInfo; -import com.yizhuan.xchat_android_core.auth.event.GetCurrentUidEvent; -import com.yizhuan.xchat_android_core.auth.event.KickOutEvent; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.auth.exception.AccountCancelException; -import com.yizhuan.xchat_android_core.auth.exception.BanAccountException; -import com.yizhuan.xchat_android_core.auth.exception.BigHeadPhoneException; -import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.LoginResult; -import com.yizhuan.xchat_android_core.bean.response.result.RegisterResult; -import com.yizhuan.xchat_android_core.bean.response.result.TicketResult; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachParser; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.linked.LinkedModel; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; -import com.yizhuan.xchat_android_core.utils.APIEncryptUtil; -import com.yizhuan.xchat_android_core.utils.CheckUtils; -import com.yizhuan.xchat_android_core.utils.OldHttpErrorHandleUtil; -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.RandomStringUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.VersionUtil; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; -import com.yizhuan.xchat_android_library.utils.codec.MD5Utils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.json.JsonUtils; +import com.mango.core.DemoCache; +import com.mango.core.auth.entity.AccountInfo; +import com.mango.core.auth.entity.ThirdUserInfo; +import com.mango.core.auth.entity.TicketInfo; +import com.mango.core.auth.event.GetCurrentUidEvent; +import com.mango.core.auth.event.KickOutEvent; +import com.mango.core.auth.event.LoginEvent; +import com.mango.core.auth.event.LogoutEvent; +import com.mango.core.auth.exception.AccountCancelException; +import com.mango.core.auth.exception.BanAccountException; +import com.mango.core.auth.exception.BigHeadPhoneException; +import com.mango.core.auth.exception.IsSuperAdminException; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.bean.response.result.LoginResult; +import com.mango.core.bean.response.result.RegisterResult; +import com.mango.core.bean.response.result.TicketResult; +import com.mango.core.exception.FailReasonException; +import com.mango.core.im.custom.bean.CustomAttachParser; +import com.mango.core.initial.InitialModel; +import com.mango.core.linked.LinkedModel; +import com.mango.core.linked.bean.LinkedInfo; +import com.mango.core.utils.APIEncryptUtil; +import com.mango.core.utils.CheckUtils; +import com.mango.core.utils.OldHttpErrorHandleUtil; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.RandomStringUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.VersionUtil; +import com.mango.xchat_android_library.utils.codec.DESUtils; +import com.mango.xchat_android_library.utils.codec.MD5Utils; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.json.JsonUtils; import org.greenrobot.eventbus.EventBus; -import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -75,8 +73,6 @@ import io.reactivex.functions.Function; import io.reactivex.schedulers.Schedulers; import lombok.Getter; import okhttp3.ResponseBody; -import retrofit2.HttpException; -import retrofit2.Response; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java b/core/src/main/java/com/mango/core/auth/IAuthModel.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java rename to core/src/main/java/com/mango/core/auth/IAuthModel.java index 88f4b432f..1e046464c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java +++ b/core/src/main/java/com/mango/core/auth/IAuthModel.java @@ -1,9 +1,8 @@ -package com.yizhuan.xchat_android_core.auth; +package com.mango.core.auth; -import com.yizhuan.xchat_android_core.auth.entity.ThirdUserInfo; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.core.auth.entity.ThirdUserInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; import io.reactivex.Single; import okhttp3.ResponseBody; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/AccountInfo.java b/core/src/main/java/com/mango/core/auth/entity/AccountInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/AccountInfo.java rename to core/src/main/java/com/mango/core/auth/entity/AccountInfo.java index 046c3393a..2bea5d7e7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/AccountInfo.java +++ b/core/src/main/java/com/mango/core/auth/entity/AccountInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.entity; +package com.mango.core.auth.entity; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/ThirdUserInfo.java b/core/src/main/java/com/mango/core/auth/entity/ThirdUserInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/ThirdUserInfo.java rename to core/src/main/java/com/mango/core/auth/entity/ThirdUserInfo.java index 491e6e933..33e89b5af 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/ThirdUserInfo.java +++ b/core/src/main/java/com/mango/core/auth/entity/ThirdUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.entity; +package com.mango.core.auth.entity; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/TicketInfo.java b/core/src/main/java/com/mango/core/auth/entity/TicketInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/TicketInfo.java rename to core/src/main/java/com/mango/core/auth/entity/TicketInfo.java index 200c06cd5..6fc0a983a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/TicketInfo.java +++ b/core/src/main/java/com/mango/core/auth/entity/TicketInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.entity; +package com.mango.core.auth.entity; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/BindPhoneEvent.java b/core/src/main/java/com/mango/core/auth/event/BindPhoneEvent.java similarity index 64% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/event/BindPhoneEvent.java rename to core/src/main/java/com/mango/core/auth/event/BindPhoneEvent.java index dbcbe3bf4..1f413c04f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/BindPhoneEvent.java +++ b/core/src/main/java/com/mango/core/auth/event/BindPhoneEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.event; +package com.mango.core.auth.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/GetCurrentUidEvent.java b/core/src/main/java/com/mango/core/auth/event/GetCurrentUidEvent.java similarity index 63% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/event/GetCurrentUidEvent.java rename to core/src/main/java/com/mango/core/auth/event/GetCurrentUidEvent.java index e552b7e5b..ae296b948 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/GetCurrentUidEvent.java +++ b/core/src/main/java/com/mango/core/auth/event/GetCurrentUidEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.auth.event; +package com.mango.core.auth.event; -import com.yizhuan.xchat_android_core.base.BaseDataEvent; +import com.mango.core.base.BaseDataEvent; /** * diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/KickOutEvent.java b/core/src/main/java/com/mango/core/auth/event/KickOutEvent.java similarity index 51% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/event/KickOutEvent.java rename to core/src/main/java/com/mango/core/auth/event/KickOutEvent.java index 4c2c0d8be..ebcf69e4b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/KickOutEvent.java +++ b/core/src/main/java/com/mango/core/auth/event/KickOutEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.event; +package com.mango.core.auth.event; /** * 踢出事件 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LoginEvent.java b/core/src/main/java/com/mango/core/auth/event/LoginEvent.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LoginEvent.java rename to core/src/main/java/com/mango/core/auth/event/LoginEvent.java index 875f2bea9..e2529b7d4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LoginEvent.java +++ b/core/src/main/java/com/mango/core/auth/event/LoginEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.event; +package com.mango.core.auth.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LogoutEvent.java b/core/src/main/java/com/mango/core/auth/event/LogoutEvent.java similarity index 54% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LogoutEvent.java rename to core/src/main/java/com/mango/core/auth/event/LogoutEvent.java index 2a23744ad..7e59cb913 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LogoutEvent.java +++ b/core/src/main/java/com/mango/core/auth/event/LogoutEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.event; +package com.mango.core.auth.event; /** * 退出登录事件 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/AccountCancelException.java b/core/src/main/java/com/mango/core/auth/exception/AccountCancelException.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/AccountCancelException.java rename to core/src/main/java/com/mango/core/auth/exception/AccountCancelException.java index 4501612af..1ad3681ac 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/AccountCancelException.java +++ b/core/src/main/java/com/mango/core/auth/exception/AccountCancelException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.exception; +package com.mango.core.auth.exception; public class AccountCancelException extends Exception { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/BanAccountException.java b/core/src/main/java/com/mango/core/auth/exception/BanAccountException.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/BanAccountException.java rename to core/src/main/java/com/mango/core/auth/exception/BanAccountException.java index a24d409b9..214a1ae16 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/BanAccountException.java +++ b/core/src/main/java/com/mango/core/auth/exception/BanAccountException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.exception; +package com.mango.core.auth.exception; public class BanAccountException extends Exception { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/BigHeadPhoneException.java b/core/src/main/java/com/mango/core/auth/exception/BigHeadPhoneException.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/BigHeadPhoneException.java rename to core/src/main/java/com/mango/core/auth/exception/BigHeadPhoneException.java index 71e76faf9..45a235839 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/BigHeadPhoneException.java +++ b/core/src/main/java/com/mango/core/auth/exception/BigHeadPhoneException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.exception; +package com.mango.core.auth.exception; public class BigHeadPhoneException extends Exception { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/IsSuperAdminException.java b/core/src/main/java/com/mango/core/auth/exception/IsSuperAdminException.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/IsSuperAdminException.java rename to core/src/main/java/com/mango/core/auth/exception/IsSuperAdminException.java index af132b19b..e08a79596 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/IsSuperAdminException.java +++ b/core/src/main/java/com/mango/core/auth/exception/IsSuperAdminException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.exception; +package com.mango.core.auth.exception; public class IsSuperAdminException extends Exception { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/OldMemberException.java b/core/src/main/java/com/mango/core/auth/exception/OldMemberException.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/OldMemberException.java rename to core/src/main/java/com/mango/core/auth/exception/OldMemberException.java index bd4e130d6..5fa4152a0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/OldMemberException.java +++ b/core/src/main/java/com/mango/core/auth/exception/OldMemberException.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.auth.exception; +package com.mango.core.auth.exception; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.mango.core.bean.response.ServiceResult; /** * 当请求 /acc/third/isExistsQqAccount 的时候，如果对应的 openid 不存在数据库里，则 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseBusEvent.java b/core/src/main/java/com/mango/core/base/BaseBusEvent.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/base/BaseBusEvent.java rename to core/src/main/java/com/mango/core/base/BaseBusEvent.java index 387d2b270..a5380c878 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseBusEvent.java +++ b/core/src/main/java/com/mango/core/base/BaseBusEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.base; +package com.mango.core.base; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseDataEvent.java b/core/src/main/java/com/mango/core/base/BaseDataEvent.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/base/BaseDataEvent.java rename to core/src/main/java/com/mango/core/base/BaseDataEvent.java index 9f5e8b471..36ec7b0f8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseDataEvent.java +++ b/core/src/main/java/com/mango/core/base/BaseDataEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.base; +package com.mango.core.base; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseErrorEvent.java b/core/src/main/java/com/mango/core/base/BaseErrorEvent.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/base/BaseErrorEvent.java rename to core/src/main/java/com/mango/core/base/BaseErrorEvent.java index d16d66971..ab4a293aa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseErrorEvent.java +++ b/core/src/main/java/com/mango/core/base/BaseErrorEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.base; +package com.mango.core.base; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseErrorException.java b/core/src/main/java/com/mango/core/base/BaseErrorException.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/base/BaseErrorException.java rename to core/src/main/java/com/mango/core/base/BaseErrorException.java index 7a032be86..9ef4d6d96 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseErrorException.java +++ b/core/src/main/java/com/mango/core/base/BaseErrorException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.base; +package com.mango.core.base; /** * create by lvzebiao @2019/8/7 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseModel.java b/core/src/main/java/com/mango/core/base/BaseModel.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/base/BaseModel.java rename to core/src/main/java/com/mango/core/base/BaseModel.java index 547d7873f..fd92b33b4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseModel.java +++ b/core/src/main/java/com/mango/core/base/BaseModel.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.base; +package com.mango.core.base; import android.content.Context; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.core.bean.response.ServiceResult; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.net.UnknownHostException; import java.util.concurrent.TimeoutException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/CancelNoToastException.java b/core/src/main/java/com/mango/core/base/CancelNoToastException.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/base/CancelNoToastException.java rename to core/src/main/java/com/mango/core/base/CancelNoToastException.java index 12e59afeb..8039a05e7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/base/CancelNoToastException.java +++ b/core/src/main/java/com/mango/core/base/CancelNoToastException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.base; +package com.mango.core.base; /** * 点击取消按钮，但是不需要toast error的情况 diff --git a/core/src/main/java/com/mango/core/base/IModel.java b/core/src/main/java/com/mango/core/base/IModel.java new file mode 100644 index 000000000..7bf908cf4 --- /dev/null +++ b/core/src/main/java/com/mango/core/base/IModel.java @@ -0,0 +1,4 @@ +package com.mango.core.base; + +public interface IModel { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/BaseProtocol.java b/core/src/main/java/com/mango/core/bean/BaseProtocol.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/BaseProtocol.java rename to core/src/main/java/com/mango/core/bean/BaseProtocol.java index 0faf81ae5..9239b508e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/BaseProtocol.java +++ b/core/src/main/java/com/mango/core/bean/BaseProtocol.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.mango.core.bean; /** * 广播通用协议 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/CarButtonInfo.java b/core/src/main/java/com/mango/core/bean/CarButtonInfo.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/CarButtonInfo.java rename to core/src/main/java/com/mango/core/bean/CarButtonInfo.java index 1964f41e2..09cdac14e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/CarButtonInfo.java +++ b/core/src/main/java/com/mango/core/bean/CarButtonInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.mango.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/GiftTitleInfo.java b/core/src/main/java/com/mango/core/bean/GiftTitleInfo.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/GiftTitleInfo.java rename to core/src/main/java/com/mango/core/bean/GiftTitleInfo.java index 769a2a3f2..3d6f032c2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/GiftTitleInfo.java +++ b/core/src/main/java/com/mango/core/bean/GiftTitleInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.mango.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/LoginTipsInfo.java b/core/src/main/java/com/mango/core/bean/LoginTipsInfo.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/LoginTipsInfo.java rename to core/src/main/java/com/mango/core/bean/LoginTipsInfo.java index b3fc4166f..c39ae3885 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/LoginTipsInfo.java +++ b/core/src/main/java/com/mango/core/bean/LoginTipsInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.mango.core.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/PrivateChatLimitInfo.java b/core/src/main/java/com/mango/core/bean/PrivateChatLimitInfo.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/PrivateChatLimitInfo.java rename to core/src/main/java/com/mango/core/bean/PrivateChatLimitInfo.java index 8796b5bfd..655d7f4fb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/PrivateChatLimitInfo.java +++ b/core/src/main/java/com/mango/core/bean/PrivateChatLimitInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.mango.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/ProgressInfo.java b/core/src/main/java/com/mango/core/bean/ProgressInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/ProgressInfo.java rename to core/src/main/java/com/mango/core/bean/ProgressInfo.java index 928698d99..8acc5d352 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/ProgressInfo.java +++ b/core/src/main/java/com/mango/core/bean/ProgressInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.mango.core.bean; /** * 进度信息 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomHistoryInfo.java b/core/src/main/java/com/mango/core/bean/RoomHistoryInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomHistoryInfo.java rename to core/src/main/java/com/mango/core/bean/RoomHistoryInfo.java index 4b39cd253..573a2e4e2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomHistoryInfo.java +++ b/core/src/main/java/com/mango/core/bean/RoomHistoryInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.mango.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomMicInfo.java b/core/src/main/java/com/mango/core/bean/RoomMicInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomMicInfo.java rename to core/src/main/java/com/mango/core/bean/RoomMicInfo.java index dd0d12a9d..5de905604 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomMicInfo.java +++ b/core/src/main/java/com/mango/core/bean/RoomMicInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.mango.core.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomNewbieInfo.java b/core/src/main/java/com/mango/core/bean/RoomNewbieInfo.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomNewbieInfo.java rename to core/src/main/java/com/mango/core/bean/RoomNewbieInfo.java index c5cb1544c..e7797fefb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomNewbieInfo.java +++ b/core/src/main/java/com/mango/core/bean/RoomNewbieInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.mango.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomNewbieMessageInfo.java b/core/src/main/java/com/mango/core/bean/RoomNewbieMessageInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomNewbieMessageInfo.java rename to core/src/main/java/com/mango/core/bean/RoomNewbieMessageInfo.java index 75da2532b..2a3862b6c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomNewbieMessageInfo.java +++ b/core/src/main/java/com/mango/core/bean/RoomNewbieMessageInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.mango.core.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomQueueInfo.java b/core/src/main/java/com/mango/core/bean/RoomQueueInfo.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomQueueInfo.java rename to core/src/main/java/com/mango/core/bean/RoomQueueInfo.java index 277250ca2..754757a01 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomQueueInfo.java +++ b/core/src/main/java/com/mango/core/bean/RoomQueueInfo.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.bean; +package com.mango.core.bean; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueData; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; +import com.mango.core.room.giftvalue.bean.GiftValueData; +import com.mango.core.room.queue.bean.MicMemberInfo; /** *

房间麦序单个坑位信息实体，包含麦序状态，成员信息

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/UserInfoItem.java b/core/src/main/java/com/mango/core/bean/UserInfoItem.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/UserInfoItem.java rename to core/src/main/java/com/mango/core/bean/UserInfoItem.java index 4f2fd5c6a..1dde6abbd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/UserInfoItem.java +++ b/core/src/main/java/com/mango/core/bean/UserInfoItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.mango.core.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/VersionInfo.java b/core/src/main/java/com/mango/core/bean/VersionInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/VersionInfo.java rename to core/src/main/java/com/mango/core/bean/VersionInfo.java index 7f47e2c9e..41a7634c1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/VersionInfo.java +++ b/core/src/main/java/com/mango/core/bean/VersionInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.mango.core.bean; /** * Created by huangmeng1 on 2018/7/18. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/attachmsg/RoomQueueMsgAttachment.java b/core/src/main/java/com/mango/core/bean/attachmsg/RoomQueueMsgAttachment.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/attachmsg/RoomQueueMsgAttachment.java rename to core/src/main/java/com/mango/core/bean/attachmsg/RoomQueueMsgAttachment.java index b3fb5534f..30d8a6561 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/attachmsg/RoomQueueMsgAttachment.java +++ b/core/src/main/java/com/mango/core/bean/attachmsg/RoomQueueMsgAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.bean.attachmsg; +package com.mango.core.bean.attachmsg; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.im.custom.bean.CustomAttachment; /** *

队列自定义消息

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/BeanResult.kt b/core/src/main/java/com/mango/core/bean/response/BeanResult.kt similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/BeanResult.kt rename to core/src/main/java/com/mango/core/bean/response/BeanResult.kt index 4495b522b..5ac5af4b5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/BeanResult.kt +++ b/core/src/main/java/com/mango/core/bean/response/BeanResult.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.bean.response +package com.mango.core.bean.response -import com.yizhuan.xchat_android_core.utils.net.ServerException +import com.mango.core.utils.net.ServerException data class BeanResult( val isSuccess: Boolean, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/JsonServiceResult.java b/core/src/main/java/com/mango/core/bean/response/JsonServiceResult.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/JsonServiceResult.java rename to core/src/main/java/com/mango/core/bean/response/JsonServiceResult.java index 88835b638..ab45e686d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/JsonServiceResult.java +++ b/core/src/main/java/com/mango/core/bean/response/JsonServiceResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean.response; +package com.mango.core.bean.response; import com.google.gson.JsonElement; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ListResult.kt b/core/src/main/java/com/mango/core/bean/response/ListResult.kt similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ListResult.kt rename to core/src/main/java/com/mango/core/bean/response/ListResult.kt index 845284d23..c8c39358f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ListResult.kt +++ b/core/src/main/java/com/mango/core/bean/response/ListResult.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean.response +package com.mango.core.bean.response data class ListResult( val isSuccess: Boolean, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/RequestError.java b/core/src/main/java/com/mango/core/bean/response/RequestError.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/RequestError.java rename to core/src/main/java/com/mango/core/bean/response/RequestError.java index de230803b..43705b4ad 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/RequestError.java +++ b/core/src/main/java/com/mango/core/bean/response/RequestError.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean.response; +package com.mango.core.bean.response; /** * Created by zhongyongsheng on 14-6-6. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ResponseData.java b/core/src/main/java/com/mango/core/bean/response/ResponseData.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ResponseData.java rename to core/src/main/java/com/mango/core/bean/response/ResponseData.java index 7f7fb7857..a132946f1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ResponseData.java +++ b/core/src/main/java/com/mango/core/bean/response/ResponseData.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.yizhuan.xchat_android_core.bean.response; +package com.mango.core.bean.response; import com.google.gson.Gson; -import com.yizhuan.xchat_android_library.coremanager.CoreError; +import com.mango.xchat_android_library.coremanager.CoreError; import java.nio.charset.Charset; import java.util.Collections; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ServiceResult.java b/core/src/main/java/com/mango/core/bean/response/ServiceResult.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ServiceResult.java rename to core/src/main/java/com/mango/core/bean/response/ServiceResult.java index 2250f12f3..3085ac1c3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ServiceResult.java +++ b/core/src/main/java/com/mango/core/bean/response/ServiceResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean.response; +package com.mango.core.bean.response; import java.io.Serializable; diff --git a/core/src/main/java/com/mango/core/bean/response/result/ActionDialogResult.java b/core/src/main/java/com/mango/core/bean/response/result/ActionDialogResult.java new file mode 100644 index 000000000..34b3cdd1f --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/ActionDialogResult.java @@ -0,0 +1,14 @@ +package com.mango.core.bean.response.result; + + +import com.mango.core.redPacket.bean.ActionDialogInfo; +import com.mango.core.bean.response.ServiceResult; + +import java.util.List; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class ActionDialogResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/AttentionListResult.java b/core/src/main/java/com/mango/core/bean/response/result/AttentionListResult.java new file mode 100644 index 000000000..be3c80784 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/AttentionListResult.java @@ -0,0 +1,13 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.user.bean.AttentionInfo; +import com.mango.core.bean.response.ServiceResult; + +import java.util.List; + +/** + * Created by Administrator on 2017/7/5 0005. + */ + +public class AttentionListResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/AuctionInfoResult.java b/core/src/main/java/com/mango/core/bean/response/result/AuctionInfoResult.java new file mode 100644 index 000000000..b0c4cee2d --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/AuctionInfoResult.java @@ -0,0 +1,11 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.room.auction.bean.AuctionInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class AuctionInfoResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/AuctionListUserInfoResult.java b/core/src/main/java/com/mango/core/bean/response/result/AuctionListUserInfoResult.java new file mode 100644 index 000000000..951bb2e02 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/AuctionListUserInfoResult.java @@ -0,0 +1,13 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.room.auction.bean.AuctionListUserInfo; +import com.mango.core.bean.response.ServiceResult; + +import java.util.List; + +/** + * Created by chenran on 2017/8/9. + */ + +public class AuctionListUserInfoResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/AuctionUserListResult.java b/core/src/main/java/com/mango/core/bean/response/result/AuctionUserListResult.java new file mode 100644 index 000000000..79aeb596e --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/AuctionUserListResult.java @@ -0,0 +1,13 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.room.auction.bean.AuctionUser; +import com.mango.core.bean.response.ServiceResult; + +import java.util.List; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class AuctionUserListResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/AuctionUserResult.java b/core/src/main/java/com/mango/core/bean/response/result/AuctionUserResult.java new file mode 100644 index 000000000..fc77711e8 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/AuctionUserResult.java @@ -0,0 +1,11 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.room.auction.bean.AuctionUser; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class AuctionUserResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/BoolApiResult.java b/core/src/main/java/com/mango/core/bean/response/result/BoolApiResult.java new file mode 100644 index 000000000..49e70608f --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/BoolApiResult.java @@ -0,0 +1,11 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by chenran on 2017/2/16. + */ + +public class BoolApiResult extends ServiceResult{ + +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/BooleanResult.java b/core/src/main/java/com/mango/core/bean/response/result/BooleanResult.java new file mode 100644 index 000000000..228a4243b --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/BooleanResult.java @@ -0,0 +1,10 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/27. + */ + +public class BooleanResult extends ServiceResult { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ChargeListResult.java b/core/src/main/java/com/mango/core/bean/response/result/ChargeListResult.java similarity index 54% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ChargeListResult.java rename to core/src/main/java/com/mango/core/bean/response/result/ChargeListResult.java index 080496bb3..aa5f4de95 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ChargeListResult.java +++ b/core/src/main/java/com/mango/core/bean/response/result/ChargeListResult.java @@ -1,7 +1,6 @@ -package com.yizhuan.xchat_android_core.bean.response.result; +package com.mango.core.bean.response.result; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.mango.core.pay.bean.ChargeBean; import java.util.List; diff --git a/core/src/main/java/com/mango/core/bean/response/result/CheckLostUserResult.java b/core/src/main/java/com/mango/core/bean/response/result/CheckLostUserResult.java new file mode 100644 index 000000000..9887d054d --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/CheckLostUserResult.java @@ -0,0 +1,7 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.recall.bean.CheckLostUserInfo; + +public class CheckLostUserResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/ExchangeInfoResult.java b/core/src/main/java/com/mango/core/bean/response/result/ExchangeInfoResult.java new file mode 100644 index 000000000..4b72cc995 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/ExchangeInfoResult.java @@ -0,0 +1,11 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.withdraw.bean.ExchangerInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by Administrator on 2017/7/5 0005. + */ + +public class ExchangeInfoResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/FaceResult.java b/core/src/main/java/com/mango/core/bean/response/result/FaceResult.java new file mode 100644 index 000000000..f9178a0b2 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/FaceResult.java @@ -0,0 +1,11 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.room.face.FaceListInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by chenran on 2017/7/27. + */ + +public class FaceResult extends ServiceResult{ +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/FansListResult.java b/core/src/main/java/com/mango/core/bean/response/result/FansListResult.java new file mode 100644 index 000000000..e9eef4480 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/FansListResult.java @@ -0,0 +1,11 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.user.bean.FansListInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by Administrator on 2017/7/5 0005. + */ + +public class FansListResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/GiftInfosResult.java b/core/src/main/java/com/mango/core/bean/response/result/GiftInfosResult.java new file mode 100644 index 000000000..dd58d5718 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/GiftInfosResult.java @@ -0,0 +1,11 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.bills.bean.TextInfos; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by Seven on 2017/9/9. + */ + +public class GiftInfosResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/GiftRecieveInfoResult.java b/core/src/main/java/com/mango/core/bean/response/result/GiftRecieveInfoResult.java new file mode 100644 index 000000000..2a9291a9f --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/GiftRecieveInfoResult.java @@ -0,0 +1,11 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.gift.bean.GiftReceiveInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by chenran on 2017/11/25. + */ + +public class GiftRecieveInfoResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/GiftResult.java b/core/src/main/java/com/mango/core/bean/response/result/GiftResult.java new file mode 100644 index 000000000..b41b760a7 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/GiftResult.java @@ -0,0 +1,11 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.gift.bean.GiftListInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by chenran on 2017/7/27. + */ + +public class GiftResult extends ServiceResult{ +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/GiftWallListResult.java b/core/src/main/java/com/mango/core/bean/response/result/GiftWallListResult.java new file mode 100644 index 000000000..08bdd0d5e --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/GiftWallListResult.java @@ -0,0 +1,13 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.user.bean.GiftWallInfo; +import com.mango.core.bean.response.ServiceResult; + +import java.util.List; + +/** + * Created by chenran on 2017/10/17. + */ + +public class GiftWallListResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/GoBackResult.java b/core/src/main/java/com/mango/core/bean/response/result/GoBackResult.java new file mode 100644 index 000000000..187806870 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/GoBackResult.java @@ -0,0 +1,7 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.recall.bean.GoBackInfo; + +public class GoBackResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/IdQueryUserInfoResult.java b/core/src/main/java/com/mango/core/bean/response/result/IdQueryUserInfoResult.java new file mode 100644 index 000000000..a0568a49e --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/IdQueryUserInfoResult.java @@ -0,0 +1,12 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.auth.entity.AccountInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by chenran on 2017/2/16. + */ + +public class IdQueryUserInfoResult extends ServiceResult{ + +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/InitResult.java b/core/src/main/java/com/mango/core/bean/response/result/InitResult.java new file mode 100644 index 000000000..3421ce1ab --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/InitResult.java @@ -0,0 +1,12 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.initial.bean.InitInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * @author xiaoyu + * @date 2017/12/8 + */ + +public class InitResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/IntegerResult.java b/core/src/main/java/com/mango/core/bean/response/result/IntegerResult.java new file mode 100644 index 000000000..4874c950a --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/IntegerResult.java @@ -0,0 +1,10 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by chenran on 2017/11/15. + */ + +public class IntegerResult extends ServiceResult { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/LoginResult.java b/core/src/main/java/com/mango/core/bean/response/result/LoginResult.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/LoginResult.java rename to core/src/main/java/com/mango/core/bean/response/result/LoginResult.java index 62c5ca3d2..e0a32f460 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/LoginResult.java +++ b/core/src/main/java/com/mango/core/bean/response/result/LoginResult.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.bean.response.result; +package com.mango.core.bean.response.result; -import com.yizhuan.xchat_android_core.auth.entity.AccountInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.mango.core.auth.entity.AccountInfo; +import com.mango.core.bean.response.ServiceResult; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/mango/core/bean/response/result/MultiGiftRecieveInfoResult.java b/core/src/main/java/com/mango/core/bean/response/result/MultiGiftRecieveInfoResult.java new file mode 100644 index 000000000..1a861278d --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/MultiGiftRecieveInfoResult.java @@ -0,0 +1,11 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.gift.bean.MultiGiftReceiveInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by chenran on 2017/11/25. + */ + +public class MultiGiftRecieveInfoResult extends ServiceResult{ +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/RedDrawListInfoResult.java b/core/src/main/java/com/mango/core/bean/response/result/RedDrawListInfoResult.java new file mode 100644 index 000000000..391b4f6be --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/RedDrawListInfoResult.java @@ -0,0 +1,13 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.redPacket.bean.RedDrawListInfo; +import com.mango.core.bean.response.ServiceResult; + +import java.util.List; + +/** + * Created by chenran on 2017/12/4. + */ + +public class RedDrawListInfoResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/RedPacketResult.java b/core/src/main/java/com/mango/core/bean/response/result/RedPacketResult.java new file mode 100644 index 000000000..6009b9283 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/RedPacketResult.java @@ -0,0 +1,12 @@ +package com.mango.core.bean.response.result; + + +import com.mango.core.redPacket.bean.RedPacketInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class RedPacketResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/RegisterResult.java b/core/src/main/java/com/mango/core/bean/response/result/RegisterResult.java new file mode 100644 index 000000000..2a37f5ff8 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/RegisterResult.java @@ -0,0 +1,12 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.auth.entity.TicketInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by chenran on 2017/2/16. + */ + +public class RegisterResult extends ServiceResult{ + +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RequestChargeResult.java b/core/src/main/java/com/mango/core/bean/response/result/RequestChargeResult.java similarity index 55% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RequestChargeResult.java rename to core/src/main/java/com/mango/core/bean/response/result/RequestChargeResult.java index b419c657b..dcbb56957 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RequestChargeResult.java +++ b/core/src/main/java/com/mango/core/bean/response/result/RequestChargeResult.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.bean.response.result; +package com.mango.core.bean.response.result; import com.google.gson.JsonObject; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.mango.core.bean.response.ServiceResult; /** * Created by zhouxiangfeng on 2017/5/4. diff --git a/core/src/main/java/com/mango/core/bean/response/result/RoomConsumeInfoListResult.java b/core/src/main/java/com/mango/core/bean/response/result/RoomConsumeInfoListResult.java new file mode 100644 index 000000000..681bef27a --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/RoomConsumeInfoListResult.java @@ -0,0 +1,13 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.room.queue.bean.RoomConsumeInfo; +import com.mango.core.bean.response.ServiceResult; + +import java.util.List; + +/** + * Created by chenran on 2017/10/2. + */ + +public class RoomConsumeInfoListResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/RoomRewardResult.java b/core/src/main/java/com/mango/core/bean/response/result/RoomRewardResult.java new file mode 100644 index 000000000..30e491543 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/RoomRewardResult.java @@ -0,0 +1,12 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.im.custom.bean.RewardBean; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class RoomRewardResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/ShareRedPacketResult.java b/core/src/main/java/com/mango/core/bean/response/result/ShareRedPacketResult.java new file mode 100644 index 000000000..fe8fcfb44 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/ShareRedPacketResult.java @@ -0,0 +1,12 @@ +package com.mango.core.bean.response.result; + + +import com.mango.core.redPacket.bean.ShareRedBagInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class ShareRedPacketResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/TabResult.java b/core/src/main/java/com/mango/core/bean/response/result/TabResult.java new file mode 100644 index 000000000..1f11c585b --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/TabResult.java @@ -0,0 +1,16 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.bean.RoomSettingTabInfo; + +import java.util.List; + +/** + *

+ * + * @author Administrator + * @date 2017/11/21 + */ +public class TabResult extends ServiceResult> { + +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/TicketResult.java b/core/src/main/java/com/mango/core/bean/response/result/TicketResult.java new file mode 100644 index 000000000..599be5235 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/TicketResult.java @@ -0,0 +1,12 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.auth.entity.TicketInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class TicketResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/UserListResult.java b/core/src/main/java/com/mango/core/bean/response/result/UserListResult.java new file mode 100644 index 000000000..c35b97260 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/UserListResult.java @@ -0,0 +1,14 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.user.bean.UserInfo; +import com.mango.core.bean.response.ServiceResult; + +import java.util.List; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class UserListResult extends ServiceResult> { + +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/UserResult.java b/core/src/main/java/com/mango/core/bean/response/result/UserResult.java new file mode 100644 index 000000000..bf995c003 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/UserResult.java @@ -0,0 +1,12 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.user.bean.UserInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class UserResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/VersionsResult.java b/core/src/main/java/com/mango/core/bean/response/result/VersionsResult.java new file mode 100644 index 000000000..b304417da --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/VersionsResult.java @@ -0,0 +1,10 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by Administrator on 2017/7/12 0012. + */ + +public class VersionsResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/WalletInfoResult.java b/core/src/main/java/com/mango/core/bean/response/result/WalletInfoResult.java new file mode 100644 index 000000000..c8c3c9d70 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/WalletInfoResult.java @@ -0,0 +1,12 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.pay.bean.WalletInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class WalletInfoResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/WithdrawListResult.java b/core/src/main/java/com/mango/core/bean/response/result/WithdrawListResult.java new file mode 100644 index 000000000..18388c954 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/WithdrawListResult.java @@ -0,0 +1,13 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.withdraw.bean.WithdrwaListInfo; +import com.mango.core.bean.response.ServiceResult; + +import java.util.List; + +/** + * Created by Administrator on 2017/7/5 0005. + */ + +public class WithdrawListResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/WithdrawRedListResult.java b/core/src/main/java/com/mango/core/bean/response/result/WithdrawRedListResult.java new file mode 100644 index 000000000..da0161e41 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/WithdrawRedListResult.java @@ -0,0 +1,14 @@ +package com.mango.core.bean.response.result; + + +import com.mango.core.redPacket.bean.WithdrawRedListInfo; +import com.mango.core.bean.response.ServiceResult; + +import java.util.List; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class WithdrawRedListResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/WithdrawRedSucceedResult.java b/core/src/main/java/com/mango/core/bean/response/result/WithdrawRedSucceedResult.java new file mode 100644 index 000000000..fa98dd67f --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/WithdrawRedSucceedResult.java @@ -0,0 +1,12 @@ +package com.mango.core.bean.response.result; + + +import com.mango.core.redPacket.bean.WithdrawRedSucceedInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class WithdrawRedSucceedResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bean/response/result/WithdrawUserInfoResult.java b/core/src/main/java/com/mango/core/bean/response/result/WithdrawUserInfoResult.java new file mode 100644 index 000000000..3a17bea15 --- /dev/null +++ b/core/src/main/java/com/mango/core/bean/response/result/WithdrawUserInfoResult.java @@ -0,0 +1,12 @@ +package com.mango.core.bean.response.result; + +import com.mango.core.withdraw.bean.WithdrawInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class WithdrawUserInfoResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/BillModel.java b/core/src/main/java/com/mango/core/bills/BillModel.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/BillModel.java rename to core/src/main/java/com/mango/core/bills/BillModel.java index 20df54e59..094b3f025 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/BillModel.java +++ b/core/src/main/java/com/mango/core/bills/BillModel.java @@ -1,18 +1,18 @@ -package com.yizhuan.xchat_android_core.bills; +package com.mango.core.bills; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bills.bean.BillType; -import com.yizhuan.xchat_android_core.bills.bean.NobleBillListInfo; -import com.yizhuan.xchat_android_core.bills.result.ChargeResult; -import com.yizhuan.xchat_android_core.bills.result.ExpendResult; -import com.yizhuan.xchat_android_core.bills.result.IncomedResult; -import com.yizhuan.xchat_android_core.bills.result.RedBagResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.bills.bean.BillType; +import com.mango.core.bills.bean.NobleBillListInfo; +import com.mango.core.bills.result.ChargeResult; +import com.mango.core.bills.result.ExpendResult; +import com.mango.core.bills.result.IncomedResult; +import com.mango.core.bills.result.RedBagResult; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/IBillModel.java b/core/src/main/java/com/mango/core/bills/IBillModel.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/IBillModel.java rename to core/src/main/java/com/mango/core/bills/IBillModel.java index 7fd08805a..5d800f869 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/IBillModel.java +++ b/core/src/main/java/com/mango/core/bills/IBillModel.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.bills; +package com.mango.core.bills; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bills.bean.NobleBillListInfo; -import com.yizhuan.xchat_android_core.bills.result.ChargeResult; -import com.yizhuan.xchat_android_core.bills.result.ExpendResult; -import com.yizhuan.xchat_android_core.bills.result.IncomedResult; -import com.yizhuan.xchat_android_core.bills.result.RedBagResult; +import com.mango.core.base.IModel; +import com.mango.core.bills.bean.NobleBillListInfo; +import com.mango.core.bills.result.ChargeResult; +import com.mango.core.bills.result.ExpendResult; +import com.mango.core.bills.result.IncomedResult; +import com.mango.core.bills.result.RedBagResult; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/IRadishGiftModel.java b/core/src/main/java/com/mango/core/bills/IRadishGiftModel.java similarity index 52% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/IRadishGiftModel.java rename to core/src/main/java/com/mango/core/bills/IRadishGiftModel.java index d66dc2cee..e5d4662cb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/IRadishGiftModel.java +++ b/core/src/main/java/com/mango/core/bills/IRadishGiftModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.bills; +package com.mango.core.bills; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bills.result.RadishGiftResult; -import com.yizhuan.xchat_android_core.user.bean.RadishWallInfo; +import com.mango.core.base.IModel; +import com.mango.core.bills.result.RadishGiftResult; +import com.mango.core.user.bean.RadishWallInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/RadishGiftModel.java b/core/src/main/java/com/mango/core/bills/RadishGiftModel.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/RadishGiftModel.java rename to core/src/main/java/com/mango/core/bills/RadishGiftModel.java index e34c2be3a..b89f056c7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/RadishGiftModel.java +++ b/core/src/main/java/com/mango/core/bills/RadishGiftModel.java @@ -1,16 +1,14 @@ -package com.yizhuan.xchat_android_core.bills; +package com.mango.core.bills; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftInfo; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftListInfo; -import com.yizhuan.xchat_android_core.bills.result.RadishGiftResult; -import com.yizhuan.xchat_android_core.user.bean.RadishWallInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.bills.result.RadishGiftResult; +import com.mango.core.user.bean.RadishWallInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/BillItemEntity.java b/core/src/main/java/com/mango/core/bills/bean/BillItemEntity.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/BillItemEntity.java rename to core/src/main/java/com/mango/core/bills/bean/BillItemEntity.java index ef70d2b1b..166bc5491 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/BillItemEntity.java +++ b/core/src/main/java/com/mango/core/bills/bean/BillItemEntity.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/BillType.java b/core/src/main/java/com/mango/core/bills/bean/BillType.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/BillType.java rename to core/src/main/java/com/mango/core/bills/bean/BillType.java index 9879c0c9d..3e5fdeebc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/BillType.java +++ b/core/src/main/java/com/mango/core/bills/bean/BillType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; public class BillType { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/ExpendInfo.java b/core/src/main/java/com/mango/core/bills/bean/ExpendInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/ExpendInfo.java rename to core/src/main/java/com/mango/core/bills/bean/ExpendInfo.java index ea7b912c8..2e360b119 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/ExpendInfo.java +++ b/core/src/main/java/com/mango/core/bills/bean/ExpendInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/ExpendListInfo.java b/core/src/main/java/com/mango/core/bills/bean/ExpendListInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/ExpendListInfo.java rename to core/src/main/java/com/mango/core/bills/bean/ExpendListInfo.java index abc6d1a2e..6b7bf39ce 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/ExpendListInfo.java +++ b/core/src/main/java/com/mango/core/bills/bean/ExpendListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/IncomeInfo.java b/core/src/main/java/com/mango/core/bills/bean/IncomeInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/IncomeInfo.java rename to core/src/main/java/com/mango/core/bills/bean/IncomeInfo.java index 44a90f1d0..ffc9c8333 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/IncomeInfo.java +++ b/core/src/main/java/com/mango/core/bills/bean/IncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; import com.google.gson.annotations.SerializedName; import com.netease.nim.uikit.common.ui.recyclerview.entity.MultiItemEntity; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/IncomeListInfo.java b/core/src/main/java/com/mango/core/bills/bean/IncomeListInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/IncomeListInfo.java rename to core/src/main/java/com/mango/core/bills/bean/IncomeListInfo.java index e68c3f1dd..3c74bdbed 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/IncomeListInfo.java +++ b/core/src/main/java/com/mango/core/bills/bean/IncomeListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/NobleBillListInfo.java b/core/src/main/java/com/mango/core/bills/bean/NobleBillListInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/NobleBillListInfo.java rename to core/src/main/java/com/mango/core/bills/bean/NobleBillListInfo.java index 570674ee5..1ef4b19e5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/NobleBillListInfo.java +++ b/core/src/main/java/com/mango/core/bills/bean/NobleBillListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishGiftInfo.java b/core/src/main/java/com/mango/core/bills/bean/RadishGiftInfo.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishGiftInfo.java rename to core/src/main/java/com/mango/core/bills/bean/RadishGiftInfo.java index 26aa6ca16..b841fa1fb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishGiftInfo.java +++ b/core/src/main/java/com/mango/core/bills/bean/RadishGiftInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishGiftListInfo.java b/core/src/main/java/com/mango/core/bills/bean/RadishGiftListInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishGiftListInfo.java rename to core/src/main/java/com/mango/core/bills/bean/RadishGiftListInfo.java index d6272c8da..eda3ba840 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishGiftListInfo.java +++ b/core/src/main/java/com/mango/core/bills/bean/RadishGiftListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishRecordInfo.java b/core/src/main/java/com/mango/core/bills/bean/RadishRecordInfo.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishRecordInfo.java rename to core/src/main/java/com/mango/core/bills/bean/RadishRecordInfo.java index 079cc8904..dfe5f8ead 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishRecordInfo.java +++ b/core/src/main/java/com/mango/core/bills/bean/RadishRecordInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishRecordListInfo.java b/core/src/main/java/com/mango/core/bills/bean/RadishRecordListInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishRecordListInfo.java rename to core/src/main/java/com/mango/core/bills/bean/RadishRecordListInfo.java index 16fd65da4..82f048590 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishRecordListInfo.java +++ b/core/src/main/java/com/mango/core/bills/bean/RadishRecordListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RedBagInfo.java b/core/src/main/java/com/mango/core/bills/bean/RedBagInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RedBagInfo.java rename to core/src/main/java/com/mango/core/bills/bean/RedBagInfo.java index d50a3756f..17d30aad5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RedBagInfo.java +++ b/core/src/main/java/com/mango/core/bills/bean/RedBagInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RedBagListInfo.java b/core/src/main/java/com/mango/core/bills/bean/RedBagListInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RedBagListInfo.java rename to core/src/main/java/com/mango/core/bills/bean/RedBagListInfo.java index 5b313ffaf..6adb46f86 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RedBagListInfo.java +++ b/core/src/main/java/com/mango/core/bills/bean/RedBagListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/TextInfos.java b/core/src/main/java/com/mango/core/bills/bean/TextInfos.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/TextInfos.java rename to core/src/main/java/com/mango/core/bills/bean/TextInfos.java index 48d50a8e7..2e8fa104d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/TextInfos.java +++ b/core/src/main/java/com/mango/core/bills/bean/TextInfos.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/TimeInfo.java b/core/src/main/java/com/mango/core/bills/bean/TimeInfo.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/TimeInfo.java rename to core/src/main/java/com/mango/core/bills/bean/TimeInfo.java index 86d25cda4..8c430fadc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/TimeInfo.java +++ b/core/src/main/java/com/mango/core/bills/bean/TimeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.mango.core.bills.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/mango/core/bills/result/ChargeResult.java b/core/src/main/java/com/mango/core/bills/result/ChargeResult.java new file mode 100644 index 000000000..89d6d2a37 --- /dev/null +++ b/core/src/main/java/com/mango/core/bills/result/ChargeResult.java @@ -0,0 +1,11 @@ +package com.mango.core.bills.result; + +import com.mango.core.bills.bean.ExpendListInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by Seven on 2017/9/9. + */ + +public class ChargeResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bills/result/ExpendResult.java b/core/src/main/java/com/mango/core/bills/result/ExpendResult.java new file mode 100644 index 000000000..3830002fb --- /dev/null +++ b/core/src/main/java/com/mango/core/bills/result/ExpendResult.java @@ -0,0 +1,11 @@ +package com.mango.core.bills.result; + +import com.mango.core.bills.bean.ExpendListInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by Seven on 2017/9/9. + */ + +public class ExpendResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bills/result/IncomedResult.java b/core/src/main/java/com/mango/core/bills/result/IncomedResult.java new file mode 100644 index 000000000..2f7fd4e41 --- /dev/null +++ b/core/src/main/java/com/mango/core/bills/result/IncomedResult.java @@ -0,0 +1,11 @@ +package com.mango.core.bills.result; + +import com.mango.core.bills.bean.IncomeListInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by Seven on 2017/9/9. + */ + +public class IncomedResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bills/result/RadishGiftResult.java b/core/src/main/java/com/mango/core/bills/result/RadishGiftResult.java new file mode 100644 index 000000000..20ec0c4ca --- /dev/null +++ b/core/src/main/java/com/mango/core/bills/result/RadishGiftResult.java @@ -0,0 +1,7 @@ +package com.mango.core.bills.result; + +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.bills.bean.RadishGiftListInfo; + +public class RadishGiftResult extends ServiceResult { +} diff --git a/core/src/main/java/com/mango/core/bills/result/RedBagResult.java b/core/src/main/java/com/mango/core/bills/result/RedBagResult.java new file mode 100644 index 000000000..624958072 --- /dev/null +++ b/core/src/main/java/com/mango/core/bills/result/RedBagResult.java @@ -0,0 +1,11 @@ +package com.mango.core.bills.result; + +import com.mango.core.bills.bean.RedBagListInfo; +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by Seven on 2017/9/9. + */ + +public class RedBagResult extends ServiceResult { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/certification/CertificationModel.java b/core/src/main/java/com/mango/core/certification/CertificationModel.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/certification/CertificationModel.java rename to core/src/main/java/com/mango/core/certification/CertificationModel.java index 23eaeb4dc..6e2aecb53 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/certification/CertificationModel.java +++ b/core/src/main/java/com/mango/core/certification/CertificationModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.certification; +package com.mango.core.certification; -import com.yizhuan.xchat_android_core.base.BaseModel; +import com.mango.core.base.BaseModel; public class CertificationModel extends BaseModel implements ICertificationModel { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/certification/ICertificationModel.java b/core/src/main/java/com/mango/core/certification/ICertificationModel.java similarity index 58% rename from core/src/main/java/com/yizhuan/xchat_android_core/certification/ICertificationModel.java rename to core/src/main/java/com/mango/core/certification/ICertificationModel.java index bb017a76a..1b38b7302 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/certification/ICertificationModel.java +++ b/core/src/main/java/com/mango/core/certification/ICertificationModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.certification; +package com.mango.core.certification; -import com.yizhuan.xchat_android_core.base.IModel; +import com.mango.core.base.IModel; public interface ICertificationModel extends IModel { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/certification/event/CertificationResultEvent.java b/core/src/main/java/com/mango/core/certification/event/CertificationResultEvent.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/certification/event/CertificationResultEvent.java rename to core/src/main/java/com/mango/core/certification/event/CertificationResultEvent.java index 2020569f6..c6bb75b19 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/certification/event/CertificationResultEvent.java +++ b/core/src/main/java/com/mango/core/certification/event/CertificationResultEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.certification.event; +package com.mango.core.certification.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/community/UserVo.kt b/core/src/main/java/com/mango/core/community/UserVo.kt similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/community/UserVo.kt rename to core/src/main/java/com/mango/core/community/UserVo.kt index 678b53f49..bef5e85ba 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/community/UserVo.kt +++ b/core/src/main/java/com/mango/core/community/UserVo.kt @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.community +package com.mango.core.community -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils +import com.mango.core.decoration.headwear.bean.HeadWearInfo +import com.mango.core.utils.CurrentTimeUtils import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/contacts/ContactModel.java b/core/src/main/java/com/mango/core/contacts/ContactModel.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/contacts/ContactModel.java rename to core/src/main/java/com/mango/core/contacts/ContactModel.java index d045f46f3..4cb92ac47 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/contacts/ContactModel.java +++ b/core/src/main/java/com/mango/core/contacts/ContactModel.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.contacts; +package com.mango.core.contacts; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.bean.SearchRoomInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/mango/core/contacts/IContactModel.java b/core/src/main/java/com/mango/core/contacts/IContactModel.java new file mode 100644 index 000000000..e6e34d265 --- /dev/null +++ b/core/src/main/java/com/mango/core/contacts/IContactModel.java @@ -0,0 +1,14 @@ +package com.mango.core.contacts; + +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.bean.SearchRoomInfo; + +import java.util.List; + +import io.reactivex.Single; + +public interface IContactModel extends IModel { + + Single>> searchContacts(String keyword); +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationInfo.kt b/core/src/main/java/com/mango/core/decoration/DecorationInfo.kt similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationInfo.kt rename to core/src/main/java/com/mango/core/decoration/DecorationInfo.kt index 15edc3555..fde2ccd7b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationInfo.kt +++ b/core/src/main/java/com/mango/core/decoration/DecorationInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration +package com.mango.core.decoration data class DecorationInfo( val dressDay: Int = 0, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationInfoEvent.java b/core/src/main/java/com/mango/core/decoration/DecorationInfoEvent.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationInfoEvent.java rename to core/src/main/java/com/mango/core/decoration/DecorationInfoEvent.java index 6e639c3ac..103380f18 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationInfoEvent.java +++ b/core/src/main/java/com/mango/core/decoration/DecorationInfoEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration; +package com.mango.core.decoration; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationModel.kt b/core/src/main/java/com/mango/core/decoration/DecorationModel.kt similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationModel.kt rename to core/src/main/java/com/mango/core/decoration/DecorationModel.kt index a4cdd647b..8194bf38a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationModel.kt +++ b/core/src/main/java/com/mango/core/decoration/DecorationModel.kt @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.decoration +package com.mango.core.decoration -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.utils.net.RxHelper -import com.yizhuan.xchat_android_core.utils.net.launchRequest -import com.yizhuan.xchat_android_library.net.rxnet.RxNet +import com.mango.core.base.BaseModel +import com.mango.core.bean.response.ServiceResult +import com.mango.core.utils.net.RxHelper +import com.mango.core.utils.net.launchRequest +import com.mango.xchat_android_library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.* diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/BackgroundModel.java b/core/src/main/java/com/mango/core/decoration/backgroud/BackgroundModel.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/BackgroundModel.java rename to core/src/main/java/com/mango/core/decoration/backgroud/BackgroundModel.java index b8f8afbf8..02d683ebe 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/BackgroundModel.java +++ b/core/src/main/java/com/mango/core/decoration/backgroud/BackgroundModel.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.decoration.backgroud; +package com.mango.core.decoration.backgroud; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.backgroud.bean.BgInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.throwable.HeadwearPulledOffShelvesException; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.backgroud.bean.BgInfo; +import com.mango.core.decoration.headwear.throwable.HeadwearPulledOffShelvesException; +import com.mango.core.utils.net.BalanceNotEnoughExeption; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/IBackgroundModel.java b/core/src/main/java/com/mango/core/decoration/backgroud/IBackgroundModel.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/IBackgroundModel.java rename to core/src/main/java/com/mango/core/decoration/backgroud/IBackgroundModel.java index 24ebeef9c..e25d399f7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/IBackgroundModel.java +++ b/core/src/main/java/com/mango/core/decoration/backgroud/IBackgroundModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.decoration.backgroud; +package com.mango.core.decoration.backgroud; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.backgroud.bean.BgInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.backgroud.bean.BgInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/bean/BgInfo.java b/core/src/main/java/com/mango/core/decoration/backgroud/bean/BgInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/bean/BgInfo.java rename to core/src/main/java/com/mango/core/decoration/backgroud/bean/BgInfo.java index a34736b5b..9a6cc4260 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/bean/BgInfo.java +++ b/core/src/main/java/com/mango/core/decoration/backgroud/bean/BgInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.backgroud.bean; +package com.mango.core.decoration.backgroud.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/BaseDecoration.java b/core/src/main/java/com/mango/core/decoration/bean/BaseDecoration.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/BaseDecoration.java rename to core/src/main/java/com/mango/core/decoration/bean/BaseDecoration.java index 711ff8140..2d8fb9f2f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/BaseDecoration.java +++ b/core/src/main/java/com/mango/core/decoration/bean/BaseDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.bean; +package com.mango.core.decoration.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/CurrencyType.java b/core/src/main/java/com/mango/core/decoration/bean/CurrencyType.java similarity index 72% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/CurrencyType.java rename to core/src/main/java/com/mango/core/decoration/bean/CurrencyType.java index e67905af6..5ce24490d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/CurrencyType.java +++ b/core/src/main/java/com/mango/core/decoration/bean/CurrencyType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.bean; +package com.mango.core.decoration.bean; /** * 虚拟币类型 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/DecorationStoreRouterType.java b/core/src/main/java/com/mango/core/decoration/bean/DecorationStoreRouterType.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/DecorationStoreRouterType.java rename to core/src/main/java/com/mango/core/decoration/bean/DecorationStoreRouterType.java index a1e70de6a..99ab56e81 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/DecorationStoreRouterType.java +++ b/core/src/main/java/com/mango/core/decoration/bean/DecorationStoreRouterType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.bean; +package com.mango.core.decoration.bean; public class DecorationStoreRouterType { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/CarModel.java b/core/src/main/java/com/mango/core/decoration/car/CarModel.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/CarModel.java rename to core/src/main/java/com/mango/core/decoration/car/CarModel.java index 6a543f4c2..8430bd1cd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/CarModel.java +++ b/core/src/main/java/com/mango/core/decoration/car/CarModel.java @@ -1,13 +1,12 @@ -package com.yizhuan.xchat_android_core.decoration.car; +package com.mango.core.decoration.car; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.RadishNotEnoughException; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.core.utils.net.BalanceNotEnoughExeption; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.List; @@ -189,7 +188,7 @@ public class CarModel extends BaseModel implements ICarModel { * 赠送座驾V2 * * @param targetUid 赠送人 - * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType} + * @param currencyType {@link com.mango.core.decoration.bean.CurrencyType} * 支付货币类型：0钻石，1萝卜 * @return */ @@ -323,7 +322,7 @@ public class CarModel extends BaseModel implements ICarModel { * 赠送座驾V2 * * @param targetUid 被赠送人 - * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType} + * @param currencyType {@link com.mango.core.decoration.bean.CurrencyType} */ @POST("car/pay/v2/giveCar") Single> sendCarV2(@Query("uid") String uid, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/ICarModel.java b/core/src/main/java/com/mango/core/decoration/car/ICarModel.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/ICarModel.java rename to core/src/main/java/com/mango/core/decoration/car/ICarModel.java index d4174654b..83eb434a1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/ICarModel.java +++ b/core/src/main/java/com/mango/core/decoration/car/ICarModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.decoration.car; +package com.mango.core.decoration.car; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.car.bean.CarInfo; import java.util.List; @@ -84,7 +84,7 @@ public interface ICarModel extends IModel { * 赠送座驾V2 * * @param targetUid 被赠送人 - * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType} + * @param currencyType {@link com.mango.core.decoration.bean.CurrencyType} * 虚拟币类型 */ Single sendCarV2(String targetUid, String carId, int currencyType); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/bean/CarInfo.java b/core/src/main/java/com/mango/core/decoration/car/bean/CarInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/bean/CarInfo.java rename to core/src/main/java/com/mango/core/decoration/car/bean/CarInfo.java index d76bc25f9..93c4803e5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/bean/CarInfo.java +++ b/core/src/main/java/com/mango/core/decoration/car/bean/CarInfo.java @@ -1,15 +1,12 @@ -package com.yizhuan.xchat_android_core.decoration.car.bean; +package com.mango.core.decoration.car.bean; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.decoration.bean.BaseDecoration; +import com.mango.core.decoration.bean.BaseDecoration; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import io.realm.RealmObject; -import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/HeadwearModel.java b/core/src/main/java/com/mango/core/decoration/headwear/HeadwearModel.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/HeadwearModel.java rename to core/src/main/java/com/mango/core/decoration/headwear/HeadwearModel.java index f8a3b92b3..06a0e0d7e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/HeadwearModel.java +++ b/core/src/main/java/com/mango/core/decoration/headwear/HeadwearModel.java @@ -1,17 +1,17 @@ -package com.yizhuan.xchat_android_core.decoration.headwear; +package com.mango.core.decoration.headwear; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.ChatBubbleInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.throwable.HeadwearPulledOffShelvesException; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.headwear.bean.ChatBubbleInfo; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.decoration.headwear.bean.UserCardWearInfo; +import com.mango.core.decoration.headwear.throwable.HeadwearPulledOffShelvesException; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.utils.net.BalanceNotEnoughExeption; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.List; @@ -185,7 +185,7 @@ public class HeadwearModel extends BaseModel implements IHeadwearModel { /** * 购买/续费头饰 * - * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType} + * @param currencyType {@link com.mango.core.decoration.bean.CurrencyType} * @return */ @Override @@ -244,7 +244,7 @@ public class HeadwearModel extends BaseModel implements IHeadwearModel { /** * 赠送头饰 * - * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType} + * @param currencyType {@link com.mango.core.decoration.bean.CurrencyType} * 支付货币类型：0钻石，1萝卜 */ @Override diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/IHeadwearModel.java b/core/src/main/java/com/mango/core/decoration/headwear/IHeadwearModel.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/IHeadwearModel.java rename to core/src/main/java/com/mango/core/decoration/headwear/IHeadwearModel.java index 27e8d9648..dfa4f5b61 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/IHeadwearModel.java +++ b/core/src/main/java/com/mango/core/decoration/headwear/IHeadwearModel.java @@ -1,11 +1,10 @@ -package com.yizhuan.xchat_android_core.decoration.headwear; +package com.mango.core.decoration.headwear; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.ChatBubbleInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo; -import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.headwear.bean.ChatBubbleInfo; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.decoration.headwear.bean.UserCardWearInfo; import java.util.List; @@ -91,7 +90,7 @@ public interface IHeadwearModel extends IModel { /** * 赠送头饰 * - * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType} + * @param currencyType {@link com.mango.core.decoration.bean.CurrencyType} * 支付货币类型：0钻石，1萝卜 */ Single sendHeadWearV2(int currencyType, String headwearId, String targetUid); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/ChatBubbleInfo.java b/core/src/main/java/com/mango/core/decoration/headwear/bean/ChatBubbleInfo.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/ChatBubbleInfo.java rename to core/src/main/java/com/mango/core/decoration/headwear/bean/ChatBubbleInfo.java index 279a717f1..9c287735b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/ChatBubbleInfo.java +++ b/core/src/main/java/com/mango/core/decoration/headwear/bean/ChatBubbleInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.headwear.bean; +package com.mango.core.decoration.headwear.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/HeadWearInfo.java b/core/src/main/java/com/mango/core/decoration/headwear/bean/HeadWearInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/HeadWearInfo.java rename to core/src/main/java/com/mango/core/decoration/headwear/bean/HeadWearInfo.java index 61e756a29..93368bc07 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/HeadWearInfo.java +++ b/core/src/main/java/com/mango/core/decoration/headwear/bean/HeadWearInfo.java @@ -1,12 +1,11 @@ -package com.yizhuan.xchat_android_core.decoration.headwear.bean; +package com.mango.core.decoration.headwear.bean; -import com.yizhuan.xchat_android_core.decoration.bean.BaseDecoration; +import com.mango.core.decoration.bean.BaseDecoration; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import lombok.Data; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/UserCardWearInfo.java b/core/src/main/java/com/mango/core/decoration/headwear/bean/UserCardWearInfo.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/UserCardWearInfo.java rename to core/src/main/java/com/mango/core/decoration/headwear/bean/UserCardWearInfo.java index 2501eca51..05d00e25b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/UserCardWearInfo.java +++ b/core/src/main/java/com/mango/core/decoration/headwear/bean/UserCardWearInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.headwear.bean; +package com.mango.core.decoration.headwear.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java b/core/src/main/java/com/mango/core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java rename to core/src/main/java/com/mango/core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java index 1fbb623fe..22a04769d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java +++ b/core/src/main/java/com/mango/core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.headwear.throwable; +package com.mango.core.decoration.headwear.throwable; public class HeadwearPulledOffShelvesException extends Exception{ public final static int code = 6202;//头饰下架异常码 diff --git a/core/src/main/java/com/mango/core/decoration/nameplate/INamePlateModel.java b/core/src/main/java/com/mango/core/decoration/nameplate/INamePlateModel.java new file mode 100644 index 000000000..8c5874fe9 --- /dev/null +++ b/core/src/main/java/com/mango/core/decoration/nameplate/INamePlateModel.java @@ -0,0 +1,18 @@ +package com.mango.core.decoration.nameplate; + +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.nameplate.bean.NamePlateInfo; + +import io.reactivex.Single; + +public interface INamePlateModel extends IModel { + + /** + * 获取我的铭牌列表 + * + * @return + */ + Single> getNamePlateList(long uid); + +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/NamePlateModel.java b/core/src/main/java/com/mango/core/decoration/nameplate/NamePlateModel.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/NamePlateModel.java rename to core/src/main/java/com/mango/core/decoration/nameplate/NamePlateModel.java index 0b19d0ecd..a97eed203 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/NamePlateModel.java +++ b/core/src/main/java/com/mango/core/decoration/nameplate/NamePlateModel.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.decoration.nameplate; +package com.mango.core.decoration.nameplate; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.nameplate.bean.NamePlateInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import io.reactivex.SingleSource; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/bean/NamePlateInfo.java b/core/src/main/java/com/mango/core/decoration/nameplate/bean/NamePlateInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/bean/NamePlateInfo.java rename to core/src/main/java/com/mango/core/decoration/nameplate/bean/NamePlateInfo.java index 5c5767005..223375699 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/bean/NamePlateInfo.java +++ b/core/src/main/java/com/mango/core/decoration/nameplate/bean/NamePlateInfo.java @@ -1,11 +1,6 @@ -package com.yizhuan.xchat_android_core.decoration.nameplate.bean; +package com.mango.core.decoration.nameplate.bean; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; - -import java.util.HashMap; import java.util.List; -import java.util.Map; public class NamePlateInfo { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java b/core/src/main/java/com/mango/core/exception/ErrorThrowable.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java rename to core/src/main/java/com/mango/core/exception/ErrorThrowable.java index 42ab60ee9..4ff31b41c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java +++ b/core/src/main/java/com/mango/core/exception/ErrorThrowable.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.exception; +package com.mango.core.exception; import androidx.annotation.StringDef; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/exception/FailReasonException.java b/core/src/main/java/com/mango/core/exception/FailReasonException.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/exception/FailReasonException.java rename to core/src/main/java/com/mango/core/exception/FailReasonException.java index ba54cc5c1..559f852de 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/exception/FailReasonException.java +++ b/core/src/main/java/com/mango/core/exception/FailReasonException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.exception; +package com.mango.core.exception; /** * 接口上返回的 error code，用这个类封装起来 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/exception/NullDataException.java b/core/src/main/java/com/mango/core/exception/NullDataException.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/exception/NullDataException.java rename to core/src/main/java/com/mango/core/exception/NullDataException.java index db8501b13..409616958 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/exception/NullDataException.java +++ b/core/src/main/java/com/mango/core/exception/NullDataException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.exception; +package com.mango.core.exception; /** * Created by MadisonRong on 2019-08-16 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/exception/UnKnowException.java b/core/src/main/java/com/mango/core/exception/UnKnowException.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/exception/UnKnowException.java rename to core/src/main/java/com/mango/core/exception/UnKnowException.java index 8329269b3..2237a7498 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/exception/UnKnowException.java +++ b/core/src/main/java/com/mango/core/exception/UnKnowException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.exception; +package com.mango.core.exception; /** * 未知错误 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/BillDateDivInfo.java b/core/src/main/java/com/mango/core/family/bean/BillDateDivInfo.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/BillDateDivInfo.java rename to core/src/main/java/com/mango/core/family/bean/BillDateDivInfo.java index bd6e49253..433f2ec4f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/BillDateDivInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/BillDateDivInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/CustomServiceInfo.java b/core/src/main/java/com/mango/core/family/bean/CustomServiceInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/CustomServiceInfo.java rename to core/src/main/java/com/mango/core/family/bean/CustomServiceInfo.java index ded182486..8779c692f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/CustomServiceInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/CustomServiceInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyCustomServiceInfo.java b/core/src/main/java/com/mango/core/family/bean/FamilyCustomServiceInfo.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyCustomServiceInfo.java rename to core/src/main/java/com/mango/core/family/bean/FamilyCustomServiceInfo.java index 933a1c56a..6b8c76258 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyCustomServiceInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/FamilyCustomServiceInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyGameInfo.java b/core/src/main/java/com/mango/core/family/bean/FamilyGameInfo.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyGameInfo.java rename to core/src/main/java/com/mango/core/family/bean/FamilyGameInfo.java index 9cbed04f2..4519ae949 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyGameInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/FamilyGameInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyGroupInfo.java b/core/src/main/java/com/mango/core/family/bean/FamilyGroupInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyGroupInfo.java rename to core/src/main/java/com/mango/core/family/bean/FamilyGroupInfo.java index 62b687448..b9e6fa1b3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyGroupInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/FamilyGroupInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyInfo.java b/core/src/main/java/com/mango/core/family/bean/FamilyInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyInfo.java rename to core/src/main/java/com/mango/core/family/bean/FamilyInfo.java index bdf5343f0..f8317ec05 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/FamilyInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyInfoInUserInfo.java b/core/src/main/java/com/mango/core/family/bean/FamilyInfoInUserInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyInfoInUserInfo.java rename to core/src/main/java/com/mango/core/family/bean/FamilyInfoInUserInfo.java index 1fcad2559..2d69546eb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyInfoInUserInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/FamilyInfoInUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java b/core/src/main/java/com/mango/core/family/bean/FamilyManageItemInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java rename to core/src/main/java/com/mango/core/family/bean/FamilyManageItemInfo.java index 4f8387e22..ab94aaf86 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/FamilyManageItemInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; import androidx.annotation.DrawableRes; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyMemberInfo.java b/core/src/main/java/com/mango/core/family/bean/FamilyMemberInfo.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyMemberInfo.java rename to core/src/main/java/com/mango/core/family/bean/FamilyMemberInfo.java index 3db6573dc..059db18be 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyMemberInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/FamilyMemberInfo.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.noble.NobleInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyPlazaInfo.java b/core/src/main/java/com/mango/core/family/bean/FamilyPlazaInfo.java similarity index 61% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyPlazaInfo.java rename to core/src/main/java/com/mango/core/family/bean/FamilyPlazaInfo.java index 813dd06e0..be6401717 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyPlazaInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/FamilyPlazaInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; -import com.yizhuan.xchat_android_core.family.bean.response.familyPlaza.RespFamily; +import com.mango.core.family.bean.response.familyPlaza.RespFamily; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FindBannerInfo.java b/core/src/main/java/com/mango/core/family/bean/FindBannerInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FindBannerInfo.java rename to core/src/main/java/com/mango/core/family/bean/FindBannerInfo.java index a068acf5f..c0c878622 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FindBannerInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/FindBannerInfo.java @@ -1,10 +1,8 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; import android.os.Parcel; import android.os.Parcelable; -import java.util.List; - import lombok.Data; /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeBannerInfo.java b/core/src/main/java/com/mango/core/family/bean/HomeBannerInfo.java similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeBannerInfo.java rename to core/src/main/java/com/mango/core/family/bean/HomeBannerInfo.java index 7e9ccd352..2b0c8c729 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeBannerInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/HomeBannerInfo.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.core.home.bean.BannerInfo; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeTitleInfo.java b/core/src/main/java/com/mango/core/family/bean/HomeTitleInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeTitleInfo.java rename to core/src/main/java/com/mango/core/family/bean/HomeTitleInfo.java index 43d02c09a..a1382d3e5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeTitleInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/HomeTitleInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.mango.core.utils.SharedPreferenceUtils; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/TransactionRecordInfo.java b/core/src/main/java/com/mango/core/family/bean/TransactionRecordInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/TransactionRecordInfo.java rename to core/src/main/java/com/mango/core/family/bean/TransactionRecordInfo.java index 90e88e302..934144b75 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/TransactionRecordInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/TransactionRecordInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/VMBillItemInfo.java b/core/src/main/java/com/mango/core/family/bean/VMBillItemInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/VMBillItemInfo.java rename to core/src/main/java/com/mango/core/family/bean/VMBillItemInfo.java index d1911f443..636f8615b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/VMBillItemInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/VMBillItemInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.mango.core.family.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RankingFamilyInfo.java b/core/src/main/java/com/mango/core/family/bean/response/RankingFamilyInfo.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RankingFamilyInfo.java rename to core/src/main/java/com/mango/core/family/bean/response/RankingFamilyInfo.java index 693a81ef8..7a1620805 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RankingFamilyInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/response/RankingFamilyInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean.response; +package com.mango.core.family.bean.response; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RespFamilyGameList.java b/core/src/main/java/com/mango/core/family/bean/response/RespFamilyGameList.java similarity index 59% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RespFamilyGameList.java rename to core/src/main/java/com/mango/core/family/bean/response/RespFamilyGameList.java index 065ba7a96..86bd2b4ff 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RespFamilyGameList.java +++ b/core/src/main/java/com/mango/core/family/bean/response/RespFamilyGameList.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.family.bean.response; +package com.mango.core.family.bean.response; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; +import com.mango.core.family.bean.FamilyGameInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RespFamilyRankList.java b/core/src/main/java/com/mango/core/family/bean/response/RespFamilyRankList.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RespFamilyRankList.java rename to core/src/main/java/com/mango/core/family/bean/response/RespFamilyRankList.java index de4b74a29..1a019d41f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RespFamilyRankList.java +++ b/core/src/main/java/com/mango/core/family/bean/response/RespFamilyRankList.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean.response; +package com.mango.core.family.bean.response; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/familyPlaza/RespFamily.java b/core/src/main/java/com/mango/core/family/bean/response/familyPlaza/RespFamily.java similarity index 59% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/familyPlaza/RespFamily.java rename to core/src/main/java/com/mango/core/family/bean/response/familyPlaza/RespFamily.java index 026a159d0..caf3d88ca 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/familyPlaza/RespFamily.java +++ b/core/src/main/java/com/mango/core/family/bean/response/familyPlaza/RespFamily.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.family.bean.response.familyPlaza; +package com.mango.core.family.bean.response.familyPlaza; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.mango.core.family.bean.FamilyInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/memberList/RespFamilymember.java b/core/src/main/java/com/mango/core/family/bean/response/memberList/RespFamilymember.java similarity index 61% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/memberList/RespFamilymember.java rename to core/src/main/java/com/mango/core/family/bean/response/memberList/RespFamilymember.java index 64e86351c..cf6d1a2be 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/memberList/RespFamilymember.java +++ b/core/src/main/java/com/mango/core/family/bean/response/memberList/RespFamilymember.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.family.bean.response.memberList; +package com.mango.core.family.bean.response.memberList; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.mango.core.family.bean.FamilyMemberInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java b/core/src/main/java/com/mango/core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java rename to core/src/main/java/com/mango/core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java index b9a6efa75..dd74e2d20 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java +++ b/core/src/main/java/com/mango/core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean.response.moneyManagement; +package com.mango.core.family.bean.response.moneyManagement; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/MonthlyRecord.java b/core/src/main/java/com/mango/core/family/bean/response/moneyManagement/MonthlyRecord.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/MonthlyRecord.java rename to core/src/main/java/com/mango/core/family/bean/response/moneyManagement/MonthlyRecord.java index e7fe0ef7b..a6ec88678 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/MonthlyRecord.java +++ b/core/src/main/java/com/mango/core/family/bean/response/moneyManagement/MonthlyRecord.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean.response.moneyManagement; +package com.mango.core.family.bean.response.moneyManagement; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/TradeMoneyRecord.java b/core/src/main/java/com/mango/core/family/bean/response/moneyManagement/TradeMoneyRecord.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/TradeMoneyRecord.java rename to core/src/main/java/com/mango/core/family/bean/response/moneyManagement/TradeMoneyRecord.java index d264d5fb3..a61830ac2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/TradeMoneyRecord.java +++ b/core/src/main/java/com/mango/core/family/bean/response/moneyManagement/TradeMoneyRecord.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean.response.moneyManagement; +package com.mango.core.family.bean.response.moneyManagement; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyCurrencyUpdateEvent.java b/core/src/main/java/com/mango/core/family/event/FamilyCurrencyUpdateEvent.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyCurrencyUpdateEvent.java rename to core/src/main/java/com/mango/core/family/event/FamilyCurrencyUpdateEvent.java index c8e9ff96d..ec6bf7d2a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyCurrencyUpdateEvent.java +++ b/core/src/main/java/com/mango/core/family/event/FamilyCurrencyUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.event; +package com.mango.core.family.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyMemberUpdateEvent.java b/core/src/main/java/com/mango/core/family/event/FamilyMemberUpdateEvent.java similarity index 65% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyMemberUpdateEvent.java rename to core/src/main/java/com/mango/core/family/event/FamilyMemberUpdateEvent.java index 32632673c..21f29aebd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyMemberUpdateEvent.java +++ b/core/src/main/java/com/mango/core/family/event/FamilyMemberUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.event; +package com.mango.core.family.event; /** * @author jack diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyMineEvent.java b/core/src/main/java/com/mango/core/family/event/FamilyMineEvent.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyMineEvent.java rename to core/src/main/java/com/mango/core/family/event/FamilyMineEvent.java index 82d09bafb..2185c9276 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyMineEvent.java +++ b/core/src/main/java/com/mango/core/family/event/FamilyMineEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.event; +package com.mango.core.family.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyUpdateEvent.java b/core/src/main/java/com/mango/core/family/event/FamilyUpdateEvent.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyUpdateEvent.java rename to core/src/main/java/com/mango/core/family/event/FamilyUpdateEvent.java index 00a706f53..8f38d5552 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyUpdateEvent.java +++ b/core/src/main/java/com/mango/core/family/event/FamilyUpdateEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.family.event; +package com.mango.core.family.event; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.mango.core.family.bean.FamilyInfo; 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/mango/core/family/model/FamilyModel.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java rename to core/src/main/java/com/mango/core/family/model/FamilyModel.java index 8c775ce54..4107256cc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java +++ b/core/src/main/java/com/mango/core/family/model/FamilyModel.java @@ -1,35 +1,35 @@ -package com.yizhuan.xchat_android_core.family.model; +package com.mango.core.family.model; import android.annotation.SuppressLint; import androidx.annotation.Nullable; import android.text.TextUtils; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.base.BaseModel; -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; -import com.yizhuan.xchat_android_core.family.bean.FamilyPlazaInfo; -import com.yizhuan.xchat_android_core.family.bean.FindBannerInfo; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyGameList; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList; -import com.yizhuan.xchat_android_core.family.bean.response.familyPlaza.RespFamily; -import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.TradeMoneyRecord; -import com.yizhuan.xchat_android_core.family.event.FamilyCurrencyUpdateEvent; -import com.yizhuan.xchat_android_core.family.event.FamilyMineEvent; -import com.yizhuan.xchat_android_core.family.event.FamilyUpdateEvent; -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.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.event.LoginEvent; +import com.mango.core.auth.event.LogoutEvent; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.family.bean.FamilyCustomServiceInfo; +import com.mango.core.family.bean.FamilyGameInfo; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.bean.FamilyPlazaInfo; +import com.mango.core.family.bean.FindBannerInfo; +import com.mango.core.family.bean.response.RespFamilyGameList; +import com.mango.core.family.bean.response.RespFamilyRankList; +import com.mango.core.family.bean.response.familyPlaza.RespFamily; +import com.mango.core.family.bean.response.memberList.RespFamilymember; +import com.mango.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.mango.core.family.bean.response.moneyManagement.TradeMoneyRecord; +import com.mango.core.family.event.FamilyCurrencyUpdateEvent; +import com.mango.core.family.event.FamilyMineEvent; +import com.mango.core.family.event.FamilyUpdateEvent; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.rxbus.RxBusHelper; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java b/core/src/main/java/com/mango/core/family/model/IFamilyModel.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java rename to core/src/main/java/com/mango/core/family/model/IFamilyModel.java index 8fa6f01f4..9579586af 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java +++ b/core/src/main/java/com/mango/core/family/model/IFamilyModel.java @@ -1,18 +1,18 @@ -package com.yizhuan.xchat_android_core.family.model; +package com.mango.core.family.model; import androidx.annotation.Nullable; -import com.yizhuan.xchat_android_core.base.IModel; -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; -import com.yizhuan.xchat_android_core.family.bean.FamilyPlazaInfo; -import com.yizhuan.xchat_android_core.family.bean.FindBannerInfo; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList; -import com.yizhuan.xchat_android_core.family.bean.response.familyPlaza.RespFamily; -import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.TradeMoneyRecord; +import com.mango.core.base.IModel; +import com.mango.core.family.bean.FamilyCustomServiceInfo; +import com.mango.core.family.bean.FamilyGameInfo; +import com.mango.core.family.bean.FamilyInfo; +import com.mango.core.family.bean.FamilyPlazaInfo; +import com.mango.core.family.bean.FindBannerInfo; +import com.mango.core.family.bean.response.RespFamilyRankList; +import com.mango.core.family.bean.response.familyPlaza.RespFamily; +import com.mango.core.family.bean.response.memberList.RespFamilymember; +import com.mango.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.mango.core.family.bean.response.moneyManagement.TradeMoneyRecord; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamInfo.kt b/core/src/main/java/com/mango/core/fansteam/FansTeamInfo.kt similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamInfo.kt rename to core/src/main/java/com/mango/core/fansteam/FansTeamInfo.kt index 34ab320d3..db573612c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamInfo.kt +++ b/core/src/main/java/com/mango/core/fansteam/FansTeamInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.mango.core.fansteam data class FansTeamInfo( val anchorAvatar: String = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamInitInfo.kt b/core/src/main/java/com/mango/core/fansteam/FansTeamInitInfo.kt similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamInitInfo.kt rename to core/src/main/java/com/mango/core/fansteam/FansTeamInitInfo.kt index 3aed3f47c..61a5e9678 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamInitInfo.kt +++ b/core/src/main/java/com/mango/core/fansteam/FansTeamInitInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.mango.core.fansteam data class FansTeamInitInfo( val anchorFansNum: Int = 0, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamJoinInfo.kt b/core/src/main/java/com/mango/core/fansteam/FansTeamJoinInfo.kt similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamJoinInfo.kt rename to core/src/main/java/com/mango/core/fansteam/FansTeamJoinInfo.kt index 49010556e..731c338c4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamJoinInfo.kt +++ b/core/src/main/java/com/mango/core/fansteam/FansTeamJoinInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.mango.core.fansteam data class FansTeamJoinInfo( diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamJoinedInfo.kt b/core/src/main/java/com/mango/core/fansteam/FansTeamJoinedInfo.kt similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamJoinedInfo.kt rename to core/src/main/java/com/mango/core/fansteam/FansTeamJoinedInfo.kt index 20f091f88..db0a24fa9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamJoinedInfo.kt +++ b/core/src/main/java/com/mango/core/fansteam/FansTeamJoinedInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.mango.core.fansteam data class FansTeamJoinedInfo( val anchorAvatar: String = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamModel.kt b/core/src/main/java/com/mango/core/fansteam/FansTeamModel.kt similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamModel.kt rename to core/src/main/java/com/mango/core/fansteam/FansTeamModel.kt index a9b128e0b..52368394d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamModel.kt +++ b/core/src/main/java/com/mango/core/fansteam/FansTeamModel.kt @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.mango.core.fansteam -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.net.launchRequest -import com.yizhuan.xchat_android_library.net.rxnet.RxNet +import com.mango.core.base.BaseModel +import com.mango.core.bean.response.ServiceResult +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.utils.net.launchRequest +import com.mango.xchat_android_library.net.rxnet.RxNet import retrofit2.http.GET import retrofit2.http.Query diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamMsgInfo.kt b/core/src/main/java/com/mango/core/fansteam/FansTeamMsgInfo.kt similarity index 57% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamMsgInfo.kt rename to core/src/main/java/com/mango/core/fansteam/FansTeamMsgInfo.kt index 66e733ebb..7e5fa649b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamMsgInfo.kt +++ b/core/src/main/java/com/mango/core/fansteam/FansTeamMsgInfo.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.mango.core.fansteam -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo +import com.mango.core.gift.bean.GiftInfo data class FansTeamMsgInfo( val uid: Long = 0, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamTaskInfo.kt b/core/src/main/java/com/mango/core/fansteam/FansTeamTaskInfo.kt similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamTaskInfo.kt rename to core/src/main/java/com/mango/core/fansteam/FansTeamTaskInfo.kt index 47f48f40c..f7c7de4bf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamTaskInfo.kt +++ b/core/src/main/java/com/mango/core/fansteam/FansTeamTaskInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.mango.core.fansteam data class FansTeamTaskInfo( val awardVal: Int = 0, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/PrivilegeConfigVo.kt b/core/src/main/java/com/mango/core/fansteam/PrivilegeConfigVo.kt similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/PrivilegeConfigVo.kt rename to core/src/main/java/com/mango/core/fansteam/PrivilegeConfigVo.kt index 9e341cdad..ee1774ffc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/PrivilegeConfigVo.kt +++ b/core/src/main/java/com/mango/core/fansteam/PrivilegeConfigVo.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.mango.core.fansteam -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo +import com.mango.core.gift.bean.GiftInfo data class PrivilegeConfigVo( val createTime: String = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/file/FileModel.java b/core/src/main/java/com/mango/core/file/FileModel.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/file/FileModel.java rename to core/src/main/java/com/mango/core/file/FileModel.java index 0e69b1a33..94aa2eccb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/file/FileModel.java +++ b/core/src/main/java/com/mango/core/file/FileModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.file; +package com.mango.core.file; import android.text.TextUtils; @@ -6,12 +6,12 @@ import com.netease.nim.uikit.common.util.log.LogUtil; import com.qiniu.android.common.FixedZone; import com.qiniu.android.storage.Configuration; import com.qiniu.android.storage.UploadManager; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; -import com.yizhuan.xchat_android_core.exception.ErrorThrowable; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.community.bean.DynamicMedia; +import com.mango.core.exception.ErrorThrowable; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import org.json.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/file/IFileModel.java b/core/src/main/java/com/mango/core/file/IFileModel.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/file/IFileModel.java rename to core/src/main/java/com/mango/core/file/IFileModel.java index dcc82dafd..6c979ff87 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/file/IFileModel.java +++ b/core/src/main/java/com/mango/core/file/IFileModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.file; +package com.mango.core.file; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; +import com.mango.core.base.IModel; +import com.mango.core.community.bean.DynamicMedia; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/file/UploadToken.java b/core/src/main/java/com/mango/core/file/UploadToken.java similarity index 70% rename from core/src/main/java/com/yizhuan/xchat_android_core/file/UploadToken.java rename to core/src/main/java/com/mango/core/file/UploadToken.java index 55a7d8ebc..373f712f7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/file/UploadToken.java +++ b/core/src/main/java/com/mango/core/file/UploadToken.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.file; +package com.mango.core.file; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/ChargeListener.java b/core/src/main/java/com/mango/core/gift/ChargeListener.java similarity index 57% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/ChargeListener.java rename to core/src/main/java/com/mango/core/gift/ChargeListener.java index 40d716b0d..0765d993c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/ChargeListener.java +++ b/core/src/main/java/com/mango/core/gift/ChargeListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift; +package com.mango.core.gift; public interface ChargeListener { void onNeedCharge(); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/GiftModel.java b/core/src/main/java/com/mango/core/gift/GiftModel.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/GiftModel.java rename to core/src/main/java/com/mango/core/gift/GiftModel.java index 62e140be9..3088367d8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/GiftModel.java +++ b/core/src/main/java/com/mango/core/gift/GiftModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.gift; +package com.mango.core.gift; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ALL_MIC_LUCKY_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_LUCK_GIFT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ALL_MIC_LUCKY_GIFT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_GIFT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_LUCK_GIFT; import android.os.Handler; import android.os.Message; @@ -13,50 +13,49 @@ import androidx.annotation.Nullable; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftListInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftSendType; -import com.yizhuan.xchat_android_core.gift.bean.GiftSource; -import com.yizhuan.xchat_android_core.gift.bean.GiftType; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.SimpleVipInfo; -import com.yizhuan.xchat_android_core.gift.event.UpdateKnapEvent; -import com.yizhuan.xchat_android_core.gift.exception.GiftOutOfDateException; -import com.yizhuan.xchat_android_core.gift.toolbox.GiftToolbox; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftBatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiLuckyGiftAttachment; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueCommonUpdate; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -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.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.RadishNotEnoughException; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.utils.net.VipLevelNotEnoughException; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.GiftListInfo; +import com.mango.core.gift.bean.GiftMultiReceiverInfo; +import com.mango.core.gift.bean.GiftSendType; +import com.mango.core.gift.bean.GiftSource; +import com.mango.core.gift.bean.GiftType; +import com.mango.core.gift.bean.LuckyBagGifts; +import com.mango.core.gift.bean.MultiGiftReceiveInfo; +import com.mango.core.gift.bean.SimpleVipInfo; +import com.mango.core.gift.event.UpdateKnapEvent; +import com.mango.core.gift.exception.GiftOutOfDateException; +import com.mango.core.gift.toolbox.GiftToolbox; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.GiftAttachment; +import com.mango.core.im.custom.bean.GiftBatchAttachment; +import com.mango.core.im.custom.bean.MultiGiftAttachment; +import com.mango.core.im.custom.bean.MultiLuckyGiftAttachment; +import com.mango.core.initial.InitialModel; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.pay.PayModel; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.giftvalue.bean.GiftValueCommonUpdate; +import com.mango.core.room.giftvalue.helper.GiftValueMrg; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.BalanceNotEnoughExeption; +import com.mango.core.utils.net.RadishNotEnoughException; +import com.mango.core.utils.net.RxHelper; +import com.mango.core.utils.net.VipLevelNotEnoughException; +import com.mango.core.vip.UserVipInfo; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; import java.lang.ref.WeakReference; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCore.java b/core/src/main/java/com/mango/core/gift/IGiftCore.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCore.java rename to core/src/main/java/com/mango/core/gift/IGiftCore.java index a10747373..efd584500 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCore.java +++ b/core/src/main/java/com/mango/core/gift/IGiftCore.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.gift; +package com.mango.core.gift; import com.netease.nim.uikit.business.session.module.Container; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_library.coremanager.IBaseCore; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.xchat_android_library.coremanager.IBaseCore; import java.lang.ref.WeakReference; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCoreClient.java b/core/src/main/java/com/mango/core/gift/IGiftCoreClient.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCoreClient.java rename to core/src/main/java/com/mango/core/gift/IGiftCoreClient.java index b515c1eb0..a3a15b971 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCoreClient.java +++ b/core/src/main/java/com/mango/core/gift/IGiftCoreClient.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.gift; +package com.mango.core.gift; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_library.coremanager.ICoreClient; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.GiftReceiveInfo; +import com.mango.core.gift.bean.MultiGiftReceiveInfo; +import com.mango.xchat_android_library.coremanager.ICoreClient; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftModel.java b/core/src/main/java/com/mango/core/gift/IGiftModel.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftModel.java rename to core/src/main/java/com/mango/core/gift/IGiftModel.java index 06bfe1368..b4959c5ea 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftModel.java +++ b/core/src/main/java/com/mango/core/gift/IGiftModel.java @@ -1,14 +1,13 @@ -package com.yizhuan.xchat_android_core.gift; +package com.mango.core.gift; import androidx.annotation.Nullable; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftListInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.GiftListInfo; +import com.mango.core.gift.bean.GiftMultiReceiverInfo; -import java.util.HashMap; import java.util.List; import io.reactivex.Single; @@ -50,7 +49,7 @@ public interface IGiftModel { * * @param giftType 礼物类型 * @return - * @see com.yizhuan.xchat_android_core.gift.bean.GiftType + * @see com.mango.core.gift.bean.GiftType */ List getGiftInfoList(int giftType); @@ -60,7 +59,7 @@ public interface IGiftModel { * @param roomUid * @param giftType * @return - * @see com.yizhuan.xchat_android_core.gift.bean.GiftType + * @see com.mango.core.gift.bean.GiftType */ List getGiftInfosByType(String roomUid, int giftType); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftEffectInfo.java b/core/src/main/java/com/mango/core/gift/bean/GiftEffectInfo.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftEffectInfo.java rename to core/src/main/java/com/mango/core/gift/bean/GiftEffectInfo.java index 503a1f887..98e61fd30 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftEffectInfo.java +++ b/core/src/main/java/com/mango/core/gift/bean/GiftEffectInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftFileInfo.java b/core/src/main/java/com/mango/core/gift/bean/GiftFileInfo.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftFileInfo.java rename to core/src/main/java/com/mango/core/gift/bean/GiftFileInfo.java index ca502de81..b1d6f540e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftFileInfo.java +++ b/core/src/main/java/com/mango/core/gift/bean/GiftFileInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftInfo.java b/core/src/main/java/com/mango/core/gift/bean/GiftInfo.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftInfo.java rename to core/src/main/java/com/mango/core/gift/bean/GiftInfo.java index 16bf256c2..08b2cd7ae 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftInfo.java +++ b/core/src/main/java/com/mango/core/gift/bean/GiftInfo.java @@ -1,8 +1,6 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.community.UserVo; -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftKnapInfo.java b/core/src/main/java/com/mango/core/gift/bean/GiftKnapInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftKnapInfo.java rename to core/src/main/java/com/mango/core/gift/bean/GiftKnapInfo.java index f00ec9f81..74dd650c4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftKnapInfo.java +++ b/core/src/main/java/com/mango/core/gift/bean/GiftKnapInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftList.java b/core/src/main/java/com/mango/core/gift/bean/GiftList.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftList.java rename to core/src/main/java/com/mango/core/gift/bean/GiftList.java index ae489a08f..2d568f5c0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftList.java +++ b/core/src/main/java/com/mango/core/gift/bean/GiftList.java @@ -1,7 +1,6 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; import java.io.Serializable; -import java.util.List; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftListInfo.java b/core/src/main/java/com/mango/core/gift/bean/GiftListInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftListInfo.java rename to core/src/main/java/com/mango/core/gift/bean/GiftListInfo.java index 26221fcfc..fe1af09cf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftListInfo.java +++ b/core/src/main/java/com/mango/core/gift/bean/GiftListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/mango/core/gift/bean/GiftLuckyBag.java b/core/src/main/java/com/mango/core/gift/bean/GiftLuckyBag.java new file mode 100644 index 000000000..76af23c79 --- /dev/null +++ b/core/src/main/java/com/mango/core/gift/bean/GiftLuckyBag.java @@ -0,0 +1,5 @@ +package com.mango.core.gift.bean; + +public class GiftLuckyBag { + +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftMultiReceiverInfo.java b/core/src/main/java/com/mango/core/gift/bean/GiftMultiReceiverInfo.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftMultiReceiverInfo.java rename to core/src/main/java/com/mango/core/gift/bean/GiftMultiReceiverInfo.java index 2fa213210..44a438ca2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftMultiReceiverInfo.java +++ b/core/src/main/java/com/mango/core/gift/bean/GiftMultiReceiverInfo.java @@ -1,9 +1,8 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; +import com.mango.core.room.giftvalue.bean.IndexGiftValue; import java.io.Serializable; -import java.util.HashMap; import java.util.List; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiveInfo.java b/core/src/main/java/com/mango/core/gift/bean/GiftReceiveInfo.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiveInfo.java rename to core/src/main/java/com/mango/core/gift/bean/GiftReceiveInfo.java index 83cc387e6..02c887f03 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiveInfo.java +++ b/core/src/main/java/com/mango/core/gift/bean/GiftReceiveInfo.java @@ -1,10 +1,8 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; +import com.mango.core.room.giftvalue.bean.IndexGiftValue; import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiver.java b/core/src/main/java/com/mango/core/gift/bean/GiftReceiver.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiver.java rename to core/src/main/java/com/mango/core/gift/bean/GiftReceiver.java index f4bdab61e..52e143dcf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiver.java +++ b/core/src/main/java/com/mango/core/gift/bean/GiftReceiver.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftSendType.java b/core/src/main/java/com/mango/core/gift/bean/GiftSendType.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftSendType.java rename to core/src/main/java/com/mango/core/gift/bean/GiftSendType.java index 753f424ef..533601575 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftSendType.java +++ b/core/src/main/java/com/mango/core/gift/bean/GiftSendType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; /** * 赠送类型 1给主播直接刷礼物，2私聊送个人礼物, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftSource.java b/core/src/main/java/com/mango/core/gift/bean/GiftSource.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftSource.java rename to core/src/main/java/com/mango/core/gift/bean/GiftSource.java index 04010fa34..737a21e28 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftSource.java +++ b/core/src/main/java/com/mango/core/gift/bean/GiftSource.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; /** * 礼物的来源，1:普通，2:背包，3:师徒 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftTab.java b/core/src/main/java/com/mango/core/gift/bean/GiftTab.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftTab.java rename to core/src/main/java/com/mango/core/gift/bean/GiftTab.java index f2001e284..0ae294371 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftTab.java +++ b/core/src/main/java/com/mango/core/gift/bean/GiftTab.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; import android.view.View; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftType.java b/core/src/main/java/com/mango/core/gift/bean/GiftType.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftType.java rename to core/src/main/java/com/mango/core/gift/bean/GiftType.java index c0ede7c07..b279faf1e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftType.java +++ b/core/src/main/java/com/mango/core/gift/bean/GiftType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; /** * 礼物类型 1轻聊房，2游戏轰趴房，3福袋, 4套卡 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyBagGifts.java b/core/src/main/java/com/mango/core/gift/bean/LuckyBagGifts.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyBagGifts.java rename to core/src/main/java/com/mango/core/gift/bean/LuckyBagGifts.java index 2dd271b4d..d46bb5751 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyBagGifts.java +++ b/core/src/main/java/com/mango/core/gift/bean/LuckyBagGifts.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; +import com.mango.core.room.giftvalue.bean.IndexGiftValue; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyBagNoticeInfo.java b/core/src/main/java/com/mango/core/gift/bean/LuckyBagNoticeInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyBagNoticeInfo.java rename to core/src/main/java/com/mango/core/gift/bean/LuckyBagNoticeInfo.java index 37fd5f7bf..b2551c6a6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyBagNoticeInfo.java +++ b/core/src/main/java/com/mango/core/gift/bean/LuckyBagNoticeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyGiftList.java b/core/src/main/java/com/mango/core/gift/bean/LuckyGiftList.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyGiftList.java rename to core/src/main/java/com/mango/core/gift/bean/LuckyGiftList.java index e13d07ea6..c75ef776a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyGiftList.java +++ b/core/src/main/java/com/mango/core/gift/bean/LuckyGiftList.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/MultiGiftReceiveInfo.java b/core/src/main/java/com/mango/core/gift/bean/MultiGiftReceiveInfo.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/MultiGiftReceiveInfo.java rename to core/src/main/java/com/mango/core/gift/bean/MultiGiftReceiveInfo.java index c26a47620..0e0108f16 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/MultiGiftReceiveInfo.java +++ b/core/src/main/java/com/mango/core/gift/bean/MultiGiftReceiveInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; +import com.mango.core.room.giftvalue.bean.IndexGiftValue; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SendGiftScenes.java b/core/src/main/java/com/mango/core/gift/bean/SendGiftScenes.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SendGiftScenes.java rename to core/src/main/java/com/mango/core/gift/bean/SendGiftScenes.java index 50af93e10..970c5ee40 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SendGiftScenes.java +++ b/core/src/main/java/com/mango/core/gift/bean/SendGiftScenes.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; /** * 列举送礼物使用的场景 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleUserInfo.kt b/core/src/main/java/com/mango/core/gift/bean/SimpleUserInfo.kt similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleUserInfo.kt rename to core/src/main/java/com/mango/core/gift/bean/SimpleUserInfo.kt index fd40f4d8e..de910f7b3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleUserInfo.kt +++ b/core/src/main/java/com/mango/core/gift/bean/SimpleUserInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean +package com.mango.core.gift.bean import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleVipInfo.java b/core/src/main/java/com/mango/core/gift/bean/SimpleVipInfo.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleVipInfo.java rename to core/src/main/java/com/mango/core/gift/bean/SimpleVipInfo.java index 0478eb9ca..549e20a2b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleVipInfo.java +++ b/core/src/main/java/com/mango/core/gift/bean/SimpleVipInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.mango.core.gift.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/HideCarEffectEvent.java b/core/src/main/java/com/mango/core/gift/event/HideCarEffectEvent.java similarity index 74% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/event/HideCarEffectEvent.java rename to core/src/main/java/com/mango/core/gift/event/HideCarEffectEvent.java index a8fa012b5..2aea0272d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/HideCarEffectEvent.java +++ b/core/src/main/java/com/mango/core/gift/event/HideCarEffectEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.event; +package com.mango.core.gift.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapEvent.java b/core/src/main/java/com/mango/core/gift/event/UpdateKnapEvent.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapEvent.java rename to core/src/main/java/com/mango/core/gift/event/UpdateKnapEvent.java index d7dbfbe97..4da27be88 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapEvent.java +++ b/core/src/main/java/com/mango/core/gift/event/UpdateKnapEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.event; +package com.mango.core.gift.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/exception/GiftOutOfDateException.java b/core/src/main/java/com/mango/core/gift/exception/GiftOutOfDateException.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/exception/GiftOutOfDateException.java rename to core/src/main/java/com/mango/core/gift/exception/GiftOutOfDateException.java index 8f53e5f82..14cdb59f8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/exception/GiftOutOfDateException.java +++ b/core/src/main/java/com/mango/core/gift/exception/GiftOutOfDateException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.exception; +package com.mango.core.gift.exception; /** * 礼物过期 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/toolbox/GiftToolbox.java b/core/src/main/java/com/mango/core/gift/toolbox/GiftToolbox.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/toolbox/GiftToolbox.java rename to core/src/main/java/com/mango/core/gift/toolbox/GiftToolbox.java index f59e4e7a6..c7c24f654 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/toolbox/GiftToolbox.java +++ b/core/src/main/java/com/mango/core/gift/toolbox/GiftToolbox.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.toolbox; +package com.mango.core.gift.toolbox; import android.text.TextUtils; @@ -10,34 +10,33 @@ import com.netease.nimlib.sdk.msg.MessageBuilder; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.CustomMessageConfig; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.xchat_android_core.auth.AuthModel; -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; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.DrawGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftBatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiLuckyGiftAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel; -import com.yizhuan.xchat_android_core.retry.ImRetryManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.gift.GiftModel; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.GiftMultiReceiverInfo; +import com.mango.core.gift.bean.GiftReceiveInfo; +import com.mango.core.gift.bean.GiftReceiver; +import com.mango.core.gift.bean.LuckyBagGifts; +import com.mango.core.gift.bean.MultiGiftReceiveInfo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.DrawGiftAttachment; +import com.mango.core.im.custom.bean.GiftAttachment; +import com.mango.core.im.custom.bean.GiftBatchAttachment; +import com.mango.core.im.custom.bean.MultiGiftAttachment; +import com.mango.core.im.custom.bean.MultiLuckyGiftAttachment; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.mango.core.public_chat_hall.model.PublicChatHallModel; +import com.mango.core.retry.ImRetryManager; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/CustomNotifyType.java b/core/src/main/java/com/mango/core/im/CustomNotifyType.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/CustomNotifyType.java rename to core/src/main/java/com/mango/core/im/CustomNotifyType.java index 870390892..f0c12754b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/CustomNotifyType.java +++ b/core/src/main/java/com/mango/core/im/CustomNotifyType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im; +package com.mango.core.im; public class CustomNotifyType { //异性匹配 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/GreetModel.java b/core/src/main/java/com/mango/core/im/GreetModel.java similarity index 74% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/GreetModel.java rename to core/src/main/java/com/mango/core/im/GreetModel.java index 98656eae5..f7059ed2b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/GreetModel.java +++ b/core/src/main/java/com/mango/core/im/GreetModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im; +package com.mango.core.im; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import retrofit2.http.POST; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/RefreshInRoomListEvent.java b/core/src/main/java/com/mango/core/im/RefreshInRoomListEvent.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/RefreshInRoomListEvent.java rename to core/src/main/java/com/mango/core/im/RefreshInRoomListEvent.java index 26bff9199..749e0fd6b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/RefreshInRoomListEvent.java +++ b/core/src/main/java/com/mango/core/im/RefreshInRoomListEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im; +package com.mango.core.im; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/avroom/IAVRoomCoreClient.java b/core/src/main/java/com/mango/core/im/avroom/IAVRoomCoreClient.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/avroom/IAVRoomCoreClient.java rename to core/src/main/java/com/mango/core/im/avroom/IAVRoomCoreClient.java index b4da320c3..55047828f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/avroom/IAVRoomCoreClient.java +++ b/core/src/main/java/com/mango/core/im/avroom/IAVRoomCoreClient.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.im.avroom; +package com.mango.core.im.avroom; -import com.yizhuan.xchat_android_library.coremanager.ICoreClient; +import com.mango.xchat_android_library.coremanager.ICoreClient; import java.util.Map; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/CanSendInfo.java b/core/src/main/java/com/mango/core/im/chatterbox/CanSendInfo.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/CanSendInfo.java rename to core/src/main/java/com/mango/core/im/chatterbox/CanSendInfo.java index ec566d8f2..0ef4de480 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/CanSendInfo.java +++ b/core/src/main/java/com/mango/core/im/chatterbox/CanSendInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.chatterbox; +package com.mango.core.im.chatterbox; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxHelper.java b/core/src/main/java/com/mango/core/im/chatterbox/ChatterBoxHelper.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxHelper.java rename to core/src/main/java/com/mango/core/im/chatterbox/ChatterBoxHelper.java index b52405c8b..01cd421b6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxHelper.java +++ b/core/src/main/java/com/mango/core/im/chatterbox/ChatterBoxHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.chatterbox; +package com.mango.core.im.chatterbox; import android.text.TextUtils; @@ -8,15 +8,15 @@ import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.CustomMessageConfig; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatterBoxAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatterBoxInitAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.core.auth.AuthModel; +import com.mango.core.im.custom.bean.ChatterBoxAttachment; +import com.mango.core.im.custom.bean.ChatterBoxInitAttachment; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.BeanObserver; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxModel.java b/core/src/main/java/com/mango/core/im/chatterbox/ChatterBoxModel.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxModel.java rename to core/src/main/java/com/mango/core/im/chatterbox/ChatterBoxModel.java index 2c376835d..c9d39ed47 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxModel.java +++ b/core/src/main/java/com/mango/core/im/chatterbox/ChatterBoxModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.chatterbox; +package com.mango.core.im.chatterbox; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/mango/core/im/chatterbox/HideInputEvent.java b/core/src/main/java/com/mango/core/im/chatterbox/HideInputEvent.java new file mode 100644 index 000000000..ee9822126 --- /dev/null +++ b/core/src/main/java/com/mango/core/im/chatterbox/HideInputEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.im.chatterbox; + +public class HideInputEvent { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/IChatterBoxModel.java b/core/src/main/java/com/mango/core/im/chatterbox/IChatterBoxModel.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/IChatterBoxModel.java rename to core/src/main/java/com/mango/core/im/chatterbox/IChatterBoxModel.java index df895972b..0f4cd5aec 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/IChatterBoxModel.java +++ b/core/src/main/java/com/mango/core/im/chatterbox/IChatterBoxModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.im.chatterbox; +package com.mango.core.im.chatterbox; -import com.yizhuan.xchat_android_core.base.IModel; +import com.mango.core.base.IModel; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/TopicBoxItemInfo.java b/core/src/main/java/com/mango/core/im/chatterbox/TopicBoxItemInfo.java similarity index 70% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/TopicBoxItemInfo.java rename to core/src/main/java/com/mango/core/im/chatterbox/TopicBoxItemInfo.java index 8d8d31bb4..70a2afe93 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/TopicBoxItemInfo.java +++ b/core/src/main/java/com/mango/core/im/chatterbox/TopicBoxItemInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.chatterbox; +package com.mango.core.im.chatterbox; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/AttachManager.java b/core/src/main/java/com/mango/core/im/custom/AttachManager.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/AttachManager.java rename to core/src/main/java/com/mango/core/im/custom/AttachManager.java index d6f345f41..0ac797090 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/AttachManager.java +++ b/core/src/main/java/com/mango/core/im/custom/AttachManager.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom; +package com.mango.core.im.custom; import android.util.SparseArray; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; /** * diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ActivityTimerAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/ActivityTimerAttachment.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ActivityTimerAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/ActivityTimerAttachment.java index ed460393b..feacd5e24 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ActivityTimerAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/ActivityTimerAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean; +import com.mango.core.room.activitytimer.TimerBean; import lombok.Getter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/AssistantAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/AssistantAttachment.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/AssistantAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/AssistantAttachment.java index 1d9bf0e8a..5ce5002f0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/AssistantAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/AssistantAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/AuctionAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/AuctionAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/AuctionAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/AuctionAttachment.java index af3a3c046..bd234cd04 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/AuctionAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/AuctionAttachment.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionInfo; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionUser; +import com.mango.core.room.auction.bean.AuctionInfo; +import com.mango.core.room.auction.bean.AuctionUser; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/CarAttachment.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/CarAttachment.java index 7dba5c169..ddd6a3ba1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/CarAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/CarveUpGoldAttachment.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/CarveUpGoldAttachment.java index d2bb8ed35..1a57f818f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/CarveUpGoldAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java index 7e2f4bcdc..892e982ce 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; /** * 瓜分钻石，二级，房间公屏 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java index 842afaad9..1bc718541 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; /** * 瓜分钻石，三级，房间公屏+小秘书 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatHintAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/ChatHintAttachment.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatHintAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/ChatHintAttachment.java index d38d2cc47..ab879d491 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatHintAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/ChatHintAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatterBoxAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/ChatterBoxAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatterBoxAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/ChatterBoxAttachment.java index de6cbc867..bdb29ea8e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatterBoxAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/ChatterBoxAttachment.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.chatterbox.TopicBoxItemInfo; +import com.mango.core.im.chatterbox.TopicBoxItemInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatterBoxInitAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/ChatterBoxInitAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatterBoxInitAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/ChatterBoxInitAttachment.java index 43ce1f83b..457dc1f27 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatterBoxInitAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/ChatterBoxInitAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CleanScreenAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/CleanScreenAttachment.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CleanScreenAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/CleanScreenAttachment.java index 00f3a4c47..acb19e909 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CleanScreenAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/CleanScreenAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CpInviteAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/CpInviteAttachment.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CpInviteAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/CpInviteAttachment.java index 52e414ca7..dca002c89 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CpInviteAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/CpInviteAttachment.java @@ -1,13 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; - -import android.util.Log; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo; -import com.yizhuan.xchat_android_core.relation.cp.CpInviteMessage; - -import lombok.val; +import com.mango.core.relation.cp.CpInviteInfo; +import com.mango.core.relation.cp.CpInviteMessage; public class CpInviteAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachParser.java b/core/src/main/java/com/mango/core/im/custom/bean/CustomAttachParser.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachParser.java rename to core/src/main/java/com/mango/core/im/custom/bean/CustomAttachParser.java index 57213f6bf..5e49a653f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachParser.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/CustomAttachParser.java @@ -1,115 +1,115 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_BAN_DELETE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_PASS; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_ROOM_PK; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_COMMON_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHARM_LEVEL_UP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_ASK; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_DROP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_INIT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAW_GIFT_EFFECT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_ROOM_JOIN_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_KICK_MIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SEND_MAGIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEAD_SHIFT_OUT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_IM_TIP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_KTV; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEAVE_MODE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEAVE_MODE_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MENTORING_RELATIONSHIP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_QUEUING_MIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RADISH; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_GIFT_VALUE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_MINI_WORLD; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SIGN_IN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_APPLY_EXIT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_APPLY_JOIN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_MANAGER_INVITE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_FULL_SCREEN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_DIAMOND; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_DRAW_GIFT_EFFECT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ADD_BLACK; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_KICK_ROOM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_MAGIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_SINGLE_MAGIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_AUDIO; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLEAN_SCREEN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_REDPACKAGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_SCREEN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_HEAD; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HEART; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HELLO; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_TO_RECORDING; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_tO_MATCHING; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_ATTACK; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_RESULT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_BAN_DELETE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_PASS; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_ROOM_PK; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_COMMON_MSG; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHARM_LEVEL_UP; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_ASK; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_DROP; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_INIT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAW_GIFT_EFFECT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP_NOTICE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_ROOM_JOIN_NOTICE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_KICK_MIC; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SEND_MAGIC; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEAD_SHIFT_OUT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_IM_TIP; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_KTV; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEAVE_MODE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEAVE_MODE_NOTICE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MENTORING_RELATIONSHIP; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_QUEUING_MIC; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RADISH; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_GIFT_VALUE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_MINI_WORLD; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SIGN_IN; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_APPLY_EXIT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_APPLY_JOIN; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_MANAGER_INVITE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_FULL_SCREEN; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_GIFT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_DIAMOND; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_MSG; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_DRAW_GIFT_EFFECT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ADD_BLACK; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_KICK_ROOM; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_MAGIC; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_SINGLE_MAGIC; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_AUDIO; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLEAN_SCREEN; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_REDPACKAGE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_SCREEN; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_GIFT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_NOTICE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_HEAD; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HEART; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HELLO; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_TO_RECORDING; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_tO_MATCHING; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_ATTACK; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_RESULT; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.netease.nimlib.sdk.msg.attachment.MsgAttachmentParser; -import com.yizhuan.xchat_android_core.bean.attachmsg.RoomQueueMsgAttachment; -import com.yizhuan.xchat_android_core.community.attachment.DynamicSysAttachment; -import com.yizhuan.xchat_android_core.community.attachment.UnReadCountAttachment; -import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment; -import com.yizhuan.xchat_android_core.im.custom.AttachManager; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringSharingRoomAttachment; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatMemberCountAttachment; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatTopicAttachment; -import com.yizhuan.xchat_android_core.miniworld.bean.OpenAudioPartyAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitFriendsAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitMeAttachment; -import com.yizhuan.xchat_android_core.room.bean.LeaveModeAttachment; -import com.yizhuan.xchat_android_core.room.pk.attachment.RoomPkAttachment; -import com.yizhuan.xchat_android_core.room.queuing_mic.attachment.QueuingMicAttachment; -import com.yizhuan.xchat_android_core.super_admin.attachment.SuperAdminOpAttachment; -import com.yizhuan.xchat_android_core.super_admin.util.SaMsgUtil; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.mango.core.community.attachment.DynamicSysAttachment; +import com.mango.core.community.attachment.UnReadCountAttachment; +import com.mango.core.community.im.WorldDynamicAttachment; +import com.mango.core.im.custom.AttachManager; +import com.mango.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringSharingRoomAttachment; +import com.mango.core.miniworld.bean.MWChatMemberCountAttachment; +import com.mango.core.miniworld.bean.MWChatTopicAttachment; +import com.mango.core.miniworld.bean.OpenAudioPartyAttachment; +import com.mango.core.public_chat_hall.attachment.AitFriendsAttachment; +import com.mango.core.public_chat_hall.attachment.AitMeAttachment; +import com.mango.core.room.bean.LeaveModeAttachment; +import com.mango.core.room.pk.attachment.RoomPkAttachment; +import com.mango.core.room.queuing_mic.attachment.QueuingMicAttachment; +import com.mango.core.super_admin.attachment.SuperAdminOpAttachment; +import com.mango.core.super_admin.util.SaMsgUtil; +import com.mango.core.utils.LogUtils; +import com.mango.xchat_android_library.utils.log.MLog; /** * 云信自定义消息解析器 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/CustomAttachment.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/CustomAttachment.java index 38c4a8b60..892b19637 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/CustomAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; -import com.yizhuan.xchat_android_core.noble.NobleInfo; +import com.mango.core.noble.NobleInfo; /** * 先定义一个自定义消息附件的基类，负责解析你的自定义消息的公用字段，比如类型等等。 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAllNotifyAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/DatingAllNotifyAttachment.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAllNotifyAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/DatingAllNotifyAttachment.java index 49eb4f4a3..123229988 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAllNotifyAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/DatingAllNotifyAttachment.java @@ -1,9 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.room.bean.DatingAllNotifyInfo; -import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo; +import com.mango.core.room.bean.DatingAllNotifyInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/DatingAttachment.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/DatingAttachment.java index e95b4fcf7..c2c49eab2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/DatingAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo; +import com.mango.core.room.bean.DatingNotifyInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingPublishAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/DatingPublishAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingPublishAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/DatingPublishAttachment.java index 411109164..7b01e8340 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingPublishAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/DatingPublishAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo; +import com.mango.core.room.bean.DatingNotifyInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DiceThrowAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/DiceThrowAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DiceThrowAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/DiceThrowAttachment.java index 2711d911f..f8f3ae45d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DiceThrowAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/DiceThrowAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DrawGiftAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/DrawGiftAttachment.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DrawGiftAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/DrawGiftAttachment.java index 69a720f96..49a89b0ab 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DrawGiftAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/DrawGiftAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FaceAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/FaceAttachment.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FaceAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/FaceAttachment.java index 8dc9b23cb..c299e4ed1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FaceAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/FaceAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import android.util.Log; @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo; +import com.mango.core.room.face.FaceReceiveInfo; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FansTeamMsgAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/FansTeamMsgAttachment.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FansTeamMsgAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/FansTeamMsgAttachment.java index a8beb34b5..554cb6cb4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FansTeamMsgAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/FansTeamMsgAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.fansteam.FansTeamMsgInfo; +import com.mango.core.fansteam.FansTeamMsgInfo; public class FansTeamMsgAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/GiftAttachment.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/GiftAttachment.java index 93e9e92e3..9e4f9dff0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/GiftAttachment.java @@ -1,18 +1,15 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import android.text.TextUtils; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.GiftReceiveInfo; +import com.mango.core.room.giftvalue.bean.IndexGiftValue; -import java.util.HashMap; import java.util.List; /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftBatchAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/GiftBatchAttachment.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftBatchAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/GiftBatchAttachment.java index 5a4cf40e1..233e1458e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftBatchAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/GiftBatchAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import android.text.TextUtils; @@ -8,12 +8,11 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.GiftMultiReceiverInfo; +import com.mango.core.gift.bean.GiftReceiver; +import com.mango.core.room.giftvalue.bean.IndexGiftValue; -import java.util.ArrayList; import java.util.List; /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftCompoundAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/GiftCompoundAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftCompoundAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/GiftCompoundAttachment.java index ec03bc2bb..c351b7946 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftCompoundAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/GiftCompoundAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftCompoundMsgBean.java b/core/src/main/java/com/mango/core/im/custom/bean/GiftCompoundMsgBean.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftCompoundMsgBean.java rename to core/src/main/java/com/mango/core/im/custom/bean/GiftCompoundMsgBean.java index 2e688c024..292930d52 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftCompoundMsgBean.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/GiftCompoundMsgBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import lombok.Data; import lombok.ToString; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ImTipAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/ImTipAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ImTipAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/ImTipAttachment.java index ff9ac9d59..4d1701eea 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ImTipAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/ImTipAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingFamilyAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/InAppSharingFamilyAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingFamilyAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/InAppSharingFamilyAttachment.java index 837127d25..1583bc3f3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingFamilyAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/InAppSharingFamilyAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingFamilyInfo; +import com.mango.core.share.bean.InAppSharingFamilyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingMiniWorldAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/InAppSharingMiniWorldAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingMiniWorldAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/InAppSharingMiniWorldAttachment.java index c8f84e4e5..fee932e52 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingMiniWorldAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/InAppSharingMiniWorldAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingMiniWorldInfo; +import com.mango.core.share.bean.InAppSharingMiniWorldInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingRoomAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/InAppSharingRoomAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingRoomAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/InAppSharingRoomAttachment.java index 2e2eff08a..fc1a213b0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingRoomAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/InAppSharingRoomAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingRoomInfo; +import com.mango.core.share.bean.InAppSharingRoomInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingTeamAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/InAppSharingTeamAttachment.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingTeamAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/InAppSharingTeamAttachment.java index fa1aa528f..8cc813f5e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingTeamAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/InAppSharingTeamAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingTeamInfo; +import com.mango.core.share.bean.InAppSharingTeamInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/JoinMiniWorldAttachment.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/JoinMiniWorldAttachment.java index b6efe8757..6cde0f5c4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/JoinMiniWorldAttachment.java @@ -1,9 +1,7 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; - -import lombok.Data; +import com.mango.core.miniworld.bean.MiniWorldInWorldInfo; +import com.mango.core.user.bean.UserInfo; public class JoinMiniWorldAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldNoticeAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldNoticeAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java index 965946951..9f3cd30ef 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldNoticeAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java @@ -1,10 +1,7 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo; - -import lombok.Data; /** * 加入话题的通知 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/LevelUpAttachment.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/LevelUpAttachment.java index 8a6b23f31..a597d453f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/LevelUpAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpNoticeAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/LevelUpNoticeAttachment.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpNoticeAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/LevelUpNoticeAttachment.java index efa2029e2..657525964 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpNoticeAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/LevelUpNoticeAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LotteryAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/LotteryAttachment.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LotteryAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/LotteryAttachment.java index 39c913aba..d8bd2a736 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LotteryAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/LotteryAttachment.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.activity.bean.LotteryInfo; +import com.mango.core.activity.bean.LotteryInfo; /** * Created by chenran on 2017/12/26. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LuckyMoneyAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/LuckyMoneyAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LuckyMoneyAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/LuckyMoneyAttachment.java index 8d74d64de..49d016a55 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LuckyMoneyAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/LuckyMoneyAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; +import com.mango.core.luckymoney.LuckyMoneyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LuckyMoneyTipsAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/LuckyMoneyTipsAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LuckyMoneyTipsAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/LuckyMoneyTipsAttachment.java index 2f137bbc2..fc2a7fd3e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LuckyMoneyTipsAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/LuckyMoneyTipsAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; +import com.mango.core.luckymoney.LuckyMoneyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicAllMicAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/MagicAllMicAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicAllMicAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/MagicAllMicAttachment.java index a3d72359c..9ff47c4d2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicAllMicAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/MagicAllMicAttachment.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; +import com.mango.core.magic.bean.MagicInfo; +import com.mango.core.magic.MagicModel; +import com.mango.core.magic.bean.MultiMagicReceivedInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/MagicAttachment.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/MagicAttachment.java index 6813e8e97..646e7e0bc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/MagicAttachment.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo; +import com.mango.core.magic.bean.MagicInfo; +import com.mango.core.magic.MagicModel; +import com.mango.core.magic.bean.MagicReceivedInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicBatchAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/MagicBatchAttachment.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicBatchAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/MagicBatchAttachment.java index d3b8401e5..72a5722fa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicBatchAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/MagicBatchAttachment.java @@ -1,13 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.magic.MagicModel; -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.room.giftvalue.bean.IndexGiftValue; +import com.mango.core.magic.MagicModel; +import com.mango.core.magic.bean.MagicInfo; +import com.mango.core.magic.bean.MagicMultiReceiverInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/MatchAttachment.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/MatchAttachment.java index a6655f820..2675c670d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/MatchAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchTicketAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/MatchTicketAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchTicketAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/MatchTicketAttachment.java index 0f68c9328..9bbdec861 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchTicketAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/MatchTicketAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterAttackAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/MonsterAttackAttachment.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterAttackAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/MonsterAttackAttachment.java index 510127f03..0f1f673d6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterAttackAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/MonsterAttackAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterAttackInfo; +import com.mango.core.monsterhunting.bean.MonsterAttackInfo; /** * Created by MadisonRong on 31/03/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterHuntingResultAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/MonsterHuntingResultAttachment.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterHuntingResultAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/MonsterHuntingResultAttachment.java index af0e37721..46a48726a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterHuntingResultAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/MonsterHuntingResultAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult; +import com.mango.core.monsterhunting.bean.MonsterHuntingResult; /** * Created by MadisonRong on 12/04/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterStatusAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/MonsterStatusAttachment.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterStatusAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/MonsterStatusAttachment.java index ccdc06d40..9398c5721 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterStatusAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/MonsterStatusAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol; +import com.mango.core.monsterhunting.bean.MonsterProtocol; /** * Created by MadisonRong on 11/04/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MultiGiftAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/MultiGiftAttachment.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MultiGiftAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/MultiGiftAttachment.java index 8ee2d0cde..eaf815eed 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MultiGiftAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/MultiGiftAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import android.text.TextUtils; @@ -6,9 +6,9 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.MultiGiftReceiveInfo; +import com.mango.core.room.giftvalue.bean.IndexGiftValue; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MultiLuckyGiftAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/MultiLuckyGiftAttachment.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MultiLuckyGiftAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/MultiLuckyGiftAttachment.java index cf0946567..eedfa2356 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MultiLuckyGiftAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/MultiLuckyGiftAttachment.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import android.text.TextUtils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.LuckyGiftList; +import com.mango.core.gift.bean.LuckyBagGifts; +import com.mango.core.gift.bean.LuckyGiftList; /** * Created by chenran on 2017/10/25. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MusicInfoAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/MusicInfoAttachment.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MusicInfoAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/MusicInfoAttachment.java index b7608e5d8..20148c840 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MusicInfoAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/MusicInfoAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; +import com.mango.core.room.ktv.bean.MusicInfo; /** * Created by chenran on 2017/10/4. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NewbieHelloAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/NewbieHelloAttachment.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NewbieHelloAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/NewbieHelloAttachment.java index 1454cf97b..3cdf6e8ba 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NewbieHelloAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/NewbieHelloAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.newbie.NewbieHelloInfo; +import com.mango.core.newbie.NewbieHelloInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NobleAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/NobleAttachment.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NobleAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/NobleAttachment.java index a2af35f81..c72fe25ed 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NobleAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/NobleAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; @@ -8,9 +8,9 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleProtocol; +import com.mango.xchat_android_library.rxbus.RxBusHelper; +import com.mango.core.noble.NobleInfo; +import com.mango.core.noble.NobleProtocol; import java.io.IOException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NoticeAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/NoticeAttachment.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NoticeAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/NoticeAttachment.java index f5c3889b0..69cde94c8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NoticeAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/NoticeAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenRoomNotiAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/OpenRoomNotiAttachment.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenRoomNotiAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/OpenRoomNotiAttachment.java index d83ea71f2..8eb6cfe34 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenRoomNotiAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/OpenRoomNotiAttachment.java @@ -1,7 +1,6 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; /** * Created by chenran on 2017/8/14. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenSignInAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/OpenSignInAttachment.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenSignInAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/OpenSignInAttachment.java index f35fd3995..57181ee8b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenSignInAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/OpenSignInAttachment.java @@ -1,10 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.radish.signin.bean.ImNotice; +import com.mango.core.radish.signin.bean.ImNotice; -import lombok.Data; import lombok.Getter; /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/RedPackageAttachment.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/RedPackageAttachment.java index 69bfbb912..e7408d149 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RedPackageAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo; +import com.mango.core.redpackage.RedPackageNotifyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageRoomMsgAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/RedPackageRoomMsgAttachment.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageRoomMsgAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/RedPackageRoomMsgAttachment.java index 84a407cee..6a4c1afd7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageRoomMsgAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RedPackageRoomMsgAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeRoomMsg; +import com.mango.core.redpackage.RedEnvelopeRoomMsg; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPacketAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/RedPacketAttachment.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPacketAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/RedPacketAttachment.java index 0d109fba3..bb5e3777d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPacketAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RedPacketAttachment.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfoV2; +import com.mango.core.redPacket.bean.RedPacketInfoV2; /** * Created by chenran on 2017/10/4. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RequestUpmicAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/RequestUpmicAttachment.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RequestUpmicAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/RequestUpmicAttachment.java index 06455d8d4..78edcf3f0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RequestUpmicAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RequestUpmicAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.core.user.bean.UserInfo; public class RequestUpmicAttachment extends CustomAttachment { private UserInfo userInfo; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RewardBean.java b/core/src/main/java/com/mango/core/im/custom/bean/RewardBean.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RewardBean.java rename to core/src/main/java/com/mango/core/im/custom/bean/RewardBean.java index 976239f88..0a7156cf5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RewardBean.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RewardBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/RoomBoxPrizeAttachment.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/RoomBoxPrizeAttachment.java index f6a9c9fd7..cddb0eacf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RoomBoxPrizeAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.netease.nim.uikit.common.util.string.StringUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/RoomFollowOwnerAttachment.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/RoomFollowOwnerAttachment.java index 53d8ed490..b6df1585a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RoomFollowOwnerAttachment.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.core.user.bean.UserInfo; /** * 聊天室弹出关注房主的提示 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment2.java b/core/src/main/java/com/mango/core/im/custom/bean/RoomFollowOwnerAttachment2.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment2.java rename to core/src/main/java/com/mango/core/im/custom/bean/RoomFollowOwnerAttachment2.java index b9624c6ef..1ad38c5e2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment2.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RoomFollowOwnerAttachment2.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.core.user.bean.UserInfo; /** * 聊天室弹出关注房主的提示 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomGiftValueAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/RoomGiftValueAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomGiftValueAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/RoomGiftValueAttachment.java index 45c65015c..8f1603675 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomGiftValueAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RoomGiftValueAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; +import com.mango.core.room.giftvalue.bean.RoomGiftValue; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInfoAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/RoomInfoAttachment.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInfoAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/RoomInfoAttachment.java index 5ade16f95..697d476a5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInfoAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RoomInfoAttachment.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomInfo; /** * Created by huangmeng1 on 2018/6/7. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/RoomInviteFansAttachment.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/RoomInviteFansAttachment.java index b91381f26..0cbcf8b33 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RoomInviteFansAttachment.java @@ -1,8 +1,7 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansInfo.java b/core/src/main/java/com/mango/core/im/custom/bean/RoomInviteFansInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansInfo.java rename to core/src/main/java/com/mango/core/im/custom/bean/RoomInviteFansInfo.java index 40f7f579d..b914c6bf4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansInfo.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RoomInviteFansInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomNoticeAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/RoomNoticeAttachment.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomNoticeAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/RoomNoticeAttachment.java index e8e972f0c..6c5a4ee76 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomNoticeAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RoomNoticeAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.room.bean.RoomMessageViewNoticeInfo; +import com.mango.core.room.bean.RoomMessageViewNoticeInfo; public class RoomNoticeAttachment extends RoomInfoAttachment { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPKAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/RoomPKAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPKAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/RoomPKAttachment.java index 5f22df23b..b6746f09c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPKAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RoomPKAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPkBean.java b/core/src/main/java/com/mango/core/im/custom/bean/RoomPkBean.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPkBean.java rename to core/src/main/java/com/mango/core/im/custom/bean/RoomPkBean.java index f0fbcd405..815c6333d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPkBean.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RoomPkBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomRankAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/RoomRankAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomRankAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/RoomRankAttachment.java index 550424ba7..8b0423b7d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomRankAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RoomRankAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomRankMsgBean.java b/core/src/main/java/com/mango/core/im/custom/bean/RoomRankMsgBean.java similarity index 74% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomRankMsgBean.java rename to core/src/main/java/com/mango/core/im/custom/bean/RoomRankMsgBean.java index 5b538dd76..ac99faedf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomRankMsgBean.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RoomRankMsgBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java index edde37f6c..2bd29eef3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; +import com.mango.core.gift.bean.LuckyBagNoticeInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomTipAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/RoomTipAttachment.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomTipAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/RoomTipAttachment.java index 2565d0e7f..c3a8cacb9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomTipAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RoomTipAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.netease.nim.uikit.common.util.string.StringUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java b/core/src/main/java/com/mango/core/im/custom/bean/RouterType.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java rename to core/src/main/java/com/mango/core/im/custom/bean/RouterType.java index ae4280a0a..e7882dcab 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/RouterType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; /** * Created by MadisonRong on 08/06/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SingleRoomRankAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/SingleRoomRankAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SingleRoomRankAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/SingleRoomRankAttachment.java index 67e073b76..2b941a452 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SingleRoomRankAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/SingleRoomRankAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SingleRoomRankMsgBean.java b/core/src/main/java/com/mango/core/im/custom/bean/SingleRoomRankMsgBean.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SingleRoomRankMsgBean.java rename to core/src/main/java/com/mango/core/im/custom/bean/SingleRoomRankMsgBean.java index b2f54dbbe..5609f697f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SingleRoomRankMsgBean.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/SingleRoomRankMsgBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SkillMsgAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/SkillMsgAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SkillMsgAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/SkillMsgAttachment.java index 076546775..a9b8b076f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SkillMsgAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/SkillMsgAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.skill.entity.SkillNotifyEntity; +import com.mango.core.skill.entity.SkillNotifyEntity; public class SkillMsgAttachment extends CustomAttachment { private SkillNotifyEntity entity; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/SysMsgAttachment.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/SysMsgAttachment.java index d2fc5cbb9..455483634 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/SysMsgAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgInfo; +import com.mango.core.msg.sys.ErbanSysMsgInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgV2Attachment.java b/core/src/main/java/com/mango/core/im/custom/bean/SysMsgV2Attachment.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgV2Attachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/SysMsgV2Attachment.java index 95f26b666..bcc362c60 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgV2Attachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/SysMsgV2Attachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.msg.sysv2.ErbanSysMsgV2Info; +import com.mango.core.msg.sysv2.ErbanSysMsgV2Info; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgVoiceAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/SysMsgVoiceAttachment.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgVoiceAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/SysMsgVoiceAttachment.java index fcc45ef28..2f186814d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgVoiceAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/SysMsgVoiceAttachment.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.audio.bean.SysMsgVoiceInfo; +import com.mango.core.audio.bean.SysMsgVoiceInfo; /** * 声音瓶子审核结果的系统通知 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/TarotAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/TarotAttachment.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/TarotAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/TarotAttachment.java index 4c3f6d87e..844d3a758 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/TarotAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/TarotAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/TarotMsgBean.java b/core/src/main/java/com/mango/core/im/custom/bean/TarotMsgBean.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/TarotMsgBean.java rename to core/src/main/java/com/mango/core/im/custom/bean/TarotMsgBean.java index df9136a7a..43eeb50d6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/TarotMsgBean.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/TarotMsgBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VipMessageAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/VipMessageAttachment.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VipMessageAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/VipMessageAttachment.java index 15f44a9ee..b9c8d8267 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VipMessageAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/VipMessageAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.vip.VipMessageInfo; +import com.mango.core.vip.VipMessageInfo; public class VipMessageAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VoiceBottleSayHiAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/VoiceBottleSayHiAttachment.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VoiceBottleSayHiAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/VoiceBottleSayHiAttachment.java index c31957d0f..dd27bda45 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VoiceBottleSayHiAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/VoiceBottleSayHiAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.audio.bean.VoiceBottleSayHiInfo; +import com.mango.core.audio.bean.VoiceBottleSayHiInfo; /** * 声音瓶子打招呼提示信息 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VoiceBottleShakeHeartAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/VoiceBottleShakeHeartAttachment.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VoiceBottleShakeHeartAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/VoiceBottleShakeHeartAttachment.java index c6d00ddf6..83853a92b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VoiceBottleShakeHeartAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/VoiceBottleShakeHeartAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.audio.bean.VoiceBottleSayHiInfo; +import com.mango.core.audio.bean.VoiceBottleSayHiInfo; /** * 声音瓶子点击打招呼：发送爱心动画 + 发送固定文本信息 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/WelcomeAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/WelcomeAttachment.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/WelcomeAttachment.java rename to core/src/main/java/com/mango/core/im/custom/bean/WelcomeAttachment.java index d74d9d5a4..80e379baa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/WelcomeAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/WelcomeAttachment.java @@ -1,10 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.mango.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.room.bean.WelcomeInfo; +import com.mango.core.auth.AuthModel; +import com.mango.core.room.bean.WelcomeInfo; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IIMFriendCore.java b/core/src/main/java/com/mango/core/im/friend/IIMFriendCore.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IIMFriendCore.java rename to core/src/main/java/com/mango/core/im/friend/IIMFriendCore.java index 41766d32e..eabb2f814 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IIMFriendCore.java +++ b/core/src/main/java/com/mango/core/im/friend/IIMFriendCore.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.im.friend; +package com.mango.core.im.friend; import com.netease.nimlib.sdk.friend.constant.FriendFieldEnum; -import com.yizhuan.xchat_android_library.coremanager.IBaseCore; +import com.mango.xchat_android_library.coremanager.IBaseCore; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IMFriendModel.java b/core/src/main/java/com/mango/core/im/friend/IMFriendModel.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IMFriendModel.java rename to core/src/main/java/com/mango/core/im/friend/IMFriendModel.java index 296aff900..53497c9ce 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IMFriendModel.java +++ b/core/src/main/java/com/mango/core/im/friend/IMFriendModel.java @@ -1,17 +1,17 @@ -package com.yizhuan.xchat_android_core.im.friend; +package com.mango.core.im.friend; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.Observer; import com.netease.nimlib.sdk.friend.FriendService; import com.netease.nimlib.sdk.friend.FriendServiceObserve; import com.netease.nimlib.sdk.friend.model.FriendChangedNotify; -import com.yizhuan.xchat_android_core.bean.response.result.UserListResult; -import com.yizhuan.xchat_android_core.manager.BaseMvpModel; -import com.yizhuan.xchat_android_core.manager.IMMessageManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RelationShipEvent; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.bean.response.result.UserListResult; +import com.mango.core.manager.BaseMvpModel; +import com.mango.core.manager.IMMessageManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RelationShipEvent; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/login/IIMLoginClient.java b/core/src/main/java/com/mango/core/im/login/IIMLoginClient.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/login/IIMLoginClient.java rename to core/src/main/java/com/mango/core/im/login/IIMLoginClient.java index a29effb51..23f2f0790 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/login/IIMLoginClient.java +++ b/core/src/main/java/com/mango/core/im/login/IIMLoginClient.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.login; +package com.mango.core.im.login; import com.netease.nimlib.sdk.StatusCode; import com.netease.nimlib.sdk.auth.LoginInfo; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/login/IIMLoginCore.java b/core/src/main/java/com/mango/core/im/login/IIMLoginCore.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/login/IIMLoginCore.java rename to core/src/main/java/com/mango/core/im/login/IIMLoginCore.java index 9c721ee49..c4cd48e37 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/login/IIMLoginCore.java +++ b/core/src/main/java/com/mango/core/im/login/IIMLoginCore.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.im.login; +package com.mango.core.im.login; import com.netease.nimlib.sdk.auth.OnlineClient; -import com.yizhuan.xchat_android_core.base.IModel; +import com.mango.core.base.IModel; /** * Created by chenran on 2017/2/16. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCore.java b/core/src/main/java/com/mango/core/im/notification/INotificationCore.java similarity index 70% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCore.java rename to core/src/main/java/com/mango/core/im/notification/INotificationCore.java index c48be6564..e5fb044a9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCore.java +++ b/core/src/main/java/com/mango/core/im/notification/INotificationCore.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.im.notification; +package com.mango.core.im.notification; import com.netease.nimlib.sdk.msg.model.CustomNotification; -import com.yizhuan.xchat_android_library.coremanager.IBaseCore; +import com.mango.xchat_android_library.coremanager.IBaseCore; /** * Created by zhouxiangfeng on 2017/6/19. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCoreClient.java b/core/src/main/java/com/mango/core/im/notification/INotificationCoreClient.java similarity index 62% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCoreClient.java rename to core/src/main/java/com/mango/core/im/notification/INotificationCoreClient.java index 8d93c2fdf..d7e6ecb80 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCoreClient.java +++ b/core/src/main/java/com/mango/core/im/notification/INotificationCoreClient.java @@ -1,8 +1,7 @@ -package com.yizhuan.xchat_android_core.im.notification; +package com.mango.core.im.notification; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_library.coremanager.ICoreClient; +import com.mango.xchat_android_library.coremanager.ICoreClient; /** * Created by zhouxiangfeng on 2017/6/19. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/room/IIMRoomCoreClient.java b/core/src/main/java/com/mango/core/im/room/IIMRoomCoreClient.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/room/IIMRoomCoreClient.java rename to core/src/main/java/com/mango/core/im/room/IIMRoomCoreClient.java index 45fcc9f87..ec28c4c0c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/room/IIMRoomCoreClient.java +++ b/core/src/main/java/com/mango/core/im/room/IIMRoomCoreClient.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.room; +package com.mango.core.im.room; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; @@ -6,7 +6,7 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMemberUpdate; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.chatroom.model.ChatRoomQueueChangeAttachment; import com.netease.nimlib.sdk.util.Entry; -import com.yizhuan.xchat_android_library.coremanager.ICoreClient; +import com.mango.xchat_android_library.coremanager.ICoreClient; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/state/IPhoneCallStateModel.java b/core/src/main/java/com/mango/core/im/state/IPhoneCallStateModel.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/state/IPhoneCallStateModel.java rename to core/src/main/java/com/mango/core/im/state/IPhoneCallStateModel.java index 10d9fe5f3..98a3a2f99 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/state/IPhoneCallStateModel.java +++ b/core/src/main/java/com/mango/core/im/state/IPhoneCallStateModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.im.state; +package com.mango.core.im.state; -import com.yizhuan.xchat_android_core.base.IModel; +import com.mango.core.base.IModel; public interface IPhoneCallStateModel extends IModel { /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/state/PhoneCallStateModel.java b/core/src/main/java/com/mango/core/im/state/PhoneCallStateModel.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/state/PhoneCallStateModel.java rename to core/src/main/java/com/mango/core/im/state/PhoneCallStateModel.java index d10db46b1..a93194aad 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/state/PhoneCallStateModel.java +++ b/core/src/main/java/com/mango/core/im/state/PhoneCallStateModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.state; +package com.mango.core.im.state; import android.telephony.TelephonyManager; import android.util.Log; -import com.yizhuan.xchat_android_core.base.BaseModel; +import com.mango.core.base.BaseModel; public class PhoneCallStateModel extends BaseModel implements IPhoneCallStateModel { private static final String TAG = "PhoneCallStateModel"; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/sysmsg/ISysMsgCore.java b/core/src/main/java/com/mango/core/im/sysmsg/ISysMsgCore.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/sysmsg/ISysMsgCore.java rename to core/src/main/java/com/mango/core/im/sysmsg/ISysMsgCore.java index 8bffb9c3b..760966c56 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/sysmsg/ISysMsgCore.java +++ b/core/src/main/java/com/mango/core/im/sysmsg/ISysMsgCore.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.sysmsg; +package com.mango.core.im.sysmsg; import com.netease.nimlib.sdk.msg.constant.SystemMessageStatus; import com.netease.nimlib.sdk.msg.constant.SystemMessageType; import com.netease.nimlib.sdk.msg.model.SystemMessage; -import com.yizhuan.xchat_android_library.coremanager.IBaseCore; +import com.mango.xchat_android_library.coremanager.IBaseCore; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/sysmsg/ISysMsgCoreClient.java b/core/src/main/java/com/mango/core/im/sysmsg/ISysMsgCoreClient.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/sysmsg/ISysMsgCoreClient.java rename to core/src/main/java/com/mango/core/im/sysmsg/ISysMsgCoreClient.java index 2f970d444..ab3505bb0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/sysmsg/ISysMsgCoreClient.java +++ b/core/src/main/java/com/mango/core/im/sysmsg/ISysMsgCoreClient.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.im.sysmsg; +package com.mango.core.im.sysmsg; import com.netease.nimlib.sdk.msg.model.SystemMessage; -import com.yizhuan.xchat_android_library.coremanager.ICoreClient; +import com.mango.xchat_android_library.coremanager.ICoreClient; /** * Created by zhouxiangfeng on 2017/5/19. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/FaceComponent.java b/core/src/main/java/com/mango/core/initial/FaceComponent.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/FaceComponent.java rename to core/src/main/java/com/mango/core/initial/FaceComponent.java index b5f58f1c6..aab041cd3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/FaceComponent.java +++ b/core/src/main/java/com/mango/core/initial/FaceComponent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial; +package com.mango.core.initial; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java b/core/src/main/java/com/mango/core/initial/IInitialModel.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java rename to core/src/main/java/com/mango/core/initial/IInitialModel.java index a8da261ee..72fe8ff90 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java +++ b/core/src/main/java/com/mango/core/initial/IInitialModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial; +package com.mango.core.initial; import android.annotation.SuppressLint; @@ -6,11 +6,11 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.lifecycle.LiveData; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.home.bean.MainTabInfo; -import com.yizhuan.xchat_android_core.initial.bean.BoxInfo; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.home.bean.MainTabInfo; +import com.mango.core.initial.bean.BoxInfo; +import com.mango.core.initial.bean.InitInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java b/core/src/main/java/com/mango/core/initial/InitialModel.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java rename to core/src/main/java/com/mango/core/initial/InitialModel.java index c4cb55c84..06cc5e1b9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java +++ b/core/src/main/java/com/mango/core/initial/InitialModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial; +package com.mango.core.initial; import android.annotation.SuppressLint; import android.content.BroadcastReceiver; @@ -15,27 +15,27 @@ import androidx.lifecycle.MutableLiveData; import com.bumptech.glide.request.FutureTarget; import com.bumptech.glide.request.target.Target; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.certification.CertificationModel; -import com.yizhuan.xchat_android_core.home.bean.MainTabInfo; -import com.yizhuan.xchat_android_core.home.bean.MainTabType; -import com.yizhuan.xchat_android_core.initial.bean.BoxInfo; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.noble.NobleDataManager; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.withdraw.WithdrawModel; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.core.DemoCache; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.certification.CertificationModel; +import com.mango.core.home.bean.MainTabInfo; +import com.mango.core.home.bean.MainTabType; +import com.mango.core.initial.bean.BoxInfo; +import com.mango.core.initial.bean.InitInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.noble.NobleDataManager; +import com.mango.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.mango.core.room.face.DynamicFaceModel; +import com.mango.core.utils.CurrentTimeUtils; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.RxHelper; +import com.mango.core.withdraw.WithdrawModel; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.NetworkUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.io.File; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/NobleResourceComponent.java b/core/src/main/java/com/mango/core/initial/NobleResourceComponent.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/NobleResourceComponent.java rename to core/src/main/java/com/mango/core/initial/NobleResourceComponent.java index b1acb67bd..a8c0f7aa5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/NobleResourceComponent.java +++ b/core/src/main/java/com/mango/core/initial/NobleResourceComponent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial; +package com.mango.core.initial; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/SplashComponent.java b/core/src/main/java/com/mango/core/initial/SplashComponent.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/SplashComponent.java rename to core/src/main/java/com/mango/core/initial/SplashComponent.java index 62bc5f22a..846b43e76 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/SplashComponent.java +++ b/core/src/main/java/com/mango/core/initial/SplashComponent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial; +package com.mango.core.initial; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/BoxInfo.java b/core/src/main/java/com/mango/core/initial/bean/BoxInfo.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/BoxInfo.java rename to core/src/main/java/com/mango/core/initial/bean/BoxInfo.java index 3ca273585..946f650cd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/BoxInfo.java +++ b/core/src/main/java/com/mango/core/initial/bean/BoxInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial.bean; +package com.mango.core.initial.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java b/core/src/main/java/com/mango/core/initial/bean/InitInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java rename to core/src/main/java/com/mango/core/initial/bean/InitInfo.java index 651b4a755..31d35b12f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java +++ b/core/src/main/java/com/mango/core/initial/bean/InitInfo.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.initial.bean; +package com.mango.core.initial.bean; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.initial.FaceComponent; -import com.yizhuan.xchat_android_core.initial.NobleResourceComponent; -import com.yizhuan.xchat_android_core.initial.SplashComponent; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInitInfo; -import com.yizhuan.xchat_android_core.noble.NobleRight; +import com.mango.core.initial.FaceComponent; +import com.mango.core.initial.NobleResourceComponent; +import com.mango.core.initial.SplashComponent; +import com.mango.core.monsterhunting.bean.MonsterInitInfo; +import com.mango.core.noble.NobleRight; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/RedEnvelopeConfig.java b/core/src/main/java/com/mango/core/initial/bean/RedEnvelopeConfig.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/RedEnvelopeConfig.java rename to core/src/main/java/com/mango/core/initial/bean/RedEnvelopeConfig.java index c373296f5..3aee6bf5d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/RedEnvelopeConfig.java +++ b/core/src/main/java/com/mango/core/initial/bean/RedEnvelopeConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial.bean; +package com.mango.core.initial.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/TaxInfo.java b/core/src/main/java/com/mango/core/initial/bean/TaxInfo.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/TaxInfo.java rename to core/src/main/java/com/mango/core/initial/bean/TaxInfo.java index bb14006f3..cedff3894 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/TaxInfo.java +++ b/core/src/main/java/com/mango/core/initial/bean/TaxInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial.bean; +package com.mango.core.initial.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/NoParamsInterceptor.java b/core/src/main/java/com/mango/core/interceptor/NoParamsInterceptor.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/interceptor/NoParamsInterceptor.java rename to core/src/main/java/com/mango/core/interceptor/NoParamsInterceptor.java index 36e8939c7..eca097d78 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/NoParamsInterceptor.java +++ b/core/src/main/java/com/mango/core/interceptor/NoParamsInterceptor.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.interceptor; +package com.mango.core.interceptor; import java.io.IOException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/ParamsInterceptor.java b/core/src/main/java/com/mango/core/interceptor/ParamsInterceptor.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/interceptor/ParamsInterceptor.java rename to core/src/main/java/com/mango/core/interceptor/ParamsInterceptor.java index 372d95e59..d701e80c1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/ParamsInterceptor.java +++ b/core/src/main/java/com/mango/core/interceptor/ParamsInterceptor.java @@ -1,14 +1,14 @@ -package com.yizhuan.xchat_android_core.interceptor; +package com.mango.core.interceptor; import android.text.TextUtils; import androidx.annotation.NonNull; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.utils.APIEncryptUtil; -import com.yizhuan.xchat_android_core.utils.OaidUtil; -import com.yizhuan.xchat_android_library.utils.codec.MD5Utils; +import com.mango.core.auth.AuthModel; +import com.mango.core.utils.APIEncryptUtil; +import com.mango.core.utils.OaidUtil; +import com.mango.xchat_android_library.utils.codec.MD5Utils; import java.io.IOException; import java.nio.charset.Charset; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/PathFilter.java b/core/src/main/java/com/mango/core/interceptor/PathFilter.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/interceptor/PathFilter.java rename to core/src/main/java/com/mango/core/interceptor/PathFilter.java index d4211fb49..86a85c3bd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/PathFilter.java +++ b/core/src/main/java/com/mango/core/interceptor/PathFilter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.interceptor; +package com.mango.core.interceptor; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/kick/IKickModel.java b/core/src/main/java/com/mango/core/kick/IKickModel.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/kick/IKickModel.java rename to core/src/main/java/com/mango/core/kick/IKickModel.java index 1a26a309a..bfe81f295 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/kick/IKickModel.java +++ b/core/src/main/java/com/mango/core/kick/IKickModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.kick; +package com.mango.core.kick; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.base.IModel; +import com.mango.core.base.IModel; public interface IKickModel extends IModel { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/kick/KickModel.java b/core/src/main/java/com/mango/core/kick/KickModel.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/kick/KickModel.java rename to core/src/main/java/com/mango/core/kick/KickModel.java index 1bcc1679e..a91209916 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/kick/KickModel.java +++ b/core/src/main/java/com/mango/core/kick/KickModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.kick; +package com.mango.core.kick; import android.annotation.SuppressLint; import android.os.Handler; @@ -6,12 +6,12 @@ import android.os.Message; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.super_admin.util.SaMsgUtil; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.mango.core.base.BaseModel; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.super_admin.util.SaMsgUtil; +import com.mango.core.utils.net.RxHelper; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelResourceType.java b/core/src/main/java/com/mango/core/level/UserLevelResourceType.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelResourceType.java rename to core/src/main/java/com/mango/core/level/UserLevelResourceType.java index 734b404b2..51223f4aa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelResourceType.java +++ b/core/src/main/java/com/mango/core/level/UserLevelResourceType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.level; +package com.mango.core.level; /** *

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelVo.java b/core/src/main/java/com/mango/core/level/UserLevelVo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelVo.java rename to core/src/main/java/com/mango/core/level/UserLevelVo.java index a98ea7c00..270bb63b4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelVo.java +++ b/core/src/main/java/com/mango/core/level/UserLevelVo.java @@ -1,11 +1,9 @@ -package com.yizhuan.xchat_android_core.level; +package com.mango.core.level; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import io.realm.RealmObject; - /** *

* diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/level/event/CharmLevelUpEvent.java b/core/src/main/java/com/mango/core/level/event/CharmLevelUpEvent.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/level/event/CharmLevelUpEvent.java rename to core/src/main/java/com/mango/core/level/event/CharmLevelUpEvent.java index 5a6d2cc1a..671cea76e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/level/event/CharmLevelUpEvent.java +++ b/core/src/main/java/com/mango/core/level/event/CharmLevelUpEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.level.event; +package com.mango.core.level.event; public class CharmLevelUpEvent { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/level/event/LevelUpEvent.java b/core/src/main/java/com/mango/core/level/event/LevelUpEvent.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/level/event/LevelUpEvent.java rename to core/src/main/java/com/mango/core/level/event/LevelUpEvent.java index 6d4eb6532..dbf46f322 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/level/event/LevelUpEvent.java +++ b/core/src/main/java/com/mango/core/level/event/LevelUpEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.level.event; +package com.mango.core.level.event; public class LevelUpEvent { diff --git a/core/src/main/java/com/mango/core/linked/ILinkedModel.java b/core/src/main/java/com/mango/core/linked/ILinkedModel.java new file mode 100644 index 000000000..ff5568c74 --- /dev/null +++ b/core/src/main/java/com/mango/core/linked/ILinkedModel.java @@ -0,0 +1,13 @@ +package com.mango.core.linked; + +import com.mango.core.base.IModel; +import com.mango.core.linked.bean.LinkedInfo; + + +public interface ILinkedModel extends IModel { + + void setLinkedInfo(LinkedInfo linkedInfo); + + LinkedInfo getLinkedInfo(); + +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/linked/LinkedModel.java b/core/src/main/java/com/mango/core/linked/LinkedModel.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/linked/LinkedModel.java rename to core/src/main/java/com/mango/core/linked/LinkedModel.java index c33b0ceeb..385eda0cf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/linked/LinkedModel.java +++ b/core/src/main/java/com/mango/core/linked/LinkedModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.linked; +package com.mango.core.linked; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; +import com.mango.core.base.BaseModel; +import com.mango.core.linked.bean.LinkedInfo; public class LinkedModel extends BaseModel implements ILinkedModel{ diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/linked/bean/LinkedInfo.java b/core/src/main/java/com/mango/core/linked/bean/LinkedInfo.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/linked/bean/LinkedInfo.java rename to core/src/main/java/com/mango/core/linked/bean/LinkedInfo.java index cc84ec6b2..651e3a7fb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/linked/bean/LinkedInfo.java +++ b/core/src/main/java/com/mango/core/linked/bean/LinkedInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.linked.bean; +package com.mango.core.linked.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/linked/event/LinkMeInfoUpdateEvent.java b/core/src/main/java/com/mango/core/linked/event/LinkMeInfoUpdateEvent.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/linked/event/LinkMeInfoUpdateEvent.java rename to core/src/main/java/com/mango/core/linked/event/LinkMeInfoUpdateEvent.java index 9027b1813..5ff31ea82 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/linked/event/LinkMeInfoUpdateEvent.java +++ b/core/src/main/java/com/mango/core/linked/event/LinkMeInfoUpdateEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.linked.event; +package com.mango.core.linked.event; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; +import com.mango.core.linked.bean.LinkedInfo; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyInfo.java b/core/src/main/java/com/mango/core/luckymoney/LuckyMoneyInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyInfo.java rename to core/src/main/java/com/mango/core/luckymoney/LuckyMoneyInfo.java index 094f7755e..000a85428 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyInfo.java +++ b/core/src/main/java/com/mango/core/luckymoney/LuckyMoneyInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.luckymoney; +package com.mango.core.luckymoney; import java.io.Serializable; import java.util.HashMap; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyRecordsInfo.java b/core/src/main/java/com/mango/core/luckymoney/LuckyMoneyRecordsInfo.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyRecordsInfo.java rename to core/src/main/java/com/mango/core/luckymoney/LuckyMoneyRecordsInfo.java index 647c8988b..641f73acc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyRecordsInfo.java +++ b/core/src/main/java/com/mango/core/luckymoney/LuckyMoneyRecordsInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.luckymoney; +package com.mango.core.luckymoney; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyUserInfo.java b/core/src/main/java/com/mango/core/luckymoney/LuckyMoneyUserInfo.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyUserInfo.java rename to core/src/main/java/com/mango/core/luckymoney/LuckyMoneyUserInfo.java index 1e2a1165c..a19981251 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyUserInfo.java +++ b/core/src/main/java/com/mango/core/luckymoney/LuckyMoneyUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.luckymoney; +package com.mango.core.luckymoney; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java b/core/src/main/java/com/mango/core/magic/IMagicModel.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java rename to core/src/main/java/com/mango/core/magic/IMagicModel.java index 286b48c95..faa0313f9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java +++ b/core/src/main/java/com/mango/core/magic/IMagicModel.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.magic; +package com.mango.core.magic; import androidx.annotation.Nullable; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.base.IModel; -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.mango.core.base.IModel; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.magic.bean.MagicInfo; +import com.mango.core.magic.bean.MagicMultiReceiverInfo; +import com.mango.core.magic.bean.MagicReceivedInfo; 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/mango/core/magic/MagicModel.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java rename to core/src/main/java/com/mango/core/magic/MagicModel.java index 025c7fc16..89405e73c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java +++ b/core/src/main/java/com/mango/core/magic/MagicModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.magic; +package com.mango.core.magic; import android.annotation.SuppressLint; import android.os.Handler; @@ -8,34 +8,34 @@ import androidx.annotation.Nullable; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicBatchAttachment; -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 com.yizhuan.xchat_android_core.magic.toolbox.MagicToolbox; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -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.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.FreezeException; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_core.magic.exception.MagicOutOfDateException; -import com.yizhuan.xchat_android_core.exception.UnKnowException; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicAllMicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.im.custom.bean.MagicBatchAttachment; +import com.mango.core.magic.bean.MagicInfo; +import com.mango.core.magic.bean.MagicMultiReceiverInfo; +import com.mango.core.magic.bean.MagicReceivedInfo; +import com.mango.core.magic.bean.MultiMagicReceivedInfo; +import com.mango.core.magic.toolbox.MagicToolbox; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.pay.PayModel; +import com.mango.core.retry.ImRetryManager; +import com.mango.core.retry.RetryChatRoomMessage; +import com.mango.core.room.giftvalue.bean.GiftValueCommonUpdate; +import com.mango.core.room.giftvalue.helper.GiftValueMrg; +import com.mango.core.utils.net.BalanceNotEnoughExeption; +import com.mango.core.utils.net.FreezeException; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.core.magic.exception.MagicOutOfDateException; +import com.mango.core.exception.UnKnowException; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.MagicAllMicAttachment; +import com.mango.core.im.custom.bean.MagicAttachment; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/ObjectPool.java b/core/src/main/java/com/mango/core/magic/ObjectPool.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/ObjectPool.java rename to core/src/main/java/com/mango/core/magic/ObjectPool.java index c56ba915c..b8d733a87 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/ObjectPool.java +++ b/core/src/main/java/com/mango/core/magic/ObjectPool.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.magic; +package com.mango.core.magic; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicInfo.java b/core/src/main/java/com/mango/core/magic/bean/MagicInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicInfo.java rename to core/src/main/java/com/mango/core/magic/bean/MagicInfo.java index 86b3f5911..28365332e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicInfo.java +++ b/core/src/main/java/com/mango/core/magic/bean/MagicInfo.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.magic.bean; +package com.mango.core.magic.bean; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.GiftInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicMultiReceiverInfo.java b/core/src/main/java/com/mango/core/magic/bean/MagicMultiReceiverInfo.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicMultiReceiverInfo.java rename to core/src/main/java/com/mango/core/magic/bean/MagicMultiReceiverInfo.java index c64b36f64..410cdfe71 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicMultiReceiverInfo.java +++ b/core/src/main/java/com/mango/core/magic/bean/MagicMultiReceiverInfo.java @@ -1,14 +1,12 @@ -package com.yizhuan.xchat_android_core.magic.bean; +package com.mango.core.magic.bean; import com.alibaba.fastjson.annotation.JSONField; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; +import com.mango.core.room.giftvalue.bean.RoomGiftValue; import java.io.Serializable; import java.util.List; -import lombok.Data; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceivedInfo.java b/core/src/main/java/com/mango/core/magic/bean/MagicReceivedInfo.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceivedInfo.java rename to core/src/main/java/com/mango/core/magic/bean/MagicReceivedInfo.java index 1a81b9d45..bc11ceaf0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceivedInfo.java +++ b/core/src/main/java/com/mango/core/magic/bean/MagicReceivedInfo.java @@ -1,14 +1,11 @@ -package com.yizhuan.xchat_android_core.magic.bean; +package com.mango.core.magic.bean; import com.alibaba.fastjson.annotation.JSONField; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; +import com.mango.core.room.giftvalue.bean.RoomGiftValue; import java.io.Serializable; -import java.util.List; -import lombok.Data; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceiver.java b/core/src/main/java/com/mango/core/magic/bean/MagicReceiver.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceiver.java rename to core/src/main/java/com/mango/core/magic/bean/MagicReceiver.java index a5d0111ce..3d91f0238 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceiver.java +++ b/core/src/main/java/com/mango/core/magic/bean/MagicReceiver.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.magic.bean; +package com.mango.core.magic.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MultiMagicReceivedInfo.java b/core/src/main/java/com/mango/core/magic/bean/MultiMagicReceivedInfo.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MultiMagicReceivedInfo.java rename to core/src/main/java/com/mango/core/magic/bean/MultiMagicReceivedInfo.java index 53021b931..702053518 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MultiMagicReceivedInfo.java +++ b/core/src/main/java/com/mango/core/magic/bean/MultiMagicReceivedInfo.java @@ -1,14 +1,12 @@ -package com.yizhuan.xchat_android_core.magic.bean; +package com.mango.core.magic.bean; import com.alibaba.fastjson.annotation.JSONField; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; +import com.mango.core.room.giftvalue.bean.RoomGiftValue; import java.io.Serializable; import java.util.List; -import lombok.Data; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/exception/MagicOutOfDateException.java b/core/src/main/java/com/mango/core/magic/exception/MagicOutOfDateException.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/exception/MagicOutOfDateException.java rename to core/src/main/java/com/mango/core/magic/exception/MagicOutOfDateException.java index d0b4e6d53..bed03bf72 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/exception/MagicOutOfDateException.java +++ b/core/src/main/java/com/mango/core/magic/exception/MagicOutOfDateException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.magic.exception; +package com.mango.core.magic.exception; /** * 魔法礼物过期 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/toolbox/MagicToolbox.java b/core/src/main/java/com/mango/core/magic/toolbox/MagicToolbox.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/toolbox/MagicToolbox.java rename to core/src/main/java/com/mango/core/magic/toolbox/MagicToolbox.java index 2e46b641c..8f53472b5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/toolbox/MagicToolbox.java +++ b/core/src/main/java/com/mango/core/magic/toolbox/MagicToolbox.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.magic.toolbox; +package com.mango.core.magic.toolbox; -import com.yizhuan.xchat_android_core.magic.bean.MagicMultiReceiverInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceiver; -import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; +import com.mango.core.magic.bean.MagicMultiReceiverInfo; +import com.mango.core.magic.bean.MagicReceiver; +import com.mango.core.magic.bean.MultiMagicReceivedInfo; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java b/core/src/main/java/com/mango/core/manager/AvRoomDataManager.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java rename to core/src/main/java/com/mango/core/manager/AvRoomDataManager.java index 594496464..90c704d29 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java +++ b/core/src/main/java/com/mango/core/manager/AvRoomDataManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager; +package com.mango.core.manager; import android.annotation.SuppressLint; import android.graphics.Point; @@ -22,27 +22,27 @@ import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData; import com.netease.nimlib.sdk.msg.attachment.NotificationAttachment; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.constant.NotificationType; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean; -import com.yizhuan.xchat_android_core.room.bean.BoxSwitchVo; -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.event.RoomClearScreenEvent; -import com.yizhuan.xchat_android_core.room.game.GameStatus; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.ktv.event.KtvEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomModeType; -import com.yizhuan.xchat_android_core.super_admin.SuperAdminDataMrg; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.utils.StringUtils; -import com.yizhuan.xchat_android_library.rxbus.RxBus; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.DemoCache; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.im.custom.bean.RoomPkBean; +import com.mango.core.room.bean.BoxSwitchVo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.SimplePartyRoomInfo; +import com.mango.core.room.event.RoomClearScreenEvent; +import com.mango.core.room.game.GameStatus; +import com.mango.core.room.giftvalue.helper.GiftValueMrg; +import com.mango.core.room.ktv.event.KtvEvent; +import com.mango.core.room.bean.RoomModeType; +import com.mango.core.super_admin.SuperAdminDataMrg; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.core.user.UserModel; +import com.mango.core.utils.CurrentTimeUtils; +import com.mango.core.utils.LogUtils; +import com.mango.core.utils.StringUtils; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; @@ -58,7 +58,6 @@ import java.util.Map; import java.util.Objects; import io.reactivex.Single; -import io.reactivex.disposables.Disposable; import io.reactivex.processors.PublishProcessor; /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/BaseMvpModel.java b/core/src/main/java/com/mango/core/manager/BaseMvpModel.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/BaseMvpModel.java rename to core/src/main/java/com/mango/core/manager/BaseMvpModel.java index 9201e9284..e462142ec 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/BaseMvpModel.java +++ b/core/src/main/java/com/mango/core/manager/BaseMvpModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.manager; +package com.mango.core.manager; import com.netease.nimlib.sdk.util.api.RequestResult; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.core.bean.response.ServiceResult; import java.net.UnknownHostException; import java.util.concurrent.TimeoutException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMBroadcastManager.java b/core/src/main/java/com/mango/core/manager/IMBroadcastManager.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/IMBroadcastManager.java rename to core/src/main/java/com/mango/core/manager/IMBroadcastManager.java index e09a27d17..3272b913f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMBroadcastManager.java +++ b/core/src/main/java/com/mango/core/manager/IMBroadcastManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager; +package com.mango.core.manager; import android.text.TextUtils; @@ -7,9 +7,9 @@ import com.alibaba.fastjson.JSONObject; import com.netease.nimlib.sdk.NIMSDK; import com.netease.nimlib.sdk.Observer; import com.netease.nimlib.sdk.msg.model.BroadcastMessage; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.upgrade.event.ImPushUpdateAppEvent; +import com.mango.core.bean.BaseProtocol; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.upgrade.event.ImPushUpdateAppEvent; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMMessageManager.java b/core/src/main/java/com/mango/core/manager/IMMessageManager.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/IMMessageManager.java rename to core/src/main/java/com/mango/core/manager/IMMessageManager.java index 10ee5aead..84beca1b7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMMessageManager.java +++ b/core/src/main/java/com/mango/core/manager/IMMessageManager.java @@ -1,8 +1,7 @@ -package com.yizhuan.xchat_android_core.manager; +package com.mango.core.manager; import android.util.Log; -import com.google.gson.Gson; import com.netease.nimlib.sdk.InvocationFuture; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.Observer; @@ -10,7 +9,6 @@ import com.netease.nimlib.sdk.RequestCallback; import com.netease.nimlib.sdk.RequestCallbackWrapper; import com.netease.nimlib.sdk.StatusBarNotificationConfig; import com.netease.nimlib.sdk.friend.FriendService; -import com.netease.nimlib.sdk.msg.MessageBuilder; import com.netease.nimlib.sdk.msg.MsgService; import com.netease.nimlib.sdk.msg.MsgServiceObserve; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; @@ -18,23 +16,23 @@ import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; -import com.yizhuan.xchat_android_core.activity.event.ActivityEvent; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.custom.bean.CpInviteAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LevelUpAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LotteryAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment; -import com.yizhuan.xchat_android_core.level.event.CharmLevelUpEvent; -import com.yizhuan.xchat_android_core.level.event.LevelUpEvent; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.manager.event.HallInfoChangeEvent; -import com.yizhuan.xchat_android_core.newbie.NewbieHelloInfo; -import com.yizhuan.xchat_android_core.newbie.event.NewbieHelloDialogEvent; -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo; -import com.yizhuan.xchat_android_core.web.event.WebViewRefreshEvent; +import com.mango.core.activity.event.ActivityEvent; +import com.mango.core.auth.AuthModel; +import com.mango.core.im.custom.bean.CpInviteAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.LevelUpAttachment; +import com.mango.core.im.custom.bean.LotteryAttachment; +import com.mango.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.mango.core.im.custom.bean.NewbieHelloAttachment; +import com.mango.core.im.custom.bean.RedPacketAttachment; +import com.mango.core.level.event.CharmLevelUpEvent; +import com.mango.core.level.event.LevelUpEvent; +import com.mango.core.luckymoney.LuckyMoneyInfo; +import com.mango.core.manager.event.HallInfoChangeEvent; +import com.mango.core.newbie.NewbieHelloInfo; +import com.mango.core.newbie.event.NewbieHelloDialogEvent; +import com.mango.core.relation.cp.CpInviteInfo; +import com.mango.core.web.event.WebViewRefreshEvent; import org.greenrobot.eventbus.EventBus; @@ -44,15 +42,15 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CP_INVITE_MESSAGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RECEIV_NEWBIE_HELLO; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER; +import static com.mango.core.im.custom.bean.CustomAttachment.CP_INVITE_MESSAGE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RECEIV_NEWBIE_HELLO; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER; /** * Created by MadisonRong on 23/07/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMSystemMsgManager.java b/core/src/main/java/com/mango/core/manager/IMSystemMsgManager.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/IMSystemMsgManager.java rename to core/src/main/java/com/mango/core/manager/IMSystemMsgManager.java index d0874c392..50730ea5a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMSystemMsgManager.java +++ b/core/src/main/java/com/mango/core/manager/IMSystemMsgManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager; +package com.mango.core.manager; import android.text.TextUtils; import android.util.Log; @@ -13,56 +13,56 @@ import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum; 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.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.attachment.UnReadCountAttachment; -import com.yizhuan.xchat_android_core.community.event.UnReadCountEvent; -import com.yizhuan.xchat_android_core.home.event.VisitorUnreadCountEvent; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.VoiceBottleSayHiAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringGrabApprenticesAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringRelationshipMissionEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MWChatTopicEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MWGroupChatMemberEvent; -import com.yizhuan.xchat_android_core.patriarch.bean.LimitNotice; -import com.yizhuan.xchat_android_core.patriarch.event.ImPushMsgPmLimitTimeEvent; -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods; -import com.yizhuan.xchat_android_core.pay.event.ChargeCustomNotificationEvent; -import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent; -import com.yizhuan.xchat_android_core.pay.event.FirstRechargeEvent; -import com.yizhuan.xchat_android_core.pay.event.NewUserChargeEvent; -import com.yizhuan.xchat_android_core.room.event.RoomTaskTipsEvent; -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.vip.VipInfo; -import com.yizhuan.xchat_android_core.vip.VipOpenEvent; -import com.yizhuan.xchat_android_core.vip.VipUpgradeEvent; +import com.mango.core.auth.AuthModel; +import com.mango.core.community.attachment.UnReadCountAttachment; +import com.mango.core.community.event.UnReadCountEvent; +import com.mango.core.home.event.VisitorUnreadCountEvent; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.VoiceBottleSayHiAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringGrabApprenticesAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; +import com.mango.core.mentoring_relationship.event.MentoringRelationshipMissionEvent; +import com.mango.core.miniworld.event.MWChatTopicEvent; +import com.mango.core.miniworld.event.MWGroupChatMemberEvent; +import com.mango.core.patriarch.bean.LimitNotice; +import com.mango.core.patriarch.event.ImPushMsgPmLimitTimeEvent; +import com.mango.core.pay.bean.FirstChargeGoods; +import com.mango.core.pay.event.ChargeCustomNotificationEvent; +import com.mango.core.pay.event.FirstChargeEvent; +import com.mango.core.pay.event.FirstRechargeEvent; +import com.mango.core.pay.event.NewUserChargeEvent; +import com.mango.core.room.event.RoomTaskTipsEvent; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.vip.VipInfo; +import com.mango.core.vip.VipOpenEvent; +import com.mango.core.vip.VipUpgradeEvent; import org.greenrobot.eventbus.EventBus; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_VISITOR; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_WORLD_DYNAMIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_TASK_TIPS; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_TASK_TIPS; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_VISITOR_UNREAD; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_OPEN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_UPGRADE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_VISITOR; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_WORLD_DYNAMIC; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_TASK_TIPS; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_TASK_TIPS; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_VISITOR_UNREAD; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_OPEN; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_UPGRADE; /** * 云信系统通知管理类 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/RelationShipEvent.java b/core/src/main/java/com/mango/core/manager/RelationShipEvent.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/RelationShipEvent.java rename to core/src/main/java/com/mango/core/manager/RelationShipEvent.java index 42559d2b8..a33f763c6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/RelationShipEvent.java +++ b/core/src/main/java/com/mango/core/manager/RelationShipEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager; +package com.mango.core.manager; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/RoomEvent.java b/core/src/main/java/com/mango/core/manager/RoomEvent.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/RoomEvent.java rename to core/src/main/java/com/mango/core/manager/RoomEvent.java index 291e22423..669b43fab 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/RoomEvent.java +++ b/core/src/main/java/com/mango/core/manager/RoomEvent.java @@ -1,25 +1,25 @@ -package com.yizhuan.xchat_android_core.manager; +package com.mango.core.manager; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.bean.attachmsg.RoomQueueMsgAttachment; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterHuntingResultAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterStatusAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo; -import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterAttackInfo; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.mango.core.gift.bean.GiftMultiReceiverInfo; +import com.mango.core.gift.bean.GiftReceiveInfo; +import com.mango.core.gift.bean.LuckyBagGifts; +import com.mango.core.gift.bean.MultiGiftReceiveInfo; +import com.mango.core.im.custom.bean.AssistantAttachment; +import com.mango.core.im.custom.bean.CarAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.MonsterHuntingResultAttachment; +import com.mango.core.im.custom.bean.MonsterStatusAttachment; +import com.mango.core.im.custom.bean.NobleAttachment; +import com.mango.core.magic.bean.MagicReceivedInfo; +import com.mango.core.magic.bean.MultiMagicReceivedInfo; +import com.mango.core.monsterhunting.bean.MonsterAttackInfo; +import com.mango.core.pay.bean.WalletInfo; +import com.mango.core.room.auction.bean.AuctionInfo; +import com.mango.core.room.bean.RoomInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/event/HallInfoChangeEvent.java b/core/src/main/java/com/mango/core/manager/event/HallInfoChangeEvent.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/event/HallInfoChangeEvent.java rename to core/src/main/java/com/mango/core/manager/event/HallInfoChangeEvent.java index 33c50e309..ab465174a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/event/HallInfoChangeEvent.java +++ b/core/src/main/java/com/mango/core/manager/event/HallInfoChangeEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.event; +package com.mango.core.manager.event; /** * 模厅信息变更事件 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/event/HistoryMessageEvent.java b/core/src/main/java/com/mango/core/manager/event/HistoryMessageEvent.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/event/HistoryMessageEvent.java rename to core/src/main/java/com/mango/core/manager/event/HistoryMessageEvent.java index dd9c22f44..57bcdda6a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/event/HistoryMessageEvent.java +++ b/core/src/main/java/com/mango/core/manager/event/HistoryMessageEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.event; +package com.mango.core.manager.event; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/SimpleAnimationListener.java b/core/src/main/java/com/mango/core/monsterhunting/SimpleAnimationListener.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/SimpleAnimationListener.java rename to core/src/main/java/com/mango/core/monsterhunting/SimpleAnimationListener.java index 82cb438c6..9d0ede59a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/SimpleAnimationListener.java +++ b/core/src/main/java/com/mango/core/monsterhunting/SimpleAnimationListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting; +package com.mango.core.monsterhunting; import android.view.animation.Animation; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterAttackInfo.java b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterAttackInfo.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterAttackInfo.java rename to core/src/main/java/com/mango/core/monsterhunting/bean/MonsterAttackInfo.java index a1ecbf427..a9e9e9a99 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterAttackInfo.java +++ b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterAttackInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.mango.core.monsterhunting.bean; /** * Created by MadisonRong on 31/03/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterAttackReceiveInfo.java b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterAttackReceiveInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterAttackReceiveInfo.java rename to core/src/main/java/com/mango/core/monsterhunting/bean/MonsterAttackReceiveInfo.java index e06be7e69..7d12f5e62 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterAttackReceiveInfo.java +++ b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterAttackReceiveInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.mango.core.monsterhunting.bean; /** * Created by MadisonRong on 01/04/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterEvent.java b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterEvent.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterEvent.java rename to core/src/main/java/com/mango/core/monsterhunting/bean/MonsterEvent.java index ae4184eeb..85982ed89 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterEvent.java +++ b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.mango.core.monsterhunting.bean; /** * Created by MadisonRong on 03/04/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHunter.java b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterHunter.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHunter.java rename to core/src/main/java/com/mango/core/monsterhunting/bean/MonsterHunter.java index 6f3c3dadb..1345b3b1f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHunter.java +++ b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterHunter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.mango.core.monsterhunting.bean; /** * Created by MadisonRong on 02/04/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingResult.java b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterHuntingResult.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingResult.java rename to core/src/main/java/com/mango/core/monsterhunting/bean/MonsterHuntingResult.java index c9532b2c5..7800d099d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingResult.java +++ b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterHuntingResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.mango.core.monsterhunting.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingReward.java b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterHuntingReward.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingReward.java rename to core/src/main/java/com/mango/core/monsterhunting/bean/MonsterHuntingReward.java index f38bb3262..fb98d9a09 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingReward.java +++ b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterHuntingReward.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.mango.core.monsterhunting.bean; /** * Created by MadisonRong on 02/04/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterInfo.java b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterInfo.java rename to core/src/main/java/com/mango/core/monsterhunting/bean/MonsterInfo.java index ecad75be7..011043341 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterInfo.java +++ b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.mango.core.monsterhunting.bean; import android.os.Parcel; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterInitInfo.java b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterInitInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterInitInfo.java rename to core/src/main/java/com/mango/core/monsterhunting/bean/MonsterInitInfo.java index 80d86b97e..f6862258e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterInitInfo.java +++ b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterInitInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.mango.core.monsterhunting.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterListInfo.java b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterListInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterListInfo.java rename to core/src/main/java/com/mango/core/monsterhunting/bean/MonsterListInfo.java index b5b56e44d..ce91fccc3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterListInfo.java +++ b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.mango.core.monsterhunting.bean; /** * Created by huangmeng1 on 2018/4/2. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterProtocol.java b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterProtocol.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterProtocol.java rename to core/src/main/java/com/mango/core/monsterhunting/bean/MonsterProtocol.java index fa2ae908f..8e764c842 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterProtocol.java +++ b/core/src/main/java/com/mango/core/monsterhunting/bean/MonsterProtocol.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.mango.core.monsterhunting.bean; import android.os.Parcel; import android.os.Parcelable; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; +import com.mango.core.bean.BaseProtocol; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/manager/MonsterDataManager.java b/core/src/main/java/com/mango/core/monsterhunting/manager/MonsterDataManager.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/manager/MonsterDataManager.java rename to core/src/main/java/com/mango/core/monsterhunting/manager/MonsterDataManager.java index 571087123..0ee9386b3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/manager/MonsterDataManager.java +++ b/core/src/main/java/com/mango/core/monsterhunting/manager/MonsterDataManager.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.monsterhunting.manager; +package com.mango.core.monsterhunting.manager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInitInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.monsterhunting.bean.MonsterInfo; +import com.mango.core.monsterhunting.bean.MonsterInitInfo; import java.util.Hashtable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/IMonsterHuntingModel.java b/core/src/main/java/com/mango/core/monsterhunting/model/IMonsterHuntingModel.java similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/IMonsterHuntingModel.java rename to core/src/main/java/com/mango/core/monsterhunting/model/IMonsterHuntingModel.java index 85d209c48..0613c5071 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/IMonsterHuntingModel.java +++ b/core/src/main/java/com/mango/core/monsterhunting/model/IMonsterHuntingModel.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.monsterhunting.model; +package com.mango.core.monsterhunting.model; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterAttackInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.monsterhunting.bean.MonsterAttackInfo; +import com.mango.core.monsterhunting.bean.MonsterHuntingResult; +import com.mango.core.monsterhunting.bean.MonsterInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/MonsterHuntingModel.java b/core/src/main/java/com/mango/core/monsterhunting/model/MonsterHuntingModel.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/MonsterHuntingModel.java rename to core/src/main/java/com/mango/core/monsterhunting/model/MonsterHuntingModel.java index 0f45adfcc..1455d39d9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/MonsterHuntingModel.java +++ b/core/src/main/java/com/mango/core/monsterhunting/model/MonsterHuntingModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.monsterhunting.model; +package com.mango.core.monsterhunting.model; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_MONSTER_HUNTING; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_END; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_RESULT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_MONSTER_HUNTING; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_END; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_RESULT; import android.os.CountDownTimer; import android.os.Handler; @@ -21,24 +21,24 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.model.BroadcastMessage; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterAttackAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterAttackInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol; -import com.yizhuan.xchat_android_core.monsterhunting.rxevent.MonsterUpdateEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.BaseProtocol; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.MonsterAttackAttachment; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.monsterhunting.bean.MonsterAttackInfo; +import com.mango.core.monsterhunting.bean.MonsterHuntingResult; +import com.mango.core.monsterhunting.bean.MonsterInfo; +import com.mango.core.monsterhunting.bean.MonsterProtocol; +import com.mango.core.monsterhunting.rxevent.MonsterUpdateEvent; +import com.mango.core.room.bean.RoomInfo; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.rxbus.RxBusHelper; +import com.mango.xchat_android_library.utils.ListUtils; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/rxevent/MonsterUpdateEvent.java b/core/src/main/java/com/mango/core/monsterhunting/rxevent/MonsterUpdateEvent.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/rxevent/MonsterUpdateEvent.java rename to core/src/main/java/com/mango/core/monsterhunting/rxevent/MonsterUpdateEvent.java index a1f51faf6..dec36596e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/rxevent/MonsterUpdateEvent.java +++ b/core/src/main/java/com/mango/core/monsterhunting/rxevent/MonsterUpdateEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.monsterhunting.rxevent; +package com.mango.core.monsterhunting.rxevent; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol; +import com.mango.core.monsterhunting.bean.MonsterProtocol; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/ImsgClient.java b/core/src/main/java/com/mango/core/msg/ImsgClient.java similarity index 63% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/ImsgClient.java rename to core/src/main/java/com/mango/core/msg/ImsgClient.java index 777727a4c..c09d77ed1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/ImsgClient.java +++ b/core/src/main/java/com/mango/core/msg/ImsgClient.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.msg; +package com.mango.core.msg; -import com.yizhuan.xchat_android_library.coremanager.ICoreClient; +import com.mango.xchat_android_library.coremanager.ICoreClient; /** * Created by zhouxiangfeng on 2017/3/11. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ApproveMsgInfo.java b/core/src/main/java/com/mango/core/msg/sys/ApproveMsgInfo.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ApproveMsgInfo.java rename to core/src/main/java/com/mango/core/msg/sys/ApproveMsgInfo.java index f24d1a817..3ccfa74f9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ApproveMsgInfo.java +++ b/core/src/main/java/com/mango/core/msg/sys/ApproveMsgInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sys; +package com.mango.core.msg.sys; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgComponent.java b/core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgComponent.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgComponent.java rename to core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgComponent.java index 377bbfd58..ed797f721 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgComponent.java +++ b/core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgComponent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sys; +package com.mango.core.msg.sys; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgInfo.java b/core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgInfo.java rename to core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgInfo.java index 61ce9d777..4ead43049 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgInfo.java +++ b/core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sys; +package com.mango.core.msg.sys; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgLayout.java b/core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgLayout.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgLayout.java rename to core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgLayout.java index 17f305281..e40f11b81 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgLayout.java +++ b/core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sys; +package com.mango.core.msg.sys; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgModel.java b/core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgModel.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgModel.java rename to core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgModel.java index 76235dbd9..50d63c076 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgModel.java +++ b/core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.msg.sys; +package com.mango.core.msg.sys; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.mango.core.bean.response.ServiceResult; import java.util.Map; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgParamKey.java b/core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgParamKey.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgParamKey.java rename to core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgParamKey.java index c8e6071d1..9bcb9b1e6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgParamKey.java +++ b/core/src/main/java/com/mango/core/msg/sys/ErbanSysMsgParamKey.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sys; +package com.mango.core.msg.sys; /** * Created by MadisonRong on 05/07/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Component.java b/core/src/main/java/com/mango/core/msg/sysv2/ErbanSysMsgV2Component.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Component.java rename to core/src/main/java/com/mango/core/msg/sysv2/ErbanSysMsgV2Component.java index dd33f3a39..d9416e4f2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Component.java +++ b/core/src/main/java/com/mango/core/msg/sysv2/ErbanSysMsgV2Component.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sysv2; +package com.mango.core.msg.sysv2; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Info.java b/core/src/main/java/com/mango/core/msg/sysv2/ErbanSysMsgV2Info.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Info.java rename to core/src/main/java/com/mango/core/msg/sysv2/ErbanSysMsgV2Info.java index 4b8fbc5cb..d50a84631 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Info.java +++ b/core/src/main/java/com/mango/core/msg/sysv2/ErbanSysMsgV2Info.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sysv2; +package com.mango.core.msg.sysv2; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Layout.java b/core/src/main/java/com/mango/core/msg/sysv2/ErbanSysMsgV2Layout.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Layout.java rename to core/src/main/java/com/mango/core/msg/sysv2/ErbanSysMsgV2Layout.java index 20a140fd2..3f65030bf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Layout.java +++ b/core/src/main/java/com/mango/core/msg/sysv2/ErbanSysMsgV2Layout.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sysv2; +package com.mango.core.msg.sysv2; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/newbie/NewbieHelloInfo.java b/core/src/main/java/com/mango/core/newbie/NewbieHelloInfo.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/newbie/NewbieHelloInfo.java rename to core/src/main/java/com/mango/core/newbie/NewbieHelloInfo.java index a04b866e6..d623749c5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/newbie/NewbieHelloInfo.java +++ b/core/src/main/java/com/mango/core/newbie/NewbieHelloInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.newbie; +package com.mango.core.newbie; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/newbie/event/NewbieHelloDialogEvent.java b/core/src/main/java/com/mango/core/newbie/event/NewbieHelloDialogEvent.java similarity index 64% rename from core/src/main/java/com/yizhuan/xchat_android_core/newbie/event/NewbieHelloDialogEvent.java rename to core/src/main/java/com/mango/core/newbie/event/NewbieHelloDialogEvent.java index cc9bdae5c..fba2bc344 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/newbie/event/NewbieHelloDialogEvent.java +++ b/core/src/main/java/com/mango/core/newbie/event/NewbieHelloDialogEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.newbie.event; +package com.mango.core.newbie.event; -import com.yizhuan.xchat_android_core.newbie.NewbieHelloInfo; +import com.mango.core.newbie.NewbieHelloInfo; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/AllServiceGiftProtocol.java b/core/src/main/java/com/mango/core/noble/AllServiceGiftProtocol.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/AllServiceGiftProtocol.java rename to core/src/main/java/com/mango/core/noble/AllServiceGiftProtocol.java index 06f67cbeb..6c131d743 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/AllServiceGiftProtocol.java +++ b/core/src/main/java/com/mango/core/noble/AllServiceGiftProtocol.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.noble; +package com.mango.core.noble; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; +import com.mango.core.bean.BaseProtocol; /** * Created by MadisonRong on 09/04/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleConfig.java b/core/src/main/java/com/mango/core/noble/NobleConfig.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleConfig.java rename to core/src/main/java/com/mango/core/noble/NobleConfig.java index 57458b39e..6be07f083 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleConfig.java +++ b/core/src/main/java/com/mango/core/noble/NobleConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.noble; +package com.mango.core.noble; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleConfig.txt b/core/src/main/java/com/mango/core/noble/NobleConfig.txt similarity index 100% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleConfig.txt rename to core/src/main/java/com/mango/core/noble/NobleConfig.txt diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java b/core/src/main/java/com/mango/core/noble/NobleDataManager.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java rename to core/src/main/java/com/mango/core/noble/NobleDataManager.java index 4c6721f8d..4eb68f4e2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java +++ b/core/src/main/java/com/mango/core/noble/NobleDataManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.noble; +package com.mango.core.noble; import androidx.collection.LongSparseArray; import android.text.TextUtils; @@ -6,15 +6,15 @@ import android.util.Log; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.NobleResourceComponent; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.core.DemoCache; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.initial.InitialModel; +import com.mango.core.initial.NobleResourceComponent; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleInfo.java b/core/src/main/java/com/mango/core/noble/NobleInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleInfo.java rename to core/src/main/java/com/mango/core/noble/NobleInfo.java index 94e905e53..d68b23c02 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleInfo.java +++ b/core/src/main/java/com/mango/core/noble/NobleInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.noble; +package com.mango.core.noble; import android.text.TextUtils; @@ -8,7 +8,6 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import io.realm.RealmObject; import io.realm.annotations.PrimaryKey; /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleProtocol.java b/core/src/main/java/com/mango/core/noble/NobleProtocol.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleProtocol.java rename to core/src/main/java/com/mango/core/noble/NobleProtocol.java index ea684279b..6d77da176 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleProtocol.java +++ b/core/src/main/java/com/mango/core/noble/NobleProtocol.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.noble; +package com.mango.core.noble; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; +import com.mango.core.bean.BaseProtocol; /** *

贵族协议

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleResourceType.java b/core/src/main/java/com/mango/core/noble/NobleResourceType.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleResourceType.java rename to core/src/main/java/com/mango/core/noble/NobleResourceType.java index 56f1a3e42..7eb49554a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleResourceType.java +++ b/core/src/main/java/com/mango/core/noble/NobleResourceType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.noble; +package com.mango.core.noble; /** * 所有资源的类型 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleRight.java b/core/src/main/java/com/mango/core/noble/NobleRight.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleRight.java rename to core/src/main/java/com/mango/core/noble/NobleRight.java index 91e1ca8a0..fbfe60c30 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleRight.java +++ b/core/src/main/java/com/mango/core/noble/NobleRight.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.noble; +package com.mango.core.noble; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java b/core/src/main/java/com/mango/core/noble/NobleUtil.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java rename to core/src/main/java/com/mango/core/noble/NobleUtil.java index 3228e7f64..439986dd2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java +++ b/core/src/main/java/com/mango/core/noble/NobleUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.noble; +package com.mango.core.noble; import android.app.Activity; import android.content.Context; @@ -28,12 +28,12 @@ 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.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -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; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.ExtensionUtil; +import com.mango.core.utils.ImageSplitter; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.io.File; import java.io.FileInputStream; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/bean/LimitNotice.java b/core/src/main/java/com/mango/core/patriarch/bean/LimitNotice.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/patriarch/bean/LimitNotice.java rename to core/src/main/java/com/mango/core/patriarch/bean/LimitNotice.java index 92432d62e..be78fa21f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/bean/LimitNotice.java +++ b/core/src/main/java/com/mango/core/patriarch/bean/LimitNotice.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.patriarch.bean; +package com.mango.core.patriarch.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/CloseMinRoomEvent.java b/core/src/main/java/com/mango/core/patriarch/event/CloseMinRoomEvent.java similarity index 70% rename from core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/CloseMinRoomEvent.java rename to core/src/main/java/com/mango/core/patriarch/event/CloseMinRoomEvent.java index 60be427cc..645f02aca 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/CloseMinRoomEvent.java +++ b/core/src/main/java/com/mango/core/patriarch/event/CloseMinRoomEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.patriarch.event; +package com.mango.core.patriarch.event; /** * 关闭最小化房间（如果房间存在的话） diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/ImPushMsgPmLimitTimeEvent.java b/core/src/main/java/com/mango/core/patriarch/event/ImPushMsgPmLimitTimeEvent.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/ImPushMsgPmLimitTimeEvent.java rename to core/src/main/java/com/mango/core/patriarch/event/ImPushMsgPmLimitTimeEvent.java index fdfc8c811..8fb8870d9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/ImPushMsgPmLimitTimeEvent.java +++ b/core/src/main/java/com/mango/core/patriarch/event/ImPushMsgPmLimitTimeEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.patriarch.event; +package com.mango.core.patriarch.event; -import com.yizhuan.xchat_android_core.base.BaseBusEvent; +import com.mango.core.base.BaseBusEvent; /** * im推送消息 青少年模式禁止进房事件通知 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/PmDismissAllLimitDialogEvent.java b/core/src/main/java/com/mango/core/patriarch/event/PmDismissAllLimitDialogEvent.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/PmDismissAllLimitDialogEvent.java rename to core/src/main/java/com/mango/core/patriarch/event/PmDismissAllLimitDialogEvent.java index 69be68ad7..11217abbc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/PmDismissAllLimitDialogEvent.java +++ b/core/src/main/java/com/mango/core/patriarch/event/PmDismissAllLimitDialogEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.patriarch.event; +package com.mango.core.patriarch.event; /** * 因为有可能存在，多个限制时长弹窗的存在， diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/exception/PmRoomLimitException.java b/core/src/main/java/com/mango/core/patriarch/exception/PmRoomLimitException.java similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/patriarch/exception/PmRoomLimitException.java rename to core/src/main/java/com/mango/core/patriarch/exception/PmRoomLimitException.java index cc25c45e1..daf3091ac 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/exception/PmRoomLimitException.java +++ b/core/src/main/java/com/mango/core/patriarch/exception/PmRoomLimitException.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.patriarch.exception; +package com.mango.core.patriarch.exception; -import com.yizhuan.xchat_android_core.base.BaseErrorException; +import com.mango.core.base.BaseErrorException; /** * 青少年模式 限制进房/开房 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/GoldGiveModel.java b/core/src/main/java/com/mango/core/pay/GoldGiveModel.java similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/GoldGiveModel.java rename to core/src/main/java/com/mango/core/pay/GoldGiveModel.java index 589013196..d612f36b2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/GoldGiveModel.java +++ b/core/src/main/java/com/mango/core/pay/GoldGiveModel.java @@ -1,14 +1,12 @@ -package com.yizhuan.xchat_android_core.pay; +package com.mango.core.pay; -import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.pay.bean.GiveGoldResult; -import com.yizhuan.xchat_android_core.pay.bean.GiveInfo; -import com.yizhuan.xchat_android_core.pay.event.SendGoldSuccessEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.pay.bean.GiveInfo; +import com.mango.core.pay.event.SendGoldSuccessEvent; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; @@ -16,11 +14,6 @@ import java.util.ArrayList; import java.util.List; import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; -import retrofit2.http.Field; -import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; import retrofit2.http.POST; import retrofit2.http.Query; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/IGoldGiveModel.java b/core/src/main/java/com/mango/core/pay/IGoldGiveModel.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/IGoldGiveModel.java rename to core/src/main/java/com/mango/core/pay/IGoldGiveModel.java index 055a76c96..2493e686c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/IGoldGiveModel.java +++ b/core/src/main/java/com/mango/core/pay/IGoldGiveModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.pay; +package com.mango.core.pay; -import com.yizhuan.xchat_android_core.pay.bean.GiveInfo; +import com.mango.core.pay.bean.GiveInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/IPayModel.java b/core/src/main/java/com/mango/core/pay/IPayModel.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/IPayModel.java rename to core/src/main/java/com/mango/core/pay/IPayModel.java index a5891ff76..d1feffcbb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/IPayModel.java +++ b/core/src/main/java/com/mango/core/pay/IPayModel.java @@ -1,15 +1,15 @@ -package com.yizhuan.xchat_android_core.pay; +package com.mango.core.pay; import android.content.Context; import com.google.gson.JsonObject; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.ChargeListResult; -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods; -import com.yizhuan.xchat_android_core.pay.bean.NewUserChargeInfo; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.pay.bean.WxPayType; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.bean.response.result.ChargeListResult; +import com.mango.core.pay.bean.FirstChargeGoods; +import com.mango.core.pay.bean.NewUserChargeInfo; +import com.mango.core.pay.bean.WalletInfo; +import com.mango.core.pay.bean.WxPayType; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java b/core/src/main/java/com/mango/core/pay/PayModel.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java rename to core/src/main/java/com/mango/core/pay/PayModel.java index cdd2ed0b6..24f4f28a3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java +++ b/core/src/main/java/com/mango/core/pay/PayModel.java @@ -1,31 +1,31 @@ -package com.yizhuan.xchat_android_core.pay; +package com.mango.core.pay; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT; import android.content.Context; import com.alibaba.fastjson.JSONObject; import com.google.gson.JsonObject; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.ChargeListResult; -import com.yizhuan.xchat_android_core.bean.response.result.WalletInfoResult; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods; -import com.yizhuan.xchat_android_core.pay.bean.NewUserChargeInfo; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.pay.bean.WxPayType; -import com.yizhuan.xchat_android_core.pay.event.ChargeCustomNotificationEvent; -import com.yizhuan.xchat_android_core.pay.event.FirstRechargeEvent; -import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent; -import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -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.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.bean.response.result.ChargeListResult; +import com.mango.core.bean.response.result.WalletInfoResult; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.pay.bean.FirstChargeGoods; +import com.mango.core.pay.bean.NewUserChargeInfo; +import com.mango.core.pay.bean.WalletInfo; +import com.mango.core.pay.bean.WxPayType; +import com.mango.core.pay.event.ChargeCustomNotificationEvent; +import com.mango.core.pay.event.FirstRechargeEvent; +import com.mango.core.pay.event.GetWalletInfoEvent; +import com.mango.core.pay.event.UpdateWalletInfoEvent; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.NetworkUtils; +import com.mango.xchat_android_library.utils.codec.DESUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java b/core/src/main/java/com/mango/core/pay/bean/ChargeBean.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java rename to core/src/main/java/com/mango/core/pay/bean/ChargeBean.java index 127afc218..bf7c5dbda 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java +++ b/core/src/main/java/com/mango/core/pay/bean/ChargeBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.mango.core.pay.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java b/core/src/main/java/com/mango/core/pay/bean/FirstChargeGoods.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java rename to core/src/main/java/com/mango/core/pay/bean/FirstChargeGoods.java index d7da526a8..1f92420d1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java +++ b/core/src/main/java/com/mango/core/pay/bean/FirstChargeGoods.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.mango.core.pay.bean; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeReward.java b/core/src/main/java/com/mango/core/pay/bean/FirstChargeReward.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeReward.java rename to core/src/main/java/com/mango/core/pay/bean/FirstChargeReward.java index 080922746..04205d792 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeReward.java +++ b/core/src/main/java/com/mango/core/pay/bean/FirstChargeReward.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.mango.core.pay.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/GiveGoldResult.java b/core/src/main/java/com/mango/core/pay/bean/GiveGoldResult.java similarity index 72% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/GiveGoldResult.java rename to core/src/main/java/com/mango/core/pay/bean/GiveGoldResult.java index 3921e548e..38ad6ffce 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/GiveGoldResult.java +++ b/core/src/main/java/com/mango/core/pay/bean/GiveGoldResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.mango.core.pay.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/GiveInfo.java b/core/src/main/java/com/mango/core/pay/bean/GiveInfo.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/GiveInfo.java rename to core/src/main/java/com/mango/core/pay/bean/GiveInfo.java index ae49f37d6..3e574472d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/GiveInfo.java +++ b/core/src/main/java/com/mango/core/pay/bean/GiveInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.mango.core.pay.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.java b/core/src/main/java/com/mango/core/pay/bean/NewUserChargeInfo.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.java rename to core/src/main/java/com/mango/core/pay/bean/NewUserChargeInfo.java index 5dbd363a1..0271e3198 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.java +++ b/core/src/main/java/com/mango/core/pay/bean/NewUserChargeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.mango.core.pay.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WalletInfo.java b/core/src/main/java/com/mango/core/pay/bean/WalletInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WalletInfo.java rename to core/src/main/java/com/mango/core/pay/bean/WalletInfo.java index ae2083e76..0f7de14b7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WalletInfo.java +++ b/core/src/main/java/com/mango/core/pay/bean/WalletInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.mango.core.pay.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WxPayType.java b/core/src/main/java/com/mango/core/pay/bean/WxPayType.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WxPayType.java rename to core/src/main/java/com/mango/core/pay/bean/WxPayType.java index 4ff6094eb..8478fbf27 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WxPayType.java +++ b/core/src/main/java/com/mango/core/pay/bean/WxPayType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.mango.core.pay.bean; public class WxPayType { private String wxPayType; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/ChargeCustomNotificationEvent.java b/core/src/main/java/com/mango/core/pay/event/ChargeCustomNotificationEvent.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/event/ChargeCustomNotificationEvent.java rename to core/src/main/java/com/mango/core/pay/event/ChargeCustomNotificationEvent.java index ab0199263..3cbd37789 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/ChargeCustomNotificationEvent.java +++ b/core/src/main/java/com/mango/core/pay/event/ChargeCustomNotificationEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.event; +package com.mango.core.pay.event; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/FirstChargeEvent.java b/core/src/main/java/com/mango/core/pay/event/FirstChargeEvent.java similarity index 62% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/event/FirstChargeEvent.java rename to core/src/main/java/com/mango/core/pay/event/FirstChargeEvent.java index b39cc6751..eaa712a5d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/FirstChargeEvent.java +++ b/core/src/main/java/com/mango/core/pay/event/FirstChargeEvent.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.pay.event; +package com.mango.core.pay.event; -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward; +import com.mango.core.pay.bean.FirstChargeReward; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/FirstRechargeEvent.java b/core/src/main/java/com/mango/core/pay/event/FirstRechargeEvent.java similarity index 60% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/event/FirstRechargeEvent.java rename to core/src/main/java/com/mango/core/pay/event/FirstRechargeEvent.java index 6a05461ab..4a87769e2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/FirstRechargeEvent.java +++ b/core/src/main/java/com/mango/core/pay/event/FirstRechargeEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.event; +package com.mango.core.pay.event; /** * create by lvzebiao @2020/3/23 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/GetWalletInfoEvent.java b/core/src/main/java/com/mango/core/pay/event/GetWalletInfoEvent.java similarity index 61% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/event/GetWalletInfoEvent.java rename to core/src/main/java/com/mango/core/pay/event/GetWalletInfoEvent.java index acdfcf2d4..d59b60350 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/GetWalletInfoEvent.java +++ b/core/src/main/java/com/mango/core/pay/event/GetWalletInfoEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.event; +package com.mango.core.pay.event; /** * create by lvzebiao on 2018/8/29 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/NewUserChargeEvent.java b/core/src/main/java/com/mango/core/pay/event/NewUserChargeEvent.java similarity index 62% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/event/NewUserChargeEvent.java rename to core/src/main/java/com/mango/core/pay/event/NewUserChargeEvent.java index f994bb7e7..c0f96e9ef 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/NewUserChargeEvent.java +++ b/core/src/main/java/com/mango/core/pay/event/NewUserChargeEvent.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.pay.event; +package com.mango.core.pay.event; -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward; +import com.mango.core.pay.bean.FirstChargeReward; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/SendGoldSuccessEvent.java b/core/src/main/java/com/mango/core/pay/event/SendGoldSuccessEvent.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/event/SendGoldSuccessEvent.java rename to core/src/main/java/com/mango/core/pay/event/SendGoldSuccessEvent.java index 76ba38f49..3e75b72bd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/SendGoldSuccessEvent.java +++ b/core/src/main/java/com/mango/core/pay/event/SendGoldSuccessEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.pay.event; +package com.mango.core.pay.event; -import com.yizhuan.xchat_android_core.base.BaseBusEvent; +import com.mango.core.base.BaseBusEvent; /** * 赠送钻石成功的事件 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/UpdateWalletInfoEvent.java b/core/src/main/java/com/mango/core/pay/event/UpdateWalletInfoEvent.java similarity index 62% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/event/UpdateWalletInfoEvent.java rename to core/src/main/java/com/mango/core/pay/event/UpdateWalletInfoEvent.java index 29bd7017a..c0c991880 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/UpdateWalletInfoEvent.java +++ b/core/src/main/java/com/mango/core/pay/event/UpdateWalletInfoEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.event; +package com.mango.core.pay.event; /** * create by lvzebiao on 2018/8/29 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/praise/IPraiseModel.java b/core/src/main/java/com/mango/core/praise/IPraiseModel.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/praise/IPraiseModel.java rename to core/src/main/java/com/mango/core/praise/IPraiseModel.java index d2adb0f3f..8bad75cff 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/praise/IPraiseModel.java +++ b/core/src/main/java/com/mango/core/praise/IPraiseModel.java @@ -1,7 +1,6 @@ -package com.yizhuan.xchat_android_core.praise; +package com.mango.core.praise; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_library.coremanager.IBaseCore; +import com.mango.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/praise/PraiseModel.java b/core/src/main/java/com/mango/core/praise/PraiseModel.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/praise/PraiseModel.java rename to core/src/main/java/com/mango/core/praise/PraiseModel.java index 4ab944eb6..41e59da6f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/praise/PraiseModel.java +++ b/core/src/main/java/com/mango/core/praise/PraiseModel.java @@ -1,32 +1,29 @@ -package com.yizhuan.xchat_android_core.praise; +package com.mango.core.praise; import android.annotation.SuppressLint; import android.util.LongSparseArray; -import android.util.SparseArray; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.BooleanResult; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomTipAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.praise.event.IsLikedEvent; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -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_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.bean.response.result.BooleanResult; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.RoomTipAttachment; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.praise.event.IsLikedEvent; +import com.mango.core.praise.event.PraiseEvent; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; -import java.util.HashMap; - import io.reactivex.Single; import io.reactivex.SingleSource; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/IsLikedEvent.java b/core/src/main/java/com/mango/core/praise/event/IsLikedEvent.java similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/praise/event/IsLikedEvent.java rename to core/src/main/java/com/mango/core/praise/event/IsLikedEvent.java index 9621a8789..7f6e1e0be 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/IsLikedEvent.java +++ b/core/src/main/java/com/mango/core/praise/event/IsLikedEvent.java @@ -1,6 +1,4 @@ -package com.yizhuan.xchat_android_core.praise.event; - -import com.yizhuan.xchat_android_core.base.BaseBusEvent; +package com.mango.core.praise.event; /** * create by lvzebiao on 2018/9/3 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/PraiseEvent.java b/core/src/main/java/com/mango/core/praise/event/PraiseEvent.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/praise/event/PraiseEvent.java rename to core/src/main/java/com/mango/core/praise/event/PraiseEvent.java index 668373b8a..e1d4af7d2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/PraiseEvent.java +++ b/core/src/main/java/com/mango/core/praise/event/PraiseEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.praise.event; +package com.mango.core.praise.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/IRadishModel.java b/core/src/main/java/com/mango/core/radish/IRadishModel.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/IRadishModel.java rename to core/src/main/java/com/mango/core/radish/IRadishModel.java index f9b037de1..4f1de7781 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/IRadishModel.java +++ b/core/src/main/java/com/mango/core/radish/IRadishModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.radish; +package com.mango.core.radish; -import com.yizhuan.xchat_android_core.base.IModel; +import com.mango.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishModel.java b/core/src/main/java/com/mango/core/radish/RadishModel.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishModel.java rename to core/src/main/java/com/mango/core/radish/RadishModel.java index 8f3234674..7b7157aad 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishModel.java +++ b/core/src/main/java/com/mango/core/radish/RadishModel.java @@ -1,14 +1,14 @@ -package com.yizhuan.xchat_android_core.radish; +package com.mango.core.radish; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.radish.event.RadishWalletInfoUpdateEvent; -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; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.radish.event.RadishWalletInfoUpdateEvent; +import com.mango.core.user.event.LoadLoginUserInfoEvent; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/core/src/main/java/com/mango/core/radish/RadishRecordResult.java b/core/src/main/java/com/mango/core/radish/RadishRecordResult.java new file mode 100644 index 000000000..93c4b3adc --- /dev/null +++ b/core/src/main/java/com/mango/core/radish/RadishRecordResult.java @@ -0,0 +1,7 @@ +package com.mango.core.radish; + +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.bills.bean.RadishRecordListInfo; + +public class RadishRecordResult extends ServiceResult { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishWalletInfo.java b/core/src/main/java/com/mango/core/radish/RadishWalletInfo.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishWalletInfo.java rename to core/src/main/java/com/mango/core/radish/RadishWalletInfo.java index 0127e71da..8f596e77a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishWalletInfo.java +++ b/core/src/main/java/com/mango/core/radish/RadishWalletInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish; +package com.mango.core.radish; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/RadishWalletInfoUpdateEvent.java b/core/src/main/java/com/mango/core/radish/event/RadishWalletInfoUpdateEvent.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/event/RadishWalletInfoUpdateEvent.java rename to core/src/main/java/com/mango/core/radish/event/RadishWalletInfoUpdateEvent.java index 4305fafba..8c773f6c1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/RadishWalletInfoUpdateEvent.java +++ b/core/src/main/java/com/mango/core/radish/event/RadishWalletInfoUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.event; +package com.mango.core.radish.event; /** * 萝卜钱包变更 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/ReceivePrizeEvent.java b/core/src/main/java/com/mango/core/radish/event/ReceivePrizeEvent.java similarity index 65% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/event/ReceivePrizeEvent.java rename to core/src/main/java/com/mango/core/radish/event/ReceivePrizeEvent.java index f8e6da40d..a870bcb7e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/ReceivePrizeEvent.java +++ b/core/src/main/java/com/mango/core/radish/event/ReceivePrizeEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.event; +package com.mango.core.radish.event; /** * 领取奖励事件 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/SignInSuccessEvent.java b/core/src/main/java/com/mango/core/radish/event/SignInSuccessEvent.java similarity index 63% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/event/SignInSuccessEvent.java rename to core/src/main/java/com/mango/core/radish/event/SignInSuccessEvent.java index 29120a4a5..684da3b04 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/SignInSuccessEvent.java +++ b/core/src/main/java/com/mango/core/radish/event/SignInSuccessEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.event; +package com.mango.core.radish.event; /** * 签到成功 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/ISignInModel.java b/core/src/main/java/com/mango/core/radish/signin/ISignInModel.java similarity index 59% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/ISignInModel.java rename to core/src/main/java/com/mango/core/radish/signin/ISignInModel.java index f6f7af134..6b5dcf072 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/ISignInModel.java +++ b/core/src/main/java/com/mango/core/radish/signin/ISignInModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.radish.signin; +package com.mango.core.radish.signin; -import com.yizhuan.xchat_android_core.radish.signin.bean.DrawNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReplenishSignInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDrawInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignInfo; +import com.mango.core.radish.signin.bean.DrawNoticeInfo; +import com.mango.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.mango.core.radish.signin.bean.ReplenishSignInfo; +import com.mango.core.radish.signin.bean.RewardNoticeInfo; +import com.mango.core.radish.signin.bean.SignDetailInfo; +import com.mango.core.radish.signin.bean.SignDrawInfo; +import com.mango.core.radish.signin.bean.SignInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/SignInModel.java b/core/src/main/java/com/mango/core/radish/signin/SignInModel.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/SignInModel.java rename to core/src/main/java/com/mango/core/radish/signin/SignInModel.java index 9b240a263..ad9891060 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/SignInModel.java +++ b/core/src/main/java/com/mango/core/radish/signin/SignInModel.java @@ -1,23 +1,23 @@ -package com.yizhuan.xchat_android_core.radish.signin; +package com.mango.core.radish.signin; import android.util.Log; -import com.yizhuan.xchat_android_core.BuildConfig; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.radish.event.SignInSuccessEvent; -import com.yizhuan.xchat_android_core.radish.signin.bean.DrawNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReplenishSignInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDrawInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.BuildConfig; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.radish.event.SignInSuccessEvent; +import com.mango.core.radish.signin.bean.DrawNoticeInfo; +import com.mango.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.mango.core.radish.signin.bean.ReplenishSignInfo; +import com.mango.core.radish.signin.bean.RewardNoticeInfo; +import com.mango.core.radish.signin.bean.SignDetailInfo; +import com.mango.core.radish.signin.bean.SignDrawInfo; +import com.mango.core.radish.signin.bean.SignInfo; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; @@ -27,7 +27,6 @@ import javax.annotation.Nullable; import io.reactivex.Single; import io.reactivex.SingleSource; -import io.reactivex.functions.Consumer; import io.reactivex.functions.Function; import retrofit2.http.GET; import retrofit2.http.POST; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/DrawNoticeInfo.java b/core/src/main/java/com/mango/core/radish/signin/bean/DrawNoticeInfo.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/DrawNoticeInfo.java rename to core/src/main/java/com/mango/core/radish/signin/bean/DrawNoticeInfo.java index 7564a835e..5b3421e54 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/DrawNoticeInfo.java +++ b/core/src/main/java/com/mango/core/radish/signin/bean/DrawNoticeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.mango.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ImNotice.java b/core/src/main/java/com/mango/core/radish/signin/bean/ImNotice.java similarity index 58% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ImNotice.java rename to core/src/main/java/com/mango/core/radish/signin/bean/ImNotice.java index 918814f5c..ea5b00080 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ImNotice.java +++ b/core/src/main/java/com/mango/core/radish/signin/bean/ImNotice.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.mango.core.radish.signin.bean; import java.io.Serializable; import lombok.Data; /** - * 提醒，{@link com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment} + * 提醒，{@link com.mango.core.im.custom.bean.OpenSignInAttachment} * create by lvzebiao @2019/3/20 */ @Data diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ReceiveTotalRewardInfo.java b/core/src/main/java/com/mango/core/radish/signin/bean/ReceiveTotalRewardInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ReceiveTotalRewardInfo.java rename to core/src/main/java/com/mango/core/radish/signin/bean/ReceiveTotalRewardInfo.java index 119f63ddf..7a9b5c787 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ReceiveTotalRewardInfo.java +++ b/core/src/main/java/com/mango/core/radish/signin/bean/ReceiveTotalRewardInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.mango.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ReplenishSignInfo.java b/core/src/main/java/com/mango/core/radish/signin/bean/ReplenishSignInfo.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ReplenishSignInfo.java rename to core/src/main/java/com/mango/core/radish/signin/bean/ReplenishSignInfo.java index 49a6ba86a..b1b0c63cb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ReplenishSignInfo.java +++ b/core/src/main/java/com/mango/core/radish/signin/bean/ReplenishSignInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.mango.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/Reward.java b/core/src/main/java/com/mango/core/radish/signin/bean/Reward.java similarity index 64% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/Reward.java rename to core/src/main/java/com/mango/core/radish/signin/bean/Reward.java index 0e5b4f73a..559918ac4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/Reward.java +++ b/core/src/main/java/com/mango/core/radish/signin/bean/Reward.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.mango.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/RewardNoticeInfo.java b/core/src/main/java/com/mango/core/radish/signin/bean/RewardNoticeInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/RewardNoticeInfo.java rename to core/src/main/java/com/mango/core/radish/signin/bean/RewardNoticeInfo.java index 9a8bf17de..dd81b78cf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/RewardNoticeInfo.java +++ b/core/src/main/java/com/mango/core/radish/signin/bean/RewardNoticeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.mango.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/RsPlatformType.java b/core/src/main/java/com/mango/core/radish/signin/bean/RsPlatformType.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/RsPlatformType.java rename to core/src/main/java/com/mango/core/radish/signin/bean/RsPlatformType.java index e46d2263b..e6155ba17 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/RsPlatformType.java +++ b/core/src/main/java/com/mango/core/radish/signin/bean/RsPlatformType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.mango.core.radish.signin.bean; import cn.sharesdk.framework.Platform; import lombok.AllArgsConstructor; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDetailInfo.java b/core/src/main/java/com/mango/core/radish/signin/bean/SignDetailInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDetailInfo.java rename to core/src/main/java/com/mango/core/radish/signin/bean/SignDetailInfo.java index 91b2d9b5d..397e0d1ad 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDetailInfo.java +++ b/core/src/main/java/com/mango/core/radish/signin/bean/SignDetailInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.mango.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDrawInfo.java b/core/src/main/java/com/mango/core/radish/signin/bean/SignDrawInfo.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDrawInfo.java rename to core/src/main/java/com/mango/core/radish/signin/bean/SignDrawInfo.java index ae4487e41..92fda5fb9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDrawInfo.java +++ b/core/src/main/java/com/mango/core/radish/signin/bean/SignDrawInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.mango.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignInfo.java b/core/src/main/java/com/mango/core/radish/signin/bean/SignInfo.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignInfo.java rename to core/src/main/java/com/mango/core/radish/signin/bean/SignInfo.java index 76ab9af5c..872a20716 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignInfo.java +++ b/core/src/main/java/com/mango/core/radish/signin/bean/SignInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.mango.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/ITaskModel.java b/core/src/main/java/com/mango/core/radish/task/ITaskModel.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/task/ITaskModel.java rename to core/src/main/java/com/mango/core/radish/task/ITaskModel.java index 1d757869a..d75fa5301 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/ITaskModel.java +++ b/core/src/main/java/com/mango/core/radish/task/ITaskModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.radish.task; +package com.mango.core.radish.task; -import com.yizhuan.xchat_android_core.radish.task.bean.CheckNewUserTaskInfo; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; +import com.mango.core.radish.task.bean.CheckNewUserTaskInfo; +import com.mango.core.radish.task.bean.TaskInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/TaskModel.java b/core/src/main/java/com/mango/core/radish/task/TaskModel.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/task/TaskModel.java rename to core/src/main/java/com/mango/core/radish/task/TaskModel.java index 94ae2e45d..95a408627 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/TaskModel.java +++ b/core/src/main/java/com/mango/core/radish/task/TaskModel.java @@ -1,16 +1,16 @@ -package com.yizhuan.xchat_android_core.radish.task; +package com.mango.core.radish.task; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.radish.RadishModel; -import com.yizhuan.xchat_android_core.radish.event.ReceivePrizeEvent; -import com.yizhuan.xchat_android_core.radish.task.bean.CheckNewUserTaskInfo; -import com.yizhuan.xchat_android_core.radish.task.bean.PrizeType; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.radish.RadishModel; +import com.mango.core.radish.event.ReceivePrizeEvent; +import com.mango.core.radish.task.bean.CheckNewUserTaskInfo; +import com.mango.core.radish.task.bean.PrizeType; +import com.mango.core.radish.task.bean.TaskInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/CheckNewUserTaskInfo.java b/core/src/main/java/com/mango/core/radish/task/bean/CheckNewUserTaskInfo.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/CheckNewUserTaskInfo.java rename to core/src/main/java/com/mango/core/radish/task/bean/CheckNewUserTaskInfo.java index 032f72ed5..23c5f3f93 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/CheckNewUserTaskInfo.java +++ b/core/src/main/java/com/mango/core/radish/task/bean/CheckNewUserTaskInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.task.bean; +package com.mango.core.radish.task.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeAnim.java b/core/src/main/java/com/mango/core/radish/task/bean/PrizeAnim.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeAnim.java rename to core/src/main/java/com/mango/core/radish/task/bean/PrizeAnim.java index 958956dfe..2af8a7083 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeAnim.java +++ b/core/src/main/java/com/mango/core/radish/task/bean/PrizeAnim.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.radish.task.bean; +package com.mango.core.radish.task.bean; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDrawInfo; +import com.mango.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.mango.core.radish.signin.bean.SignDrawInfo; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeType.java b/core/src/main/java/com/mango/core/radish/task/bean/PrizeType.java similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeType.java rename to core/src/main/java/com/mango/core/radish/task/bean/PrizeType.java index 405483ce3..7c513709a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeType.java +++ b/core/src/main/java/com/mango/core/radish/task/bean/PrizeType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.task.bean; +package com.mango.core.radish.task.bean; /** * create by lvzebiao @2019/3/29 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/TaskInfo.java b/core/src/main/java/com/mango/core/radish/task/bean/TaskInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/TaskInfo.java rename to core/src/main/java/com/mango/core/radish/task/bean/TaskInfo.java index 7de128ffa..acbf2da01 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/TaskInfo.java +++ b/core/src/main/java/com/mango/core/radish/task/bean/TaskInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.task.bean; +package com.mango.core.radish.task.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/realm/IRealmCore.java b/core/src/main/java/com/mango/core/realm/IRealmCore.java similarity index 56% rename from core/src/main/java/com/yizhuan/xchat_android_core/realm/IRealmCore.java rename to core/src/main/java/com/mango/core/realm/IRealmCore.java index 4126b114f..1f2db5e14 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/realm/IRealmCore.java +++ b/core/src/main/java/com/mango/core/realm/IRealmCore.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.realm; +package com.mango.core.realm; -import com.yizhuan.xchat_android_library.coremanager.IBaseCore; +import com.mango.xchat_android_library.coremanager.IBaseCore; import io.realm.Realm; diff --git a/core/src/main/java/com/mango/core/recall/IRecallModel.java b/core/src/main/java/com/mango/core/recall/IRecallModel.java new file mode 100644 index 000000000..e5d8397c5 --- /dev/null +++ b/core/src/main/java/com/mango/core/recall/IRecallModel.java @@ -0,0 +1,14 @@ +package com.mango.core.recall; + +import com.mango.core.base.IModel; +import com.mango.core.recall.bean.CheckLostUserInfo; + +import io.reactivex.Single; + +public interface IRecallModel extends IModel { + + // 查询是否是回归状态 + Single checkLostUser(long uid); + // 接收回归礼物 + void goBack(String uid, String inviteCode); +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/recall/RecallModel.java b/core/src/main/java/com/mango/core/recall/RecallModel.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/recall/RecallModel.java rename to core/src/main/java/com/mango/core/recall/RecallModel.java index a4a9ec089..80a41ba98 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/RecallModel.java +++ b/core/src/main/java/com/mango/core/recall/RecallModel.java @@ -1,14 +1,14 @@ -package com.yizhuan.xchat_android_core.recall; +package com.mango.core.recall; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.CheckLostUserResult; -import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo; -import com.yizhuan.xchat_android_core.recall.bean.GoBackInfo; -import com.yizhuan.xchat_android_core.recall.event.CheckLostUserEvent; -import com.yizhuan.xchat_android_core.recall.event.GoBackEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.bean.response.result.CheckLostUserResult; +import com.mango.core.recall.bean.CheckLostUserInfo; +import com.mango.core.recall.bean.GoBackInfo; +import com.mango.core.recall.event.CheckLostUserEvent; +import com.mango.core.recall.event.GoBackEvent; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/recall/bean/CheckLostUserInfo.java b/core/src/main/java/com/mango/core/recall/bean/CheckLostUserInfo.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/recall/bean/CheckLostUserInfo.java rename to core/src/main/java/com/mango/core/recall/bean/CheckLostUserInfo.java index e084ffbcf..63bda8591 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/bean/CheckLostUserInfo.java +++ b/core/src/main/java/com/mango/core/recall/bean/CheckLostUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.recall.bean; +package com.mango.core.recall.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/recall/bean/GoBackInfo.java b/core/src/main/java/com/mango/core/recall/bean/GoBackInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/recall/bean/GoBackInfo.java rename to core/src/main/java/com/mango/core/recall/bean/GoBackInfo.java index fb290d36f..3477f5f17 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/bean/GoBackInfo.java +++ b/core/src/main/java/com/mango/core/recall/bean/GoBackInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.recall.bean; +package com.mango.core.recall.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/recall/event/CheckLostUserEvent.java b/core/src/main/java/com/mango/core/recall/event/CheckLostUserEvent.java similarity index 56% rename from core/src/main/java/com/yizhuan/xchat_android_core/recall/event/CheckLostUserEvent.java rename to core/src/main/java/com/mango/core/recall/event/CheckLostUserEvent.java index fbd0a411b..5248720f9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/event/CheckLostUserEvent.java +++ b/core/src/main/java/com/mango/core/recall/event/CheckLostUserEvent.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.recall.event; +package com.mango.core.recall.event; -import com.yizhuan.xchat_android_core.base.BaseDataEvent; -import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo; +import com.mango.core.base.BaseDataEvent; +import com.mango.core.recall.bean.CheckLostUserInfo; public class CheckLostUserEvent extends BaseDataEvent { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/recall/event/GoBackEvent.java b/core/src/main/java/com/mango/core/recall/event/GoBackEvent.java similarity index 55% rename from core/src/main/java/com/yizhuan/xchat_android_core/recall/event/GoBackEvent.java rename to core/src/main/java/com/mango/core/recall/event/GoBackEvent.java index c1658fc36..5b01920c0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/event/GoBackEvent.java +++ b/core/src/main/java/com/mango/core/recall/event/GoBackEvent.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.recall.event; +package com.mango.core.recall.event; -import com.yizhuan.xchat_android_core.base.BaseDataEvent; -import com.yizhuan.xchat_android_core.recall.bean.GoBackInfo; +import com.mango.core.base.BaseDataEvent; +import com.mango.core.recall.bean.GoBackInfo; public class GoBackEvent extends BaseDataEvent { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/IRedPacketModel.java b/core/src/main/java/com/mango/core/redPacket/IRedPacketModel.java similarity index 55% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/IRedPacketModel.java rename to core/src/main/java/com/mango/core/redPacket/IRedPacketModel.java index 60ae45f87..c8a23cf9e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/IRedPacketModel.java +++ b/core/src/main/java/com/mango/core/redPacket/IRedPacketModel.java @@ -1,12 +1,11 @@ -package com.yizhuan.xchat_android_core.redPacket; +package com.mango.core.redPacket; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.redPacket.bean.ActionDialogInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.RedDrawListInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedListInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedSucceedInfo; -import com.yizhuan.xchat_android_library.coremanager.IBaseCore; +import com.mango.core.base.IModel; +import com.mango.core.redPacket.bean.ActionDialogInfo; +import com.mango.core.redPacket.bean.RedDrawListInfo; +import com.mango.core.redPacket.bean.RedPacketInfo; +import com.mango.core.redPacket.bean.WithdrawRedListInfo; +import com.mango.core.redPacket.bean.WithdrawRedSucceedInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/RedPacketModel.java b/core/src/main/java/com/mango/core/redPacket/RedPacketModel.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/RedPacketModel.java rename to core/src/main/java/com/mango/core/redPacket/RedPacketModel.java index 28f2e662f..0290acf4f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/RedPacketModel.java +++ b/core/src/main/java/com/mango/core/redPacket/RedPacketModel.java @@ -1,20 +1,20 @@ -package com.yizhuan.xchat_android_core.redPacket; +package com.mango.core.redPacket; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.result.ActionDialogResult; -import com.yizhuan.xchat_android_core.bean.response.result.RedDrawListInfoResult; -import com.yizhuan.xchat_android_core.bean.response.result.RedPacketResult; -import com.yizhuan.xchat_android_core.bean.response.result.WithdrawRedListResult; -import com.yizhuan.xchat_android_core.bean.response.result.WithdrawRedSucceedResult; -import com.yizhuan.xchat_android_core.redPacket.bean.ActionDialogInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.RedDrawListInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedListInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedSucceedInfo; -import com.yizhuan.xchat_android_core.redPacket.event.GetRedInfoEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.result.ActionDialogResult; +import com.mango.core.bean.response.result.RedDrawListInfoResult; +import com.mango.core.bean.response.result.RedPacketResult; +import com.mango.core.bean.response.result.WithdrawRedListResult; +import com.mango.core.bean.response.result.WithdrawRedSucceedResult; +import com.mango.core.redPacket.bean.ActionDialogInfo; +import com.mango.core.redPacket.bean.RedDrawListInfo; +import com.mango.core.redPacket.bean.RedPacketInfo; +import com.mango.core.redPacket.bean.WithdrawRedListInfo; +import com.mango.core.redPacket.bean.WithdrawRedSucceedInfo; +import com.mango.core.redPacket.event.GetRedInfoEvent; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/ActionDialogInfo.java b/core/src/main/java/com/mango/core/redPacket/bean/ActionDialogInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/ActionDialogInfo.java rename to core/src/main/java/com/mango/core/redPacket/bean/ActionDialogInfo.java index 16be63b9b..61ed4588d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/ActionDialogInfo.java +++ b/core/src/main/java/com/mango/core/redPacket/bean/ActionDialogInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redPacket.bean; +package com.mango.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedDrawListInfo.java b/core/src/main/java/com/mango/core/redPacket/bean/RedDrawListInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedDrawListInfo.java rename to core/src/main/java/com/mango/core/redPacket/bean/RedDrawListInfo.java index 31abd4168..5ecb6152f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedDrawListInfo.java +++ b/core/src/main/java/com/mango/core/redPacket/bean/RedDrawListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redPacket.bean; +package com.mango.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedPacketInfo.java b/core/src/main/java/com/mango/core/redPacket/bean/RedPacketInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedPacketInfo.java rename to core/src/main/java/com/mango/core/redPacket/bean/RedPacketInfo.java index 986cda537..bd69d5c12 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedPacketInfo.java +++ b/core/src/main/java/com/mango/core/redPacket/bean/RedPacketInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redPacket.bean; +package com.mango.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedPacketInfoV2.java b/core/src/main/java/com/mango/core/redPacket/bean/RedPacketInfoV2.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedPacketInfoV2.java rename to core/src/main/java/com/mango/core/redPacket/bean/RedPacketInfoV2.java index cfdf80675..34b2e96dd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedPacketInfoV2.java +++ b/core/src/main/java/com/mango/core/redPacket/bean/RedPacketInfoV2.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redPacket.bean; +package com.mango.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/ShareRedBagInfo.java b/core/src/main/java/com/mango/core/redPacket/bean/ShareRedBagInfo.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/ShareRedBagInfo.java rename to core/src/main/java/com/mango/core/redPacket/bean/ShareRedBagInfo.java index 52238b9b7..703f2b0ef 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/ShareRedBagInfo.java +++ b/core/src/main/java/com/mango/core/redPacket/bean/ShareRedBagInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redPacket.bean; +package com.mango.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/WithdrawRedListInfo.java b/core/src/main/java/com/mango/core/redPacket/bean/WithdrawRedListInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/WithdrawRedListInfo.java rename to core/src/main/java/com/mango/core/redPacket/bean/WithdrawRedListInfo.java index 5e0de9721..cc94d99b8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/WithdrawRedListInfo.java +++ b/core/src/main/java/com/mango/core/redPacket/bean/WithdrawRedListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redPacket.bean; +package com.mango.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/WithdrawRedSucceedInfo.java b/core/src/main/java/com/mango/core/redPacket/bean/WithdrawRedSucceedInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/WithdrawRedSucceedInfo.java rename to core/src/main/java/com/mango/core/redPacket/bean/WithdrawRedSucceedInfo.java index 563bfd2e1..56fa6e74d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/WithdrawRedSucceedInfo.java +++ b/core/src/main/java/com/mango/core/redPacket/bean/WithdrawRedSucceedInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redPacket.bean; +package com.mango.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/event/GetRedInfoEvent.java b/core/src/main/java/com/mango/core/redPacket/event/GetRedInfoEvent.java similarity index 59% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/event/GetRedInfoEvent.java rename to core/src/main/java/com/mango/core/redPacket/event/GetRedInfoEvent.java index f96c8e644..80b0cfebc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/event/GetRedInfoEvent.java +++ b/core/src/main/java/com/mango/core/redPacket/event/GetRedInfoEvent.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.redPacket.event; +package com.mango.core.redPacket.event; -import com.yizhuan.xchat_android_core.base.BaseDataEvent; -import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfo; +import com.mango.core.base.BaseDataEvent; +import com.mango.core.redPacket.bean.RedPacketInfo; /** * create by lvzebiao on 2018/9/5 diff --git a/core/src/main/java/com/mango/core/redpackage/RedEnvelopeGiftItemVO.kt b/core/src/main/java/com/mango/core/redpackage/RedEnvelopeGiftItemVO.kt new file mode 100644 index 000000000..e429a3f33 --- /dev/null +++ b/core/src/main/java/com/mango/core/redpackage/RedEnvelopeGiftItemVO.kt @@ -0,0 +1,9 @@ +package com.mango.core.redpackage + +import com.mango.core.gift.bean.GiftInfo + + +data class RedEnvelopeGiftItemVO( + var giftNum: Int = 0, + var giftVo: GiftInfo? = null +) \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeItemVO.kt b/core/src/main/java/com/mango/core/redpackage/RedEnvelopeItemVO.kt similarity index 64% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeItemVO.kt rename to core/src/main/java/com/mango/core/redpackage/RedEnvelopeItemVO.kt index 9a2ff53fa..87103f37f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeItemVO.kt +++ b/core/src/main/java/com/mango/core/redpackage/RedEnvelopeItemVO.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.mango.core.redpackage -import com.yizhuan.xchat_android_core.community.UserVo +import com.mango.core.community.UserVo class RedEnvelopeItemVO( diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeRoomMsg.kt b/core/src/main/java/com/mango/core/redpackage/RedEnvelopeRoomMsg.kt similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeRoomMsg.kt rename to core/src/main/java/com/mango/core/redpackage/RedEnvelopeRoomMsg.kt index 13ec30be7..70e018a8f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeRoomMsg.kt +++ b/core/src/main/java/com/mango/core/redpackage/RedEnvelopeRoomMsg.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.mango.core.redpackage import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeState.kt b/core/src/main/java/com/mango/core/redpackage/RedEnvelopeState.kt similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeState.kt rename to core/src/main/java/com/mango/core/redpackage/RedEnvelopeState.kt index fa64a1fab..078b64c8f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeState.kt +++ b/core/src/main/java/com/mango/core/redpackage/RedEnvelopeState.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.mango.core.redpackage /** * 红包状态 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeVO.kt b/core/src/main/java/com/mango/core/redpackage/RedEnvelopeVO.kt similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeVO.kt rename to core/src/main/java/com/mango/core/redpackage/RedEnvelopeVO.kt index e0f6ba12c..4fd6dc64f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeVO.kt +++ b/core/src/main/java/com/mango/core/redpackage/RedEnvelopeVO.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.mango.core.redpackage -import com.yizhuan.xchat_android_core.community.UserVo +import com.mango.core.community.UserVo data class RedEnvelopeVO( diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageInfo.kt b/core/src/main/java/com/mango/core/redpackage/RedPackageInfo.kt similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageInfo.kt rename to core/src/main/java/com/mango/core/redpackage/RedPackageInfo.kt index c087d342f..508859f34 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageInfo.kt +++ b/core/src/main/java/com/mango/core/redpackage/RedPackageInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.mango.core.redpackage data class RedPackageInfo( diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageModel.kt b/core/src/main/java/com/mango/core/redpackage/RedPackageModel.kt similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageModel.kt rename to core/src/main/java/com/mango/core/redpackage/RedPackageModel.kt index bbaba5f67..7a61a541a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageModel.kt +++ b/core/src/main/java/com/mango/core/redpackage/RedPackageModel.kt @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.mango.core.redpackage -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.utils.net.handleBeanData -import com.yizhuan.xchat_android_core.utils.net.handleStringData -import com.yizhuan.xchat_android_core.utils.net.io2main -import com.yizhuan.xchat_android_library.net.rxnet.RxNet +import com.mango.core.bean.response.ServiceResult +import com.mango.core.utils.net.handleBeanData +import com.mango.core.utils.net.handleStringData +import com.mango.core.utils.net.io2main +import com.mango.xchat_android_library.net.rxnet.RxNet import io.reactivex.Observable import io.reactivex.Single import retrofit2.http.* diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageNotifyInfo.kt b/core/src/main/java/com/mango/core/redpackage/RedPackageNotifyInfo.kt similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageNotifyInfo.kt rename to core/src/main/java/com/mango/core/redpackage/RedPackageNotifyInfo.kt index 7ce2d7a4b..778d6ca96 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageNotifyInfo.kt +++ b/core/src/main/java/com/mango/core/redpackage/RedPackageNotifyInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.mango.core.redpackage import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageType.kt b/core/src/main/java/com/mango/core/redpackage/RedPackageType.kt similarity index 66% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageType.kt rename to core/src/main/java/com/mango/core/redpackage/RedPackageType.kt index 3b6702e51..a702ed28c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageType.kt +++ b/core/src/main/java/com/mango/core/redpackage/RedPackageType.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.mango.core.redpackage const val ROOM_DIAMOND = 1 const val ROOM_GIFT = 3 diff --git a/core/src/main/java/com/mango/core/relation/cp/CpBindUnbindEvent.java b/core/src/main/java/com/mango/core/relation/cp/CpBindUnbindEvent.java new file mode 100644 index 000000000..baa2bb3ae --- /dev/null +++ b/core/src/main/java/com/mango/core/relation/cp/CpBindUnbindEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.relation.cp; + +public class CpBindUnbindEvent { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteDetailEntity.kt b/core/src/main/java/com/mango/core/relation/cp/CpInviteDetailEntity.kt similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteDetailEntity.kt rename to core/src/main/java/com/mango/core/relation/cp/CpInviteDetailEntity.kt index 2f1cf8625..500629c41 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteDetailEntity.kt +++ b/core/src/main/java/com/mango/core/relation/cp/CpInviteDetailEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.mango.core.relation.cp data class CpInviteDetailEntity( val acceptAvatar: String? = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteInfo.kt b/core/src/main/java/com/mango/core/relation/cp/CpInviteInfo.kt similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteInfo.kt rename to core/src/main/java/com/mango/core/relation/cp/CpInviteInfo.kt index 112799cb6..8adcbcec0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteInfo.kt +++ b/core/src/main/java/com/mango/core/relation/cp/CpInviteInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.mango.core.relation.cp data class CpInviteMessage( val msg: String = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInvitePageEntity.kt b/core/src/main/java/com/mango/core/relation/cp/CpInvitePageEntity.kt similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInvitePageEntity.kt rename to core/src/main/java/com/mango/core/relation/cp/CpInvitePageEntity.kt index 8f8f85b9f..0e7537c32 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInvitePageEntity.kt +++ b/core/src/main/java/com/mango/core/relation/cp/CpInvitePageEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.mango.core.relation.cp /** * 邀请CP弹窗信息 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpMpApplyListEntity.kt b/core/src/main/java/com/mango/core/relation/cp/CpMpApplyListEntity.kt similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpMpApplyListEntity.kt rename to core/src/main/java/com/mango/core/relation/cp/CpMpApplyListEntity.kt index c00cc895d..115394cc1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpMpApplyListEntity.kt +++ b/core/src/main/java/com/mango/core/relation/cp/CpMpApplyListEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.mango.core.relation.cp /** * diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpRelation.kt b/core/src/main/java/com/mango/core/relation/cp/CpRelation.kt similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpRelation.kt rename to core/src/main/java/com/mango/core/relation/cp/CpRelation.kt index ee1c9e606..c27141dd8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpRelation.kt +++ b/core/src/main/java/com/mango/core/relation/cp/CpRelation.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.mango.core.relation.cp data class CpRelation( /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpTaskEntity.kt b/core/src/main/java/com/mango/core/relation/cp/CpTaskEntity.kt similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpTaskEntity.kt rename to core/src/main/java/com/mango/core/relation/cp/CpTaskEntity.kt index 4e4a00e1d..4869d849b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpTaskEntity.kt +++ b/core/src/main/java/com/mango/core/relation/cp/CpTaskEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.mango.core.relation.cp data class CpTaskEntity( val avatar: String = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpLevelMpEntity.kt b/core/src/main/java/com/mango/core/relation/cp/UserCpLevelMpEntity.kt similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpLevelMpEntity.kt rename to core/src/main/java/com/mango/core/relation/cp/UserCpLevelMpEntity.kt index 6b363b5f8..88c32a5b6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpLevelMpEntity.kt +++ b/core/src/main/java/com/mango/core/relation/cp/UserCpLevelMpEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.mango.core.relation.cp data class UserCpLevelMpRootEntity( val haveCp: Boolean = false, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpListEntity.kt b/core/src/main/java/com/mango/core/relation/cp/UserCpListEntity.kt similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpListEntity.kt rename to core/src/main/java/com/mango/core/relation/cp/UserCpListEntity.kt index 039411d7e..3b94b104c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpListEntity.kt +++ b/core/src/main/java/com/mango/core/relation/cp/UserCpListEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.mango.core.relation.cp data class UserCpListEntity( val acceptUid: Long = 0, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/IRoomCoreClient.java b/core/src/main/java/com/mango/core/room/IRoomCoreClient.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/IRoomCoreClient.java rename to core/src/main/java/com/mango/core/room/IRoomCoreClient.java index d0a5a448f..3792959c4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/IRoomCoreClient.java +++ b/core/src/main/java/com/mango/core/room/IRoomCoreClient.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.room; +package com.mango.core.room; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.room.queue.bean.RoomConsumeInfo; -import com.yizhuan.xchat_android_library.coremanager.ICoreClient; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.SearchRoomInfo; +import com.mango.core.room.queue.bean.RoomConsumeInfo; +import com.mango.xchat_android_library.coremanager.ICoreClient; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/activitytimer/ActivityTimerEvent.java b/core/src/main/java/com/mango/core/room/activitytimer/ActivityTimerEvent.java similarity index 61% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/activitytimer/ActivityTimerEvent.java rename to core/src/main/java/com/mango/core/room/activitytimer/ActivityTimerEvent.java index 5a20d1e1c..d8cd2755f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/activitytimer/ActivityTimerEvent.java +++ b/core/src/main/java/com/mango/core/room/activitytimer/ActivityTimerEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.activitytimer; +package com.mango.core.room.activitytimer; -import com.yizhuan.xchat_android_core.base.BaseBusEvent; +import com.mango.core.base.BaseBusEvent; /** * create by lvzebiao @2020/2/24 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/activitytimer/TimerBean.java b/core/src/main/java/com/mango/core/room/activitytimer/TimerBean.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/activitytimer/TimerBean.java rename to core/src/main/java/com/mango/core/room/activitytimer/TimerBean.java index 1b40b8c26..30787b54e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/activitytimer/TimerBean.java +++ b/core/src/main/java/com/mango/core/room/activitytimer/TimerBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.activitytimer; +package com.mango.core.room.activitytimer; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/RoomPKModel.kt b/core/src/main/java/com/mango/core/room/anotherroompk/RoomPKModel.kt similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/RoomPKModel.kt rename to core/src/main/java/com/mango/core/room/anotherroompk/RoomPKModel.kt index 00f20ccc0..27a9e2ba3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/RoomPKModel.kt +++ b/core/src/main/java/com/mango/core/room/anotherroompk/RoomPKModel.kt @@ -1,11 +1,10 @@ -package com.yizhuan.xchat_android_core.room.anotherroompk +package com.mango.core.room.anotherroompk -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.utils.net.RxHelper -import com.yizhuan.xchat_android_library.net.rxnet.RxNet +import com.mango.core.bean.response.ServiceResult +import com.mango.core.im.custom.bean.RoomPkBean +import com.mango.core.utils.net.RxHelper +import com.mango.xchat_android_library.net.rxnet.RxNet import io.reactivex.Single -import lombok.Getter import retrofit2.http.* object RoomPKModel { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowGiftDialogEvent.java b/core/src/main/java/com/mango/core/room/anotherroompk/ShowGiftDialogEvent.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowGiftDialogEvent.java rename to core/src/main/java/com/mango/core/room/anotherroompk/ShowGiftDialogEvent.java index 6975d1848..4cb6b65be 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowGiftDialogEvent.java +++ b/core/src/main/java/com/mango/core/room/anotherroompk/ShowGiftDialogEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.anotherroompk; +package com.mango.core.room.anotherroompk; public class ShowGiftDialogEvent { private int giftId; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowUserInfoDialogEvent.java b/core/src/main/java/com/mango/core/room/anotherroompk/ShowUserInfoDialogEvent.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowUserInfoDialogEvent.java rename to core/src/main/java/com/mango/core/room/anotherroompk/ShowUserInfoDialogEvent.java index d4f40cabb..fb666fad3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowUserInfoDialogEvent.java +++ b/core/src/main/java/com/mango/core/room/anotherroompk/ShowUserInfoDialogEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.anotherroompk; +package com.mango.core.room.anotherroompk; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SimpleRoomInfo.kt b/core/src/main/java/com/mango/core/room/anotherroompk/SimpleRoomInfo.kt similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SimpleRoomInfo.kt rename to core/src/main/java/com/mango/core/room/anotherroompk/SimpleRoomInfo.kt index 8c6a5463c..8b174de83 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SimpleRoomInfo.kt +++ b/core/src/main/java/com/mango/core/room/anotherroompk/SimpleRoomInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.anotherroompk +package com.mango.core.room.anotherroompk import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SingleRoomPKModel.kt b/core/src/main/java/com/mango/core/room/anotherroompk/SingleRoomPKModel.kt similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SingleRoomPKModel.kt rename to core/src/main/java/com/mango/core/room/anotherroompk/SingleRoomPKModel.kt index 0dbdac98c..b9741e768 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SingleRoomPKModel.kt +++ b/core/src/main/java/com/mango/core/room/anotherroompk/SingleRoomPKModel.kt @@ -1,12 +1,10 @@ -package com.yizhuan.xchat_android_core.room.anotherroompk +package com.mango.core.room.anotherroompk -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.net.RxHelper -import com.yizhuan.xchat_android_library.net.rxnet.RxNet +import com.mango.core.bean.response.ServiceResult +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.utils.net.RxHelper +import com.mango.xchat_android_library.net.rxnet.RxNet import io.reactivex.Single -import lombok.Getter import retrofit2.http.* object SingleRoomPKModel { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCore.java b/core/src/main/java/com/mango/core/room/auction/IAuctionCore.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCore.java rename to core/src/main/java/com/mango/core/room/auction/IAuctionCore.java index 0250c7f38..7d0ae0bd3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCore.java +++ b/core/src/main/java/com/mango/core/room/auction/IAuctionCore.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.auction; +package com.mango.core.room.auction; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionInfo; -import com.yizhuan.xchat_android_library.coremanager.IBaseCore; +import com.mango.core.room.auction.bean.AuctionInfo; +import com.mango.xchat_android_library.coremanager.IBaseCore; /** * Created by zhouxiangfeng on 2017/5/28. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCoreClient.java b/core/src/main/java/com/mango/core/room/auction/IAuctionCoreClient.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCoreClient.java rename to core/src/main/java/com/mango/core/room/auction/IAuctionCoreClient.java index d7e1285ca..553740991 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCoreClient.java +++ b/core/src/main/java/com/mango/core/room/auction/IAuctionCoreClient.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.room.auction; +package com.mango.core.room.auction; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionInfo; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionListUserInfo; -import com.yizhuan.xchat_android_library.coremanager.ICoreClient; +import com.mango.core.room.auction.bean.AuctionInfo; +import com.mango.core.room.auction.bean.AuctionListUserInfo; +import com.mango.xchat_android_library.coremanager.ICoreClient; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionInfo.java b/core/src/main/java/com/mango/core/room/auction/bean/AuctionInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionInfo.java rename to core/src/main/java/com/mango/core/room/auction/bean/AuctionInfo.java index 8fd843efc..3110f1e6e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionInfo.java +++ b/core/src/main/java/com/mango/core/room/auction/bean/AuctionInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.auction.bean; +package com.mango.core.room.auction.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionListUserInfo.java b/core/src/main/java/com/mango/core/room/auction/bean/AuctionListUserInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionListUserInfo.java rename to core/src/main/java/com/mango/core/room/auction/bean/AuctionListUserInfo.java index 88d766e2a..ab45c4665 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionListUserInfo.java +++ b/core/src/main/java/com/mango/core/room/auction/bean/AuctionListUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.auction.bean; +package com.mango.core.room.auction.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionUser.java b/core/src/main/java/com/mango/core/room/auction/bean/AuctionUser.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionUser.java rename to core/src/main/java/com/mango/core/room/auction/bean/AuctionUser.java index 19e5e7b8c..1f751bd97 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionUser.java +++ b/core/src/main/java/com/mango/core/room/auction/bean/AuctionUser.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.auction.bean; +package com.mango.core.room.auction.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/AnchorInfo.kt b/core/src/main/java/com/mango/core/room/bean/AnchorInfo.kt similarity index 72% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/AnchorInfo.kt rename to core/src/main/java/com/mango/core/room/bean/AnchorInfo.kt index 299c6fc5e..cb777edcb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/AnchorInfo.kt +++ b/core/src/main/java/com/mango/core/room/bean/AnchorInfo.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.mango.core.room.bean -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity +import com.mango.core.user.bean.UserInfoSkillEntity data class AnchorInfo( val absCardPics: List? = null, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/BoxSwitchVo.java b/core/src/main/java/com/mango/core/room/bean/BoxSwitchVo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/BoxSwitchVo.java rename to core/src/main/java/com/mango/core/room/bean/BoxSwitchVo.java index db78f9b4c..74b7b6de5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/BoxSwitchVo.java +++ b/core/src/main/java/com/mango/core/room/bean/BoxSwitchVo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/BroadcastInfo.kt b/core/src/main/java/com/mango/core/room/bean/BroadcastInfo.kt similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/BroadcastInfo.kt rename to core/src/main/java/com/mango/core/room/bean/BroadcastInfo.kt index 5f1786d4a..0b2b243a5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/BroadcastInfo.kt +++ b/core/src/main/java/com/mango/core/room/bean/BroadcastInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.mango.core.room.bean data class BroadcastInfo( val availableTimes: Long = 0, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingAllNotifyInfo.kt b/core/src/main/java/com/mango/core/room/bean/DatingAllNotifyInfo.kt similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingAllNotifyInfo.kt rename to core/src/main/java/com/mango/core/room/bean/DatingAllNotifyInfo.kt index a37fa6cc9..c9cf1d09e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingAllNotifyInfo.kt +++ b/core/src/main/java/com/mango/core/room/bean/DatingAllNotifyInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.mango.core.room.bean import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingNotifyInfo.kt b/core/src/main/java/com/mango/core/room/bean/DatingNotifyInfo.kt similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingNotifyInfo.kt rename to core/src/main/java/com/mango/core/room/bean/DatingNotifyInfo.kt index 48a71dfc4..213d4c4e0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingNotifyInfo.kt +++ b/core/src/main/java/com/mango/core/room/bean/DatingNotifyInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.mango.core.room.bean import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DragonBarInfo.java b/core/src/main/java/com/mango/core/room/bean/DragonBarInfo.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DragonBarInfo.java rename to core/src/main/java/com/mango/core/room/bean/DragonBarInfo.java index 3d68f4232..6b59a8545 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DragonBarInfo.java +++ b/core/src/main/java/com/mango/core/room/bean/DragonBarInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; /** * Created by huangmeng1 on 2018/7/12. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/HomeLiveTopInfo.kt b/core/src/main/java/com/mango/core/room/bean/HomeLiveTopInfo.kt similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/HomeLiveTopInfo.kt rename to core/src/main/java/com/mango/core/room/bean/HomeLiveTopInfo.kt index 97cb5aedf..fa642a02e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/HomeLiveTopInfo.kt +++ b/core/src/main/java/com/mango/core/room/bean/HomeLiveTopInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.mango.core.room.bean data class HomeLiveTopInfo( val onceLookStatus: Boolean = false, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/LeaveModeAttachment.java b/core/src/main/java/com/mango/core/room/bean/LeaveModeAttachment.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/LeaveModeAttachment.java rename to core/src/main/java/com/mango/core/room/bean/LeaveModeAttachment.java index dfb5c7481..981f1d3b5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/LeaveModeAttachment.java +++ b/core/src/main/java/com/mango/core/room/bean/LeaveModeAttachment.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; public class LeaveModeAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/MeCenterInfo.kt b/core/src/main/java/com/mango/core/room/bean/MeCenterInfo.kt similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/MeCenterInfo.kt rename to core/src/main/java/com/mango/core/room/bean/MeCenterInfo.kt index f2c68204a..b4984f161 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/MeCenterInfo.kt +++ b/core/src/main/java/com/mango/core/room/bean/MeCenterInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.mango.core.room.bean data class MeCenterInfo( val centerBadge: String?= null, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java b/core/src/main/java/com/mango/core/room/bean/OnlineChatMember.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java rename to core/src/main/java/com/mango/core/room/bean/OnlineChatMember.java index 6df262b87..10c08d37f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java +++ b/core/src/main/java/com/mango/core/room/bean/OnlineChatMember.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import androidx.annotation.NonNull; import com.chad.library.adapter.base.entity.MultiItemEntity; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.core.noble.NobleResourceType; +import com.mango.core.noble.NobleUtil; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomAudioSdkType.java b/core/src/main/java/com/mango/core/room/bean/RoomAudioSdkType.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomAudioSdkType.java rename to core/src/main/java/com/mango/core/room/bean/RoomAudioSdkType.java index f560e8e6c..221a6d54b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomAudioSdkType.java +++ b/core/src/main/java/com/mango/core/room/bean/RoomAudioSdkType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; /** *房间语音SDK类型 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeDataInfo.java b/core/src/main/java/com/mango/core/room/bean/RoomContributeDataInfo.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeDataInfo.java rename to core/src/main/java/com/mango/core/room/bean/RoomContributeDataInfo.java index 537fdd85a..25e2ccb9c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeDataInfo.java +++ b/core/src/main/java/com/mango/core/room/bean/RoomContributeDataInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeRoomInfo.java b/core/src/main/java/com/mango/core/room/bean/RoomContributeRoomInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeRoomInfo.java rename to core/src/main/java/com/mango/core/room/bean/RoomContributeRoomInfo.java index c406a7939..1c4da8dbf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeRoomInfo.java +++ b/core/src/main/java/com/mango/core/room/bean/RoomContributeRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeUserInfo.java b/core/src/main/java/com/mango/core/room/bean/RoomContributeUserInfo.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeUserInfo.java rename to core/src/main/java/com/mango/core/room/bean/RoomContributeUserInfo.java index 0f76adf77..9b5fcb7fe 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeUserInfo.java +++ b/core/src/main/java/com/mango/core/room/bean/RoomContributeUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java b/core/src/main/java/com/mango/core/room/bean/RoomInfo.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java rename to core/src/main/java/com/mango/core/room/bean/RoomInfo.java index d64dc8035..9cd2338d4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java +++ b/core/src/main/java/com/mango/core/room/bean/RoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import android.os.Parcel; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInviteFansInfo.kt b/core/src/main/java/com/mango/core/room/bean/RoomInviteFansInfo.kt similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInviteFansInfo.kt rename to core/src/main/java/com/mango/core/room/bean/RoomInviteFansInfo.kt index 0199058ed..948adde79 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInviteFansInfo.kt +++ b/core/src/main/java/com/mango/core/room/bean/RoomInviteFansInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.mango.core.room.bean data class RoomInviteFansInfo( diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomListResult.java b/core/src/main/java/com/mango/core/room/bean/RoomListResult.java similarity index 56% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomListResult.java rename to core/src/main/java/com/mango/core/room/bean/RoomListResult.java index 9a4d1f833..29acb7b86 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomListResult.java +++ b/core/src/main/java/com/mango/core/room/bean/RoomListResult.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.mango.core.bean.response.ServiceResult; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomMessageViewNoticeInfo.java b/core/src/main/java/com/mango/core/room/bean/RoomMessageViewNoticeInfo.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomMessageViewNoticeInfo.java rename to core/src/main/java/com/mango/core/room/bean/RoomMessageViewNoticeInfo.java index 11c09e526..a3839b220 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomMessageViewNoticeInfo.java +++ b/core/src/main/java/com/mango/core/room/bean/RoomMessageViewNoticeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomModeType.java b/core/src/main/java/com/mango/core/room/bean/RoomModeType.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomModeType.java rename to core/src/main/java/com/mango/core/room/bean/RoomModeType.java index ae4b462b9..4ff2d0810 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomModeType.java +++ b/core/src/main/java/com/mango/core/room/bean/RoomModeType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; /** * 房间各种模式的设定 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourDataInfo.java b/core/src/main/java/com/mango/core/room/bean/RoomRankHalfHourDataInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourDataInfo.java rename to core/src/main/java/com/mango/core/room/bean/RoomRankHalfHourDataInfo.java index 49b6a1fbb..8d4db660c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourDataInfo.java +++ b/core/src/main/java/com/mango/core/room/bean/RoomRankHalfHourDataInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourMeInfo.java b/core/src/main/java/com/mango/core/room/bean/RoomRankHalfHourMeInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourMeInfo.java rename to core/src/main/java/com/mango/core/room/bean/RoomRankHalfHourMeInfo.java index 4a5d76736..ab03e47dd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourMeInfo.java +++ b/core/src/main/java/com/mango/core/room/bean/RoomRankHalfHourMeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; public class RoomRankHalfHourMeInfo { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourRankInfo.java b/core/src/main/java/com/mango/core/room/bean/RoomRankHalfHourRankInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourRankInfo.java rename to core/src/main/java/com/mango/core/room/bean/RoomRankHalfHourRankInfo.java index 471d0ce06..6529eac7e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourRankInfo.java +++ b/core/src/main/java/com/mango/core/room/bean/RoomRankHalfHourRankInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; public class RoomRankHalfHourRankInfo { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankMultiItem.java b/core/src/main/java/com/mango/core/room/bean/RoomRankMultiItem.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankMultiItem.java rename to core/src/main/java/com/mango/core/room/bean/RoomRankMultiItem.java index 01c36375a..793d5b09e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankMultiItem.java +++ b/core/src/main/java/com/mango/core/room/bean/RoomRankMultiItem.java @@ -1,9 +1,7 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; -import java.util.List; - public class RoomRankMultiItem implements MultiItemEntity { /**房间排行榜，第4开始用横向线性布局*/ public final static int TYPE_LINEAR = 2; diff --git a/core/src/main/java/com/mango/core/room/bean/RoomResult.java b/core/src/main/java/com/mango/core/room/bean/RoomResult.java new file mode 100644 index 000000000..2cdb83e88 --- /dev/null +++ b/core/src/main/java/com/mango/core/room/bean/RoomResult.java @@ -0,0 +1,11 @@ +package com.mango.core.room.bean; + +import com.mango.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class RoomResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomSettingTabInfo.java b/core/src/main/java/com/mango/core/room/bean/RoomSettingTabInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomSettingTabInfo.java rename to core/src/main/java/com/mango/core/room/bean/RoomSettingTabInfo.java index b98a5d1fb..5fcab593d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomSettingTabInfo.java +++ b/core/src/main/java/com/mango/core/room/bean/RoomSettingTabInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomWelcomeConfig.java b/core/src/main/java/com/mango/core/room/bean/RoomWelcomeConfig.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomWelcomeConfig.java rename to core/src/main/java/com/mango/core/room/bean/RoomWelcomeConfig.java index 416631358..b3bab4819 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomWelcomeConfig.java +++ b/core/src/main/java/com/mango/core/room/bean/RoomWelcomeConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SearchRoomInfo.java b/core/src/main/java/com/mango/core/room/bean/SearchRoomInfo.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SearchRoomInfo.java rename to core/src/main/java/com/mango/core/room/bean/SearchRoomInfo.java index f9ffbd47f..ae5adfbdb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SearchRoomInfo.java +++ b/core/src/main/java/com/mango/core/room/bean/SearchRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import android.graphics.Color; import android.os.Parcel; @@ -9,11 +9,11 @@ import android.text.TextUtils; import android.text.style.ForegroundColorSpan; import com.chad.library.adapter.base.entity.MultiItemEntity; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.core.home.bean.BannerInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.noble.NobleInfo; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/ShowUserInfoDialog.java b/core/src/main/java/com/mango/core/room/bean/ShowUserInfoDialog.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/ShowUserInfoDialog.java rename to core/src/main/java/com/mango/core/room/bean/ShowUserInfoDialog.java index 43b527265..293bdd8d3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/ShowUserInfoDialog.java +++ b/core/src/main/java/com/mango/core/room/bean/ShowUserInfoDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; /** * Created by huangmeng1 on 2018/8/6. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SimplePartyRoomInfo.java b/core/src/main/java/com/mango/core/room/bean/SimplePartyRoomInfo.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SimplePartyRoomInfo.java rename to core/src/main/java/com/mango/core/room/bean/SimplePartyRoomInfo.java index f93167465..dca6011bc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SimplePartyRoomInfo.java +++ b/core/src/main/java/com/mango/core/room/bean/SimplePartyRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SingleRoomSortInfo.kt b/core/src/main/java/com/mango/core/room/bean/SingleRoomSortInfo.kt similarity index 63% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SingleRoomSortInfo.kt rename to core/src/main/java/com/mango/core/room/bean/SingleRoomSortInfo.kt index 159d76fee..52de6988a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SingleRoomSortInfo.kt +++ b/core/src/main/java/com/mango/core/room/bean/SingleRoomSortInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.mango.core.room.bean data class SingleRoomSortInfo( val id: Long? = 0, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/UpMic.java b/core/src/main/java/com/mango/core/room/bean/UpMic.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/UpMic.java rename to core/src/main/java/com/mango/core/room/bean/UpMic.java index 97829a977..db578ee2e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/UpMic.java +++ b/core/src/main/java/com/mango/core/room/bean/UpMic.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; /** * Created by huangmeng1 on 2018/7/27. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/WelcomeInfo.java b/core/src/main/java/com/mango/core/room/bean/WelcomeInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/WelcomeInfo.java rename to core/src/main/java/com/mango/core/room/bean/WelcomeInfo.java index 3ab7d0afe..5bedfb4af 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/WelcomeInfo.java +++ b/core/src/main/java/com/mango/core/room/bean/WelcomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.mango.core.room.bean; import android.text.TextUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/DragonBallModel.java b/core/src/main/java/com/mango/core/room/dragonball/DragonBallModel.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/DragonBallModel.java rename to core/src/main/java/com/mango/core/room/dragonball/DragonBallModel.java index 5dfc1e050..ed75f385d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/DragonBallModel.java +++ b/core/src/main/java/com/mango/core/room/dragonball/DragonBallModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.room.dragonball; +package com.mango.core.room.dragonball; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.DragonBarInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.DragonBarInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import io.reactivex.SingleSource; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/IDragonBallModel.java b/core/src/main/java/com/mango/core/room/dragonball/IDragonBallModel.java similarity index 61% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/IDragonBallModel.java rename to core/src/main/java/com/mango/core/room/dragonball/IDragonBallModel.java index bd9602581..5a0de376a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/IDragonBallModel.java +++ b/core/src/main/java/com/mango/core/room/dragonball/IDragonBallModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.dragonball; +package com.mango.core.room.dragonball; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.room.bean.DragonBarInfo; +import com.mango.core.base.IModel; +import com.mango.core.room.bean.DragonBarInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/DatingSelectUserEvent.java b/core/src/main/java/com/mango/core/room/event/DatingSelectUserEvent.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/DatingSelectUserEvent.java rename to core/src/main/java/com/mango/core/room/event/DatingSelectUserEvent.java index 7d2351b63..4c16fba58 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/DatingSelectUserEvent.java +++ b/core/src/main/java/com/mango/core/room/event/DatingSelectUserEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.mango.core.room.event; public class DatingSelectUserEvent { diff --git a/core/src/main/java/com/mango/core/room/event/EixtCountDownEvent.java b/core/src/main/java/com/mango/core/room/event/EixtCountDownEvent.java new file mode 100644 index 000000000..97727fa82 --- /dev/null +++ b/core/src/main/java/com/mango/core/room/event/EixtCountDownEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.room.event; + +public class EixtCountDownEvent { +} diff --git a/core/src/main/java/com/mango/core/room/event/FaceIsReadyEvent.java b/core/src/main/java/com/mango/core/room/event/FaceIsReadyEvent.java new file mode 100644 index 000000000..04c8cf593 --- /dev/null +++ b/core/src/main/java/com/mango/core/room/event/FaceIsReadyEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.room.event; + +public class FaceIsReadyEvent { +} diff --git a/core/src/main/java/com/mango/core/room/event/FinishAvRoomEvent.java b/core/src/main/java/com/mango/core/room/event/FinishAvRoomEvent.java new file mode 100644 index 000000000..01bd1e31d --- /dev/null +++ b/core/src/main/java/com/mango/core/room/event/FinishAvRoomEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.room.event; + +public class FinishAvRoomEvent { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/MessageSizeEvent.java b/core/src/main/java/com/mango/core/room/event/MessageSizeEvent.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/MessageSizeEvent.java rename to core/src/main/java/com/mango/core/room/event/MessageSizeEvent.java index 8268016cf..38841f615 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/MessageSizeEvent.java +++ b/core/src/main/java/com/mango/core/room/event/MessageSizeEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.mango.core.room.event; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/ReceiveFaceEvent.java b/core/src/main/java/com/mango/core/room/event/ReceiveFaceEvent.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/ReceiveFaceEvent.java rename to core/src/main/java/com/mango/core/room/event/ReceiveFaceEvent.java index 32006543b..252ebf436 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/ReceiveFaceEvent.java +++ b/core/src/main/java/com/mango/core/room/event/ReceiveFaceEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.mango.core.room.event; -import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo; +import com.mango.core.room.face.FaceReceiveInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomAtEvent.java b/core/src/main/java/com/mango/core/room/event/RoomAtEvent.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomAtEvent.java rename to core/src/main/java/com/mango/core/room/event/RoomAtEvent.java index 551d16d36..93fedfef9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomAtEvent.java +++ b/core/src/main/java/com/mango/core/room/event/RoomAtEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.mango.core.room.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/mango/core/room/event/RoomClearScreenEvent.java b/core/src/main/java/com/mango/core/room/event/RoomClearScreenEvent.java new file mode 100644 index 000000000..2e1c08119 --- /dev/null +++ b/core/src/main/java/com/mango/core/room/event/RoomClearScreenEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.room.event; + +public class RoomClearScreenEvent { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomInfoEvent.java b/core/src/main/java/com/mango/core/room/event/RoomInfoEvent.java similarity index 53% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomInfoEvent.java rename to core/src/main/java/com/mango/core/room/event/RoomInfoEvent.java index 50560fecc..eeeb74a64 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomInfoEvent.java +++ b/core/src/main/java/com/mango/core/room/event/RoomInfoEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.mango.core.room.event; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomInfo; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,7 +11,7 @@ public class RoomInfoEvent { /** * 已知取值： - * @see com.yizhuan.xchat_android_core.Constants#PAGE_TYPE_MAIN_FRAGMENT + * @see com.mango.core.Constants#PAGE_TYPE_MAIN_FRAGMENT */ private int pageType; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomTaskTipsEvent.java b/core/src/main/java/com/mango/core/room/event/RoomTaskTipsEvent.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomTaskTipsEvent.java rename to core/src/main/java/com/mango/core/room/event/RoomTaskTipsEvent.java index 113aa2b16..816abdc73 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomTaskTipsEvent.java +++ b/core/src/main/java/com/mango/core/room/event/RoomTaskTipsEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.mango.core.room.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/SwitchRoomEvent.java b/core/src/main/java/com/mango/core/room/event/SwitchRoomEvent.java similarity index 57% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/SwitchRoomEvent.java rename to core/src/main/java/com/mango/core/room/event/SwitchRoomEvent.java index 91922b213..8e7d6239b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/SwitchRoomEvent.java +++ b/core/src/main/java/com/mango/core/room/event/SwitchRoomEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.mango.core.room.event; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomInfo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/exception/AntiSpamHitException.java b/core/src/main/java/com/mango/core/room/exception/AntiSpamHitException.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/exception/AntiSpamHitException.java rename to core/src/main/java/com/mango/core/room/exception/AntiSpamHitException.java index 5db532a7b..2704ba552 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/exception/AntiSpamHitException.java +++ b/core/src/main/java/com/mango/core/room/exception/AntiSpamHitException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.exception; +package com.mango.core.room.exception; public class AntiSpamHitException extends Exception { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/DynamicFaceModel.java b/core/src/main/java/com/mango/core/room/face/DynamicFaceModel.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/DynamicFaceModel.java rename to core/src/main/java/com/mango/core/room/face/DynamicFaceModel.java index eb54b57ce..98483cd05 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/DynamicFaceModel.java +++ b/core/src/main/java/com/mango/core/room/face/DynamicFaceModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.face; +package com.mango.core.room.face; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -7,39 +7,37 @@ import android.util.SparseArray; import com.google.gson.Gson; import com.netease.nim.uikit.common.util.string.StringUtil; 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.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.ProgressInfo; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.bean.response.RequestError; -import com.yizhuan.xchat_android_core.gift.bean.SimpleVipInfo; -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.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.interceptor.NoParamsInterceptor; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.event.FaceIsReadyEvent; -import com.yizhuan.xchat_android_core.room.event.ReceiveFaceEvent; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; -import com.yizhuan.xchat_android_library.utils.codec.MD5Utils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.core.DemoCache; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.ProgressInfo; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.bean.response.RequestError; +import com.mango.core.gift.bean.SimpleVipInfo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.FaceAttachment; +import com.mango.core.initial.InitialModel; +import com.mango.core.initial.bean.InitInfo; +import com.mango.core.interceptor.NoParamsInterceptor; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.event.FaceIsReadyEvent; +import com.mango.core.room.event.ReceiveFaceEvent; +import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.LogUtils; +import com.mango.core.vip.UserVipInfo; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.NetworkUtils; +import com.mango.xchat_android_library.utils.codec.DESUtils; +import com.mango.xchat_android_library.utils.codec.MD5Utils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import org.greenrobot.eventbus.EventBus; @@ -75,8 +73,8 @@ import retrofit2.http.Headers; import retrofit2.http.Streaming; import retrofit2.http.Url; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_FACE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_FACE_SEND; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_FACE; +import static com.mango.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_FACE_SEND; public class DynamicFaceModel extends BaseModel implements IDynamicFaceModel { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceInfo.java b/core/src/main/java/com/mango/core/room/face/FaceInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceInfo.java rename to core/src/main/java/com/mango/core/room/face/FaceInfo.java index cc6576b23..263354c82 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceInfo.java +++ b/core/src/main/java/com/mango/core/room/face/FaceInfo.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.face; +package com.mango.core.room.face; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.gift.bean.SimpleVipInfo; +import com.mango.core.gift.bean.SimpleVipInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceListInfo.java b/core/src/main/java/com/mango/core/room/face/FaceListInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceListInfo.java rename to core/src/main/java/com/mango/core/room/face/FaceListInfo.java index e510a6b22..07677fc58 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceListInfo.java +++ b/core/src/main/java/com/mango/core/room/face/FaceListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.face; +package com.mango.core.room.face; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceReceiveInfo.java b/core/src/main/java/com/mango/core/room/face/FaceReceiveInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceReceiveInfo.java rename to core/src/main/java/com/mango/core/room/face/FaceReceiveInfo.java index 1294a649a..ca4574ae7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceReceiveInfo.java +++ b/core/src/main/java/com/mango/core/room/face/FaceReceiveInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.face; +package com.mango.core.room.face; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IDynamicFaceModel.java b/core/src/main/java/com/mango/core/room/face/IDynamicFaceModel.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/IDynamicFaceModel.java rename to core/src/main/java/com/mango/core/room/face/IDynamicFaceModel.java index 2147e330a..c4f5c45b9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IDynamicFaceModel.java +++ b/core/src/main/java/com/mango/core/room/face/IDynamicFaceModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.face; +package com.mango.core.room.face; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.base.IModel; +import com.mango.core.base.IModel; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IFaceCore.java b/core/src/main/java/com/mango/core/room/face/IFaceCore.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/IFaceCore.java rename to core/src/main/java/com/mango/core/room/face/IFaceCore.java index 23572811a..93eb94e8d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IFaceCore.java +++ b/core/src/main/java/com/mango/core/room/face/IFaceCore.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.face; +package com.mango.core.room.face; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_library.coremanager.IBaseCore; +import com.mango.xchat_android_library.coremanager.IBaseCore; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IFaceCoreClient.java b/core/src/main/java/com/mango/core/room/face/IFaceCoreClient.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/IFaceCoreClient.java rename to core/src/main/java/com/mango/core/room/face/IFaceCoreClient.java index b4baa6553..ffa974c2d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IFaceCoreClient.java +++ b/core/src/main/java/com/mango/core/room/face/IFaceCoreClient.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.face; +package com.mango.core.room.face; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_library.coremanager.ICoreClient; +import com.mango.xchat_android_library.coremanager.ICoreClient; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCfg.kt b/core/src/main/java/com/mango/core/room/game/GameCfg.kt similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCfg.kt rename to core/src/main/java/com/mango/core/room/game/GameCfg.kt index 65f47ad14..9c4d6991f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCfg.kt +++ b/core/src/main/java/com/mango/core/room/game/GameCfg.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.game +package com.mango.core.room.game /*** * diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCodeInfo.kt b/core/src/main/java/com/mango/core/room/game/GameCodeInfo.kt similarity index 60% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCodeInfo.kt rename to core/src/main/java/com/mango/core/room/game/GameCodeInfo.kt index 8a155d344..ddbdef109 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCodeInfo.kt +++ b/core/src/main/java/com/mango/core/room/game/GameCodeInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.game +package com.mango.core.room.game data class GameCodeInfo( val code: String, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameInfo.kt b/core/src/main/java/com/mango/core/room/game/GameInfo.kt similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameInfo.kt rename to core/src/main/java/com/mango/core/room/game/GameInfo.kt index 1b279dc03..c22fe4847 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameInfo.kt +++ b/core/src/main/java/com/mango/core/room/game/GameInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.game +package com.mango.core.room.game data class GameInfo( val isShow: Boolean = false, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameModel.kt b/core/src/main/java/com/mango/core/room/game/GameModel.kt similarity index 63% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameModel.kt rename to core/src/main/java/com/mango/core/room/game/GameModel.kt index b10f8ba57..b3c6806b6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameModel.kt +++ b/core/src/main/java/com/mango/core/room/game/GameModel.kt @@ -1,14 +1,10 @@ -package com.yizhuan.xchat_android_core.room.game +package com.mango.core.room.game -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.community.CommunityConstant -import com.yizhuan.xchat_android_core.community.bean.UnReadCountInfo -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_core.utils.net.RxHelper -import com.yizhuan.xchat_android_core.utils.net.launchRequest -import com.yizhuan.xchat_android_library.net.rxnet.RxNet +import com.mango.core.auth.AuthModel +import com.mango.core.base.BaseModel +import com.mango.core.bean.response.ServiceResult +import com.mango.core.utils.net.RxHelper +import com.mango.xchat_android_library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.* diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameStatus.java b/core/src/main/java/com/mango/core/room/game/GameStatus.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameStatus.java rename to core/src/main/java/com/mango/core/room/game/GameStatus.java index 09520854b..2afe62af3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameStatus.java +++ b/core/src/main/java/com/mango/core/room/game/GameStatus.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.game; +package com.mango.core.room.game; public interface GameStatus { int STATUS_NOT_JOIN = 0; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/GiftValueModel.java b/core/src/main/java/com/mango/core/room/giftvalue/GiftValueModel.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/GiftValueModel.java rename to core/src/main/java/com/mango/core/room/giftvalue/GiftValueModel.java index 86a87a8e7..aee821e4f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/GiftValueModel.java +++ b/core/src/main/java/com/mango/core/room/giftvalue/GiftValueModel.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.room.giftvalue; +package com.mango.core.room.giftvalue; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; -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.JavaUtil; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.giftvalue.bean.RoomGiftValue; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.JavaUtil; import io.reactivex.Single; import retrofit2.http.DELETE; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/IGiftValueModel.java b/core/src/main/java/com/mango/core/room/giftvalue/IGiftValueModel.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/IGiftValueModel.java rename to core/src/main/java/com/mango/core/room/giftvalue/IGiftValueModel.java index 32219e0f2..6bcc188b3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/IGiftValueModel.java +++ b/core/src/main/java/com/mango/core/room/giftvalue/IGiftValueModel.java @@ -1,9 +1,6 @@ -package com.yizhuan.xchat_android_core.room.giftvalue; +package com.mango.core.room.giftvalue; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; - -import java.util.List; +import com.mango.core.room.giftvalue.bean.RoomGiftValue; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueCommonUpdate.java b/core/src/main/java/com/mango/core/room/giftvalue/bean/GiftValueCommonUpdate.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueCommonUpdate.java rename to core/src/main/java/com/mango/core/room/giftvalue/bean/GiftValueCommonUpdate.java index 5f557c790..824018ec3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueCommonUpdate.java +++ b/core/src/main/java/com/mango/core/room/giftvalue/bean/GiftValueCommonUpdate.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.room.giftvalue.bean; +package com.mango.core.room.giftvalue.bean; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; +import com.mango.core.gift.GiftModel; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.GiftMultiReceiverInfo; +import com.mango.core.gift.bean.GiftReceiveInfo; +import com.mango.core.gift.bean.LuckyBagGifts; +import com.mango.core.gift.bean.MultiGiftReceiveInfo; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java b/core/src/main/java/com/mango/core/room/giftvalue/bean/GiftValueData.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java rename to core/src/main/java/com/mango/core/room/giftvalue/bean/GiftValueData.java index 7fea75685..d60517d6d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java +++ b/core/src/main/java/com/mango/core/room/giftvalue/bean/GiftValueData.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.room.giftvalue.bean; +package com.mango.core.room.giftvalue.bean; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; +import com.mango.core.manager.AvRoomDataManager; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueNetData.java b/core/src/main/java/com/mango/core/room/giftvalue/bean/GiftValueNetData.java similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueNetData.java rename to core/src/main/java/com/mango/core/room/giftvalue/bean/GiftValueNetData.java index c35763015..0c6412b92 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueNetData.java +++ b/core/src/main/java/com/mango/core/room/giftvalue/bean/GiftValueNetData.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.giftvalue.bean; +package com.mango.core.room.giftvalue.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/IndexGiftValue.java b/core/src/main/java/com/mango/core/room/giftvalue/bean/IndexGiftValue.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/IndexGiftValue.java rename to core/src/main/java/com/mango/core/room/giftvalue/bean/IndexGiftValue.java index dc6d9d901..276601181 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/IndexGiftValue.java +++ b/core/src/main/java/com/mango/core/room/giftvalue/bean/IndexGiftValue.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.giftvalue.bean; +package com.mango.core.room.giftvalue.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/RoomGiftValue.java b/core/src/main/java/com/mango/core/room/giftvalue/bean/RoomGiftValue.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/RoomGiftValue.java rename to core/src/main/java/com/mango/core/room/giftvalue/bean/RoomGiftValue.java index a773415d2..91b347cfa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/RoomGiftValue.java +++ b/core/src/main/java/com/mango/core/room/giftvalue/bean/RoomGiftValue.java @@ -1,9 +1,8 @@ -package com.yizhuan.xchat_android_core.room.giftvalue.bean; +package com.mango.core.room.giftvalue.bean; import java.io.Serializable; import java.util.List; -import lombok.Data; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueFormat.java b/core/src/main/java/com/mango/core/room/giftvalue/helper/GiftValueFormat.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueFormat.java rename to core/src/main/java/com/mango/core/room/giftvalue/helper/GiftValueFormat.java index 9bd571ae1..c86758dc2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueFormat.java +++ b/core/src/main/java/com/mango/core/room/giftvalue/helper/GiftValueFormat.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.giftvalue.helper; +package com.mango.core.room.giftvalue.helper; /** * create by lvzebiao @2019/4/12 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java b/core/src/main/java/com/mango/core/room/giftvalue/helper/GiftValueMrg.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java rename to core/src/main/java/com/mango/core/room/giftvalue/helper/GiftValueMrg.java index ad5076aeb..606eb186a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java +++ b/core/src/main/java/com/mango/core/room/giftvalue/helper/GiftValueMrg.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.giftvalue.helper; +package com.mango.core.room.giftvalue.helper; import android.annotation.SuppressLint; import android.os.Handler; @@ -9,20 +9,20 @@ import android.util.SparseArray; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomGiftValueAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.room.giftvalue.GiftValueModel; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueCommonUpdate; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueData; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.im.custom.bean.RoomGiftValueAttachment; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.room.giftvalue.GiftValueModel; +import com.mango.core.room.giftvalue.bean.GiftValueCommonUpdate; +import com.mango.core.room.giftvalue.bean.GiftValueData; +import com.mango.core.room.giftvalue.bean.IndexGiftValue; +import com.mango.core.room.giftvalue.bean.RoomGiftValue; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/IKtvModel.java b/core/src/main/java/com/mango/core/room/ktv/IKtvModel.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/IKtvModel.java rename to core/src/main/java/com/mango/core/room/ktv/IKtvModel.java index 2849a401d..aed136e65 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/IKtvModel.java +++ b/core/src/main/java/com/mango/core/room/ktv/IKtvModel.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.room.ktv; +package com.mango.core.room.ktv; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.ktv.bean.KtvRoomInfo; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; -import com.yizhuan.xchat_android_core.room.ktv.bean.RoomMusicInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.ktv.bean.KtvRoomInfo; +import com.mango.core.room.ktv.bean.MusicInfo; +import com.mango.core.room.ktv.bean.RoomMusicInfo; import java.util.List; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/KtvModel.java b/core/src/main/java/com/mango/core/room/ktv/KtvModel.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/KtvModel.java rename to core/src/main/java/com/mango/core/room/ktv/KtvModel.java index 5f89bbbee..50f956a0d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/KtvModel.java +++ b/core/src/main/java/com/mango/core/room/ktv/KtvModel.java @@ -1,18 +1,16 @@ -package com.yizhuan.xchat_android_core.room.ktv; +package com.mango.core.room.ktv; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.ktv.bean.KtvRoomInfo; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; -import com.yizhuan.xchat_android_core.room.ktv.bean.RoomMusicInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.ktv.bean.KtvRoomInfo; +import com.mango.core.room.ktv.bean.MusicInfo; +import com.mango.core.room.ktv.bean.RoomMusicInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.List; import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.functions.Function; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/bean/KtvRoomInfo.java b/core/src/main/java/com/mango/core/room/ktv/bean/KtvRoomInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/bean/KtvRoomInfo.java rename to core/src/main/java/com/mango/core/room/ktv/bean/KtvRoomInfo.java index cd2ca6d2e..65ab483ec 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/bean/KtvRoomInfo.java +++ b/core/src/main/java/com/mango/core/room/ktv/bean/KtvRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.ktv.bean; +package com.mango.core.room.ktv.bean; public class KtvRoomInfo { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/bean/MusicInfo.java b/core/src/main/java/com/mango/core/room/ktv/bean/MusicInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/bean/MusicInfo.java rename to core/src/main/java/com/mango/core/room/ktv/bean/MusicInfo.java index dc7a2ac4a..1b6800b1e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/bean/MusicInfo.java +++ b/core/src/main/java/com/mango/core/room/ktv/bean/MusicInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.ktv.bean; +package com.mango.core.room.ktv.bean; public class MusicInfo { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/bean/RoomMusicInfo.java b/core/src/main/java/com/mango/core/room/ktv/bean/RoomMusicInfo.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/bean/RoomMusicInfo.java rename to core/src/main/java/com/mango/core/room/ktv/bean/RoomMusicInfo.java index c8e52081f..557817aa6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/bean/RoomMusicInfo.java +++ b/core/src/main/java/com/mango/core/room/ktv/bean/RoomMusicInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.ktv.bean; +package com.mango.core.room.ktv.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/KtvEvent.java b/core/src/main/java/com/mango/core/room/ktv/event/KtvEvent.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/KtvEvent.java rename to core/src/main/java/com/mango/core/room/ktv/event/KtvEvent.java index 4d596c86a..990076fcb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/KtvEvent.java +++ b/core/src/main/java/com/mango/core/room/ktv/event/KtvEvent.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.ktv.event; +package com.mango.core.room.ktv.event; import androidx.annotation.Nullable; -import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo; +import com.mango.core.room.ktv.bean.MusicInfo; public class KtvEvent { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/MusicCountEvent.java b/core/src/main/java/com/mango/core/room/ktv/event/MusicCountEvent.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/MusicCountEvent.java rename to core/src/main/java/com/mango/core/room/ktv/event/MusicCountEvent.java index 28257c1dd..1abdcb4a5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/MusicCountEvent.java +++ b/core/src/main/java/com/mango/core/room/ktv/event/MusicCountEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.ktv.event; +package com.mango.core.room.ktv.event; public class MusicCountEvent { private int count; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/RemoteVideoEvent.java b/core/src/main/java/com/mango/core/room/ktv/event/RemoteVideoEvent.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/RemoteVideoEvent.java rename to core/src/main/java/com/mango/core/room/ktv/event/RemoteVideoEvent.java index 009b7896d..11c182119 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/RemoteVideoEvent.java +++ b/core/src/main/java/com/mango/core/room/ktv/event/RemoteVideoEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.ktv.event; +package com.mango.core.room.ktv.event; public class RemoteVideoEvent { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java b/core/src/main/java/com/mango/core/room/model/AvRoomModel.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java rename to core/src/main/java/com/mango/core/room/model/AvRoomModel.java index 902927780..9253457c3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java +++ b/core/src/main/java/com/mango/core/room/model/AvRoomModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.mango.core.room.model; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -21,43 +21,43 @@ import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; -import com.yizhuan.xchat_android_core.room.activitytimer.ActivityTimerEvent; -import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean; -import com.yizhuan.xchat_android_core.room.bean.BroadcastInfo; -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.bean.RoomWelcomeConfig; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.room.bean.SimplePartyRoomInfo; -import com.yizhuan.xchat_android_core.room.event.RoomInfoEvent; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.inteface.IAvRoomModel; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.super_admin.bean.KickOutExtBean; -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_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; -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 com.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.home.bean.HomeRoomInfo; +import com.mango.core.initial.InitialModel; +import com.mango.core.initial.bean.InitInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.noble.NobleInfo; +import com.mango.core.patriarch.exception.PmRoomLimitException; +import com.mango.core.room.activitytimer.ActivityTimerEvent; +import com.mango.core.room.activitytimer.TimerBean; +import com.mango.core.room.bean.BroadcastInfo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomResult; +import com.mango.core.room.bean.RoomWelcomeConfig; +import com.mango.core.room.bean.SearchRoomInfo; +import com.mango.core.room.bean.SimplePartyRoomInfo; +import com.mango.core.room.event.RoomInfoEvent; +import com.mango.core.room.giftvalue.helper.GiftValueMrg; +import com.mango.core.room.model.inteface.IAvRoomModel; +import com.mango.core.room.pk.model.PkModel; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.super_admin.bean.KickOutExtBean; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyModel.java b/core/src/main/java/com/mango/core/room/model/HomePartyModel.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyModel.java rename to core/src/main/java/com/mango/core/room/model/HomePartyModel.java index 4bb5cb7b8..04ef530b3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyModel.java +++ b/core/src/main/java/com/mango/core/room/model/HomePartyModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.mango.core.room.model; import android.text.TextUtils; import android.util.SparseArray; @@ -9,22 +9,22 @@ import com.netease.nimlib.sdk.chatroom.constant.MemberQueryType; import com.netease.nimlib.sdk.chatroom.constant.MemberType; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -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.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.room.model.inteface.IHomePartyModel; -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.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.kick.KickModel; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.noble.NobleResourceType; +import com.mango.core.noble.NobleUtil; +import com.mango.core.room.model.inteface.IHomePartyModel; +import com.mango.core.super_admin.util.SaAttachmentFactory; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java b/core/src/main/java/com/mango/core/room/model/HomePartyUserListModel.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java rename to core/src/main/java/com/mango/core/room/model/HomePartyUserListModel.java index 6cb6b1d9b..8a0765d63 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java +++ b/core/src/main/java/com/mango/core/room/model/HomePartyUserListModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.mango.core.room.model; import android.text.TextUtils; @@ -7,13 +7,13 @@ import androidx.annotation.NonNull; import com.netease.nimlib.sdk.chatroom.constant.MemberType; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.exception.ErrorThrowable; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember; -import com.yizhuan.xchat_android_core.room.model.inteface.IHomePartyUserListModel; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.core.Constants; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.exception.ErrorThrowable; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.OnlineChatMember; +import com.mango.core.room.model.inteface.IHomePartyUserListModel; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/MicQueueModel.java b/core/src/main/java/com/mango/core/room/model/MicQueueModel.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/MicQueueModel.java rename to core/src/main/java/com/mango/core/room/model/MicQueueModel.java index d1ad629c1..223381c5c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/MicQueueModel.java +++ b/core/src/main/java/com/mango/core/room/model/MicQueueModel.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.mango.core.room.model; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.model.inteface.IMicQueueModel; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.RespQueuingMicListInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.model.inteface.IMicQueueModel; +import com.mango.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import retrofit2.http.DELETE; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java b/core/src/main/java/com/mango/core/room/model/RoomBaseModel.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java rename to core/src/main/java/com/mango/core/room/model/RoomBaseModel.java index f115fd87a..0301b7415 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java +++ b/core/src/main/java/com/mango/core/room/model/RoomBaseModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.mango.core.room.model; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -21,46 +21,43 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.chatroom.model.MemberOption; import com.netease.nimlib.sdk.util.Entry; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.RoomMicInfo; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.exception.ErrorThrowable; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean; -import com.yizhuan.xchat_android_core.room.bean.BroadcastInfo; -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.bean.RoomSettingTabInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomWelcomeConfig; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.room.bean.SimplePartyRoomInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.inteface.IRoomBaseModel; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.BaseInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; -import com.yizhuan.xchat_android_core.vip.VipInfo; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.RoomMicInfo; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.exception.ErrorThrowable; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.home.bean.BannerInfo; +import com.mango.core.home.bean.HomeRoomInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.room.activitytimer.TimerBean; +import com.mango.core.room.bean.BroadcastInfo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomResult; +import com.mango.core.room.bean.RoomSettingTabInfo; +import com.mango.core.room.bean.RoomWelcomeConfig; +import com.mango.core.room.bean.SearchRoomInfo; +import com.mango.core.room.bean.SimplePartyRoomInfo; +import com.mango.core.room.giftvalue.helper.GiftValueMrg; +import com.mango.core.room.model.inteface.IRoomBaseModel; +import com.mango.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.mango.core.room.pk.model.PkModel; +import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.BaseInfo; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.core.vip.UserVipInfo; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import io.reactivex.Observable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomCharmModel.java b/core/src/main/java/com/mango/core/room/model/RoomCharmModel.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomCharmModel.java rename to core/src/main/java/com/mango/core/room/model/RoomCharmModel.java index a3754aa4d..c6be33ddf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomCharmModel.java +++ b/core/src/main/java/com/mango/core/room/model/RoomCharmModel.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.mango.core.room.model; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; -import com.yizhuan.xchat_android_core.room.model.inteface.IRoomCharmModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.bean.RoomContributeDataInfo; +import com.mango.core.room.model.inteface.IRoomCharmModel; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import retrofit2.http.GET; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomContributeListModel.java b/core/src/main/java/com/mango/core/room/model/RoomContributeListModel.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomContributeListModel.java rename to core/src/main/java/com/mango/core/room/model/RoomContributeListModel.java index 1dca2557c..0ee569275 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomContributeListModel.java +++ b/core/src/main/java/com/mango/core/room/model/RoomContributeListModel.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.mango.core.room.model; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.inteface.IRoomContributeListModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.bean.RoomContributeDataInfo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.model.inteface.IRoomContributeListModel; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import retrofit2.http.GET; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteFansModel.kt b/core/src/main/java/com/mango/core/room/model/RoomInviteFansModel.kt similarity index 72% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteFansModel.kt rename to core/src/main/java/com/mango/core/room/model/RoomInviteFansModel.kt index 587ef803f..4769ee047 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteFansModel.kt +++ b/core/src/main/java/com/mango/core/room/model/RoomInviteFansModel.kt @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.room.model +package com.mango.core.room.model -import com.yizhuan.xchat_android_core.room.bean.RoomInviteFansInfo -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.utils.net.handleBeanData -import com.yizhuan.xchat_android_core.utils.net.io2main -import com.yizhuan.xchat_android_library.net.rxnet.RxNet +import com.mango.core.room.bean.RoomInviteFansInfo +import com.mango.core.bean.response.ServiceResult +import com.mango.core.utils.net.handleBeanData +import com.mango.core.utils.net.io2main +import com.mango.xchat_android_library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.* diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteModel.java b/core/src/main/java/com/mango/core/room/model/RoomInviteModel.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteModel.java rename to core/src/main/java/com/mango/core/room/model/RoomInviteModel.java index 088acc875..f3fbe4f21 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteModel.java +++ b/core/src/main/java/com/mango/core/room/model/RoomInviteModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.mango.core.room.model; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.xchat_android_core.room.model.inteface.IRoomInviteModel; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_core.Constants; +import com.mango.core.room.model.inteface.IRoomInviteModel; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.core.Constants; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomRankModel.java b/core/src/main/java/com/mango/core/room/model/RoomRankModel.java similarity index 74% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomRankModel.java rename to core/src/main/java/com/mango/core/room/model/RoomRankModel.java index 822d7caea..b1b6ea678 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomRankModel.java +++ b/core/src/main/java/com/mango/core/room/model/RoomRankModel.java @@ -1,14 +1,12 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.mango.core.room.model; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourDataInfo; -//import com.yizhuan.xchat_android_core.room.bean.RoomRankWeekStarDataInfo; -import com.yizhuan.xchat_android_core.room.model.inteface.IRoomRankModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; - -import java.util.List; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.bean.RoomRankHalfHourDataInfo; +//import com.moshen.core.room.bean.RoomRankWeekStarDataInfo; +import com.mango.core.room.model.inteface.IRoomRankModel; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import retrofit2.http.GET; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomSettingModel.java b/core/src/main/java/com/mango/core/room/model/RoomSettingModel.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomSettingModel.java rename to core/src/main/java/com/mango/core/room/model/RoomSettingModel.java index 3af81e309..98e3849af 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomSettingModel.java +++ b/core/src/main/java/com/mango/core/room/model/RoomSettingModel.java @@ -1,17 +1,17 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.mango.core.room.model; import android.text.TextUtils; -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.manager.BaseMvpModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo; -import com.yizhuan.xchat_android_core.room.bean.SingleRoomSortInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.BaseMvpModel; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomSettingTabInfo; +import com.mango.core.room.bean.SingleRoomSortInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; import java.util.List; @@ -19,7 +19,6 @@ import io.reactivex.Observable; import io.reactivex.Single; import io.reactivex.SingleSource; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Consumer; import io.reactivex.functions.Function; import io.reactivex.schedulers.Schedulers; import retrofit2.http.Field; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IAvRoomModel.java b/core/src/main/java/com/mango/core/room/model/inteface/IAvRoomModel.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IAvRoomModel.java rename to core/src/main/java/com/mango/core/room/model/inteface/IAvRoomModel.java index 8c20ef0f2..d1e8023fb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IAvRoomModel.java +++ b/core/src/main/java/com/mango/core/room/model/inteface/IAvRoomModel.java @@ -1,20 +1,19 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.mango.core.room.model.inteface; import com.google.gson.JsonElement; import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean; -import com.yizhuan.xchat_android_core.room.bean.BroadcastInfo; -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.bean.RoomWelcomeConfig; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.room.bean.SimplePartyRoomInfo; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.home.bean.HomeRoomInfo; +import com.mango.core.room.activitytimer.TimerBean; +import com.mango.core.room.bean.BroadcastInfo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomResult; +import com.mango.core.room.bean.RoomWelcomeConfig; +import com.mango.core.room.bean.SearchRoomInfo; +import com.mango.core.room.bean.SimplePartyRoomInfo; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyModel.java b/core/src/main/java/com/mango/core/room/model/inteface/IHomePartyModel.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyModel.java rename to core/src/main/java/com/mango/core/room/model/inteface/IHomePartyModel.java index 8a9925342..5fc71a18f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyModel.java +++ b/core/src/main/java/com/mango/core/room/model/inteface/IHomePartyModel.java @@ -1,12 +1,11 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.mango.core.room.model.inteface; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.core.base.IModel; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; import java.util.List; -import io.reactivex.Observable; import io.reactivex.Single; public interface IHomePartyModel extends IModel { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyUserListModel.java b/core/src/main/java/com/mango/core/room/model/inteface/IHomePartyUserListModel.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyUserListModel.java rename to core/src/main/java/com/mango/core/room/model/inteface/IHomePartyUserListModel.java index d3872de0d..0d6363ed2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyUserListModel.java +++ b/core/src/main/java/com/mango/core/room/model/inteface/IHomePartyUserListModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.mango.core.room.model.inteface; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember; +import com.mango.core.base.IModel; +import com.mango.core.room.bean.OnlineChatMember; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IMicQueueModel.java b/core/src/main/java/com/mango/core/room/model/inteface/IMicQueueModel.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IMicQueueModel.java rename to core/src/main/java/com/mango/core/room/model/inteface/IMicQueueModel.java index e954aaeca..5b59841ba 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IMicQueueModel.java +++ b/core/src/main/java/com/mango/core/room/model/inteface/IMicQueueModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.mango.core.room.model.inteface; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.mango.core.room.queuing_mic.bean.RespQueuingMicListInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomBaseModel.java b/core/src/main/java/com/mango/core/room/model/inteface/IRoomBaseModel.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomBaseModel.java rename to core/src/main/java/com/mango/core/room/model/inteface/IRoomBaseModel.java index 2a9963060..d1b0a592c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomBaseModel.java +++ b/core/src/main/java/com/mango/core/room/model/inteface/IRoomBaseModel.java @@ -1,19 +1,16 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; - -import android.util.SparseArray; +package com.mango.core.room.model.inteface; import com.netease.nimlib.sdk.chatroom.model.ChatRoomInfo; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.util.Entry; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -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.pk.bean.RoomPKInvitedUpMicMember; -import com.yizhuan.xchat_android_core.user.bean.BaseInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.core.base.IModel; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomResult; +import com.mango.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.mango.core.user.bean.BaseInfo; +import com.mango.core.user.bean.UserInfo; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomCharmModel.java b/core/src/main/java/com/mango/core/room/model/inteface/IRoomCharmModel.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomCharmModel.java rename to core/src/main/java/com/mango/core/room/model/inteface/IRoomCharmModel.java index 75a5c9ebc..e3566a053 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomCharmModel.java +++ b/core/src/main/java/com/mango/core/room/model/inteface/IRoomCharmModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.mango.core.room.model.inteface; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.bean.RoomContributeDataInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomContributeListModel.java b/core/src/main/java/com/mango/core/room/model/inteface/IRoomContributeListModel.java similarity index 72% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomContributeListModel.java rename to core/src/main/java/com/mango/core/room/model/inteface/IRoomContributeListModel.java index ee60a5f32..a641e5237 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomContributeListModel.java +++ b/core/src/main/java/com/mango/core/room/model/inteface/IRoomContributeListModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.mango.core.room.model.inteface; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.bean.RoomContributeDataInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomInviteModel.java b/core/src/main/java/com/mango/core/room/model/inteface/IRoomInviteModel.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomInviteModel.java rename to core/src/main/java/com/mango/core/room/model/inteface/IRoomInviteModel.java index a2f7b5438..ce6e03e0a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomInviteModel.java +++ b/core/src/main/java/com/mango/core/room/model/inteface/IRoomInviteModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.mango.core.room.model.inteface; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.xchat_android_core.base.IModel; +import com.mango.core.base.IModel; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomRankModel.java b/core/src/main/java/com/mango/core/room/model/inteface/IRoomRankModel.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomRankModel.java rename to core/src/main/java/com/mango/core/room/model/inteface/IRoomRankModel.java index 3fbc12ddd..0afd3c7a2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomRankModel.java +++ b/core/src/main/java/com/mango/core/room/model/inteface/IRoomRankModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.mango.core.room.model.inteface; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourDataInfo; +import com.mango.core.base.IModel; +import com.mango.core.room.bean.RoomRankHalfHourDataInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomSettingModel.java b/core/src/main/java/com/mango/core/room/model/inteface/IRoomSettingModel.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomSettingModel.java rename to core/src/main/java/com/mango/core/room/model/inteface/IRoomSettingModel.java index eaddbf95e..b11ddf78d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomSettingModel.java +++ b/core/src/main/java/com/mango/core/room/model/inteface/IRoomSettingModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.mango.core.room.model.inteface; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo; -import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; +import com.mango.core.base.IModel; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomSettingTabInfo; +import com.mango.xchat_android_library.net.rxnet.callback.CallBack; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/attachment/RoomPkAttachment.java b/core/src/main/java/com/mango/core/room/pk/attachment/RoomPkAttachment.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/attachment/RoomPkAttachment.java rename to core/src/main/java/com/mango/core/room/pk/attachment/RoomPkAttachment.java index 0022f0d7d..08e3f8a3a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/attachment/RoomPkAttachment.java +++ b/core/src/main/java/com/mango/core/room/pk/attachment/RoomPkAttachment.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.room.pk.attachment; +package com.mango.core.room.pk.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.mango.core.room.pk.bean.RoomPkData; import java.util.Map; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKMemberInfo.java b/core/src/main/java/com/mango/core/room/pk/bean/PKMemberInfo.java similarity index 60% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKMemberInfo.java rename to core/src/main/java/com/mango/core/room/pk/bean/PKMemberInfo.java index 279f7ec00..953bdfcaa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKMemberInfo.java +++ b/core/src/main/java/com/mango/core/room/pk/bean/PKMemberInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.mango.core.room.pk.bean; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.core.user.bean.UserInfo; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKQueuingMicMemberInfo.java b/core/src/main/java/com/mango/core/room/pk/bean/PKQueuingMicMemberInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKQueuingMicMemberInfo.java rename to core/src/main/java/com/mango/core/room/pk/bean/PKQueuingMicMemberInfo.java index de5d1cc4c..c7801efa3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKQueuingMicMemberInfo.java +++ b/core/src/main/java/com/mango/core/room/pk/bean/PKQueuingMicMemberInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.mango.core.room.pk.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRecordInfo.java b/core/src/main/java/com/mango/core/room/pk/bean/PKRecordInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRecordInfo.java rename to core/src/main/java/com/mango/core/room/pk/bean/PKRecordInfo.java index 0c701ffed..38d2214b1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRecordInfo.java +++ b/core/src/main/java/com/mango/core/room/pk/bean/PKRecordInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.mango.core.room.pk.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRecordListInfo.java b/core/src/main/java/com/mango/core/room/pk/bean/PKRecordListInfo.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRecordListInfo.java rename to core/src/main/java/com/mango/core/room/pk/bean/PKRecordListInfo.java index 8b493d066..053ccb5c4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRecordListInfo.java +++ b/core/src/main/java/com/mango/core/room/pk/bean/PKRecordListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.mango.core.room.pk.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRespQueuingMicListInfo.java b/core/src/main/java/com/mango/core/room/pk/bean/PKRespQueuingMicListInfo.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRespQueuingMicListInfo.java rename to core/src/main/java/com/mango/core/room/pk/bean/PKRespQueuingMicListInfo.java index 6317f178a..8075884eb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRespQueuingMicListInfo.java +++ b/core/src/main/java/com/mango/core/room/pk/bean/PKRespQueuingMicListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.mango.core.room.pk.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamInfo.java b/core/src/main/java/com/mango/core/room/pk/bean/PKTeamInfo.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamInfo.java rename to core/src/main/java/com/mango/core/room/pk/bean/PKTeamInfo.java index a640f0ac4..d99fe0833 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamInfo.java +++ b/core/src/main/java/com/mango/core/room/pk/bean/PKTeamInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.mango.core.room.pk.bean; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.core.user.bean.UserInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamMember.java b/core/src/main/java/com/mango/core/room/pk/bean/PKTeamMember.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamMember.java rename to core/src/main/java/com/mango/core/room/pk/bean/PKTeamMember.java index 3fe0d211e..ce73220f4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamMember.java +++ b/core/src/main/java/com/mango/core/room/pk/bean/PKTeamMember.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.mango.core.room.pk.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/RoomPKInvitedUpMicMember.java b/core/src/main/java/com/mango/core/room/pk/bean/RoomPKInvitedUpMicMember.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/RoomPKInvitedUpMicMember.java rename to core/src/main/java/com/mango/core/room/pk/bean/RoomPKInvitedUpMicMember.java index 3e5c0b9ba..f46297278 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/RoomPKInvitedUpMicMember.java +++ b/core/src/main/java/com/mango/core/room/pk/bean/RoomPKInvitedUpMicMember.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.mango.core.room.pk.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/RoomPkData.java b/core/src/main/java/com/mango/core/room/pk/bean/RoomPkData.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/RoomPkData.java rename to core/src/main/java/com/mango/core/room/pk/bean/RoomPkData.java index e4b268214..d3f44a615 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/RoomPkData.java +++ b/core/src/main/java/com/mango/core/room/pk/bean/RoomPkData.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.mango.core.room.pk.bean; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/request/CreatePKMember.java b/core/src/main/java/com/mango/core/room/pk/bean/request/CreatePKMember.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/request/CreatePKMember.java rename to core/src/main/java/com/mango/core/room/pk/bean/request/CreatePKMember.java index 896c53902..2c614c346 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/request/CreatePKMember.java +++ b/core/src/main/java/com/mango/core/room/pk/bean/request/CreatePKMember.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean.request; +package com.mango.core.room.pk.bean.request; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/response/RespPKData.java b/core/src/main/java/com/mango/core/room/pk/bean/response/RespPKData.java similarity index 57% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/response/RespPKData.java rename to core/src/main/java/com/mango/core/room/pk/bean/response/RespPKData.java index b8af5bef7..5babf4949 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/response/RespPKData.java +++ b/core/src/main/java/com/mango/core/room/pk/bean/response/RespPKData.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.pk.bean.response; +package com.mango.core.room.pk.bean.response; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; +import com.mango.core.room.pk.bean.RoomPkData; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKDataUpdateEvent.java b/core/src/main/java/com/mango/core/room/pk/event/PKDataUpdateEvent.java similarity index 70% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKDataUpdateEvent.java rename to core/src/main/java/com/mango/core/room/pk/event/PKDataUpdateEvent.java index f68be068b..bd132a8f7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKDataUpdateEvent.java +++ b/core/src/main/java/com/mango/core/room/pk/event/PKDataUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.event; +package com.mango.core.room.pk.event; /** * @author jack diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKStateEvent.java b/core/src/main/java/com/mango/core/room/pk/event/PKStateEvent.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKStateEvent.java rename to core/src/main/java/com/mango/core/room/pk/event/PKStateEvent.java index bb3eeb0b5..2cc16624c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKStateEvent.java +++ b/core/src/main/java/com/mango/core/room/pk/event/PKStateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.event; +package com.mango.core.room.pk.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKTimeFinishEvent.java b/core/src/main/java/com/mango/core/room/pk/event/PKTimeFinishEvent.java similarity index 63% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKTimeFinishEvent.java rename to core/src/main/java/com/mango/core/room/pk/event/PKTimeFinishEvent.java index 2fe149a35..d34a5f62b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKTimeFinishEvent.java +++ b/core/src/main/java/com/mango/core/room/pk/event/PKTimeFinishEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.event; +package com.mango.core.room.pk.event; /** * @author jack diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKTimeTickEvent.java b/core/src/main/java/com/mango/core/room/pk/event/PKTimeTickEvent.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKTimeTickEvent.java rename to core/src/main/java/com/mango/core/room/pk/event/PKTimeTickEvent.java index 075b20c01..4181a215c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKTimeTickEvent.java +++ b/core/src/main/java/com/mango/core/room/pk/event/PKTimeTickEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.event; +package com.mango.core.room.pk.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java b/core/src/main/java/com/mango/core/room/pk/model/IPkModel.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java rename to core/src/main/java/com/mango/core/room/pk/model/IPkModel.java index ec388f777..0f4619e98 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java +++ b/core/src/main/java/com/mango/core/room/pk/model/IPkModel.java @@ -1,15 +1,15 @@ -package com.yizhuan.xchat_android_core.room.pk.model; +package com.mango.core.room.pk.model; import androidx.annotation.Nullable; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo; -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.RoomPKInvitedUpMicMember; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.core.base.IModel; +import com.mango.core.room.pk.bean.PKMemberInfo; +import com.mango.core.room.pk.bean.PKRecordListInfo; +import com.mango.core.room.pk.bean.PKRespQueuingMicListInfo; +import com.mango.core.room.pk.bean.PKTeamInfo; +import com.mango.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.mango.core.room.pk.bean.RoomPkData; +import com.mango.core.user.bean.UserInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java b/core/src/main/java/com/mango/core/room/pk/model/PkModel.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java rename to core/src/main/java/com/mango/core/room/pk/model/PkModel.java index 0ea7dcda6..334a57dad 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java +++ b/core/src/main/java/com/mango/core/room/pk/model/PkModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.model; +package com.mango.core.room.pk.model; import android.annotation.SuppressLint; import android.os.CountDownTimer; @@ -10,45 +10,45 @@ import com.google.gson.Gson; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -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; -import com.yizhuan.xchat_android_core.gift.bean.GiftList; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo; -import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.pk.attachment.RoomPkAttachment; -import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo; -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.room.pk.bean.request.CreatePKMember; -import com.yizhuan.xchat_android_core.room.pk.bean.response.RespPKData; -import com.yizhuan.xchat_android_core.room.pk.event.PKDataUpdateEvent; -import com.yizhuan.xchat_android_core.room.pk.event.PKTimeFinishEvent; -import com.yizhuan.xchat_android_core.room.pk.event.PKTimeTickEvent; -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.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.RoomQueueInfo; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.gift.GiftModel; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.GiftList; +import com.mango.core.gift.bean.GiftMultiReceiverInfo; +import com.mango.core.gift.bean.GiftReceiveInfo; +import com.mango.core.gift.bean.GiftReceiver; +import com.mango.core.gift.bean.LuckyBagGifts; +import com.mango.core.gift.bean.MultiGiftReceiveInfo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.magic.MagicModel; +import com.mango.core.magic.bean.MagicInfo; +import com.mango.core.magic.bean.MagicReceivedInfo; +import com.mango.core.magic.bean.MultiMagicReceivedInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.room.pk.attachment.RoomPkAttachment; +import com.mango.core.room.pk.bean.PKMemberInfo; +import com.mango.core.room.pk.bean.PKRecordListInfo; +import com.mango.core.room.pk.bean.PKRespQueuingMicListInfo; +import com.mango.core.room.pk.bean.PKTeamInfo; +import com.mango.core.room.pk.bean.PKTeamMember; +import com.mango.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.mango.core.room.pk.bean.RoomPkData; +import com.mango.core.room.pk.bean.request.CreatePKMember; +import com.mango.core.room.pk.bean.response.RespPKData; +import com.mango.core.room.pk.event.PKDataUpdateEvent; +import com.mango.core.room.pk.event.PKTimeFinishEvent; +import com.mango.core.room.pk.event.PKTimeTickEvent; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/ConsumeInfo.java b/core/src/main/java/com/mango/core/room/queue/bean/ConsumeInfo.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/ConsumeInfo.java rename to core/src/main/java/com/mango/core/room/queue/bean/ConsumeInfo.java index 7952e3f9f..1ae985af1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/ConsumeInfo.java +++ b/core/src/main/java/com/mango/core/room/queue/bean/ConsumeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.queue.bean; +package com.mango.core.room.queue.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/MicMemberInfo.java b/core/src/main/java/com/mango/core/room/queue/bean/MicMemberInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/MicMemberInfo.java rename to core/src/main/java/com/mango/core/room/queue/bean/MicMemberInfo.java index 4461a9d7c..1c0dbd3e3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/MicMemberInfo.java +++ b/core/src/main/java/com/mango/core/room/queue/bean/MicMemberInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.queue.bean; +package com.mango.core.room.queue.bean; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomConsumeInfo.java b/core/src/main/java/com/mango/core/room/queue/bean/RoomConsumeInfo.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomConsumeInfo.java rename to core/src/main/java/com/mango/core/room/queue/bean/RoomConsumeInfo.java index eeb1f5991..7a83f2dff 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomConsumeInfo.java +++ b/core/src/main/java/com/mango/core/room/queue/bean/RoomConsumeInfo.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.queue.bean; +package com.mango.core.room.queue.bean; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.noble.NobleInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/attachment/QueuingMicAttachment.java b/core/src/main/java/com/mango/core/room/queuing_mic/attachment/QueuingMicAttachment.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/attachment/QueuingMicAttachment.java rename to core/src/main/java/com/mango/core/room/queuing_mic/attachment/QueuingMicAttachment.java index e47a7c7e2..d2e1ed7d5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/attachment/QueuingMicAttachment.java +++ b/core/src/main/java/com/mango/core/room/queuing_mic/attachment/QueuingMicAttachment.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.attachment; +package com.mango.core.room.queuing_mic.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicInfo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.room.queuing_mic.bean.QueuingMicInfo; public class QueuingMicAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/GroupType.java b/core/src/main/java/com/mango/core/room/queuing_mic/bean/GroupType.java similarity index 59% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/GroupType.java rename to core/src/main/java/com/mango/core/room/queuing_mic/bean/GroupType.java index bd24aba37..9fc7ee3fb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/GroupType.java +++ b/core/src/main/java/com/mango/core/room/queuing_mic/bean/GroupType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.bean; +package com.mango.core.room.queuing_mic.bean; public interface GroupType { int NORMAL = 1; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/QueuingMicInfo.java b/core/src/main/java/com/mango/core/room/queuing_mic/bean/QueuingMicInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/QueuingMicInfo.java rename to core/src/main/java/com/mango/core/room/queuing_mic/bean/QueuingMicInfo.java index 7ba80cb8c..1f7fbb91a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/QueuingMicInfo.java +++ b/core/src/main/java/com/mango/core/room/queuing_mic/bean/QueuingMicInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.bean; +package com.mango.core.room.queuing_mic.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/QueuingMicMemeberInfo.java b/core/src/main/java/com/mango/core/room/queuing_mic/bean/QueuingMicMemeberInfo.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/QueuingMicMemeberInfo.java rename to core/src/main/java/com/mango/core/room/queuing_mic/bean/QueuingMicMemeberInfo.java index 871b18305..b7fca199f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/QueuingMicMemeberInfo.java +++ b/core/src/main/java/com/mango/core/room/queuing_mic/bean/QueuingMicMemeberInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.bean; +package com.mango.core.room.queuing_mic.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/RespQueuingMicListInfo.java b/core/src/main/java/com/mango/core/room/queuing_mic/bean/RespQueuingMicListInfo.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/RespQueuingMicListInfo.java rename to core/src/main/java/com/mango/core/room/queuing_mic/bean/RespQueuingMicListInfo.java index 195cc68a1..8d05fd049 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/RespQueuingMicListInfo.java +++ b/core/src/main/java/com/mango/core/room/queuing_mic/bean/RespQueuingMicListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.bean; +package com.mango.core.room.queuing_mic.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/HasAnimationEffect.java b/core/src/main/java/com/mango/core/room/queuing_mic/event/HasAnimationEffect.java similarity index 59% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/HasAnimationEffect.java rename to core/src/main/java/com/mango/core/room/queuing_mic/event/HasAnimationEffect.java index 4adfa6a9d..de3e79fc8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/HasAnimationEffect.java +++ b/core/src/main/java/com/mango/core/room/queuing_mic/event/HasAnimationEffect.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.event; +package com.mango.core.room.queuing_mic.event; /** * 房间内更新头部开关特效图标事件 diff --git a/core/src/main/java/com/mango/core/room/queuing_mic/event/QueuingMicEmptyEvent.java b/core/src/main/java/com/mango/core/room/queuing_mic/event/QueuingMicEmptyEvent.java new file mode 100644 index 000000000..4beb8f701 --- /dev/null +++ b/core/src/main/java/com/mango/core/room/queuing_mic/event/QueuingMicEmptyEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.room.queuing_mic.event; + +public class QueuingMicEmptyEvent { +} diff --git a/core/src/main/java/com/mango/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java b/core/src/main/java/com/mango/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java new file mode 100644 index 000000000..744696c4a --- /dev/null +++ b/core/src/main/java/com/mango/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.room.queuing_mic.event; + +public class QueuingMicNotEmptyEvent { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/IRecommendCardModel.java b/core/src/main/java/com/mango/core/room/recommendpos/IRecommendCardModel.java similarity index 56% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/IRecommendCardModel.java rename to core/src/main/java/com/mango/core/room/recommendpos/IRecommendCardModel.java index a69ee8d2d..2de7764fa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/IRecommendCardModel.java +++ b/core/src/main/java/com/mango/core/room/recommendpos/IRecommendCardModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.recommendpos; +package com.mango.core.room.recommendpos; -import com.yizhuan.xchat_android_core.room.recommendpos.bean.RecommendCard; +import com.mango.core.room.recommendpos.bean.RecommendCard; import java.util.List; @@ -15,7 +15,7 @@ public interface IRecommendCardModel { /** * 我的推荐卡接口 * - * @param status {@link com.yizhuan.xchat_android_core.room.recommendpos.bean.RcmdCardType} + * @param status {@link com.mango.core.room.recommendpos.bean.RcmdCardType} * @return list */ Single> getBagList(int status, int page, int pageSize); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/RecommendCardModel.java b/core/src/main/java/com/mango/core/room/recommendpos/RecommendCardModel.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/RecommendCardModel.java rename to core/src/main/java/com/mango/core/room/recommendpos/RecommendCardModel.java index 70a911ba1..cf262c3db 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/RecommendCardModel.java +++ b/core/src/main/java/com/mango/core/room/recommendpos/RecommendCardModel.java @@ -1,17 +1,16 @@ -package com.yizhuan.xchat_android_core.room.recommendpos; +package com.mango.core.room.recommendpos; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.recommendpos.bean.RecommendCard; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.recommendpos.bean.RecommendCard; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.ArrayList; import java.util.List; import io.reactivex.Single; -import retrofit2.http.GET; import retrofit2.http.POST; import retrofit2.http.Query; @@ -34,7 +33,7 @@ public class RecommendCardModel extends BaseModel implements IRecommendCardModel /** * 我的推荐卡接口 * - * @param status {@link com.yizhuan.xchat_android_core.room.recommendpos.bean.RcmdCardType} + * @param status {@link com.mango.core.room.recommendpos.bean.RcmdCardType} * @return list */ @Override @@ -47,7 +46,7 @@ public class RecommendCardModel extends BaseModel implements IRecommendCardModel /** * 我的推荐卡接口 * - * @param status {@link com.yizhuan.xchat_android_core.room.recommendpos.bean.RcmdCardType} + * @param status {@link com.mango.core.room.recommendpos.bean.RcmdCardType} */ @POST("recommend/backpack") Single>> getBagList(@Query("uid") long uid, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/bean/RcmdCardType.java b/core/src/main/java/com/mango/core/room/recommendpos/bean/RcmdCardType.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/bean/RcmdCardType.java rename to core/src/main/java/com/mango/core/room/recommendpos/bean/RcmdCardType.java index 3f7927c3f..d561281a7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/bean/RcmdCardType.java +++ b/core/src/main/java/com/mango/core/room/recommendpos/bean/RcmdCardType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.recommendpos.bean; +package com.mango.core.room.recommendpos.bean; /** * Created by lvzebiao on 2019/1/31. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/bean/RecommendCard.java b/core/src/main/java/com/mango/core/room/recommendpos/bean/RecommendCard.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/bean/RecommendCard.java rename to core/src/main/java/com/mango/core/room/recommendpos/bean/RecommendCard.java index f8b695832..76b572c12 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/bean/RecommendCard.java +++ b/core/src/main/java/com/mango/core/room/recommendpos/bean/RecommendCard.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.recommendpos.bean; +package com.mango.core.room.recommendpos.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/bean/BoxRankingInfo.java b/core/src/main/java/com/mango/core/room/treasure_box/bean/BoxRankingInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/bean/BoxRankingInfo.java rename to core/src/main/java/com/mango/core/room/treasure_box/bean/BoxRankingInfo.java index 61eb0917b..abebbc9f8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/bean/BoxRankingInfo.java +++ b/core/src/main/java/com/mango/core/room/treasure_box/bean/BoxRankingInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.treasure_box.bean; +package com.mango.core.room.treasure_box.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/mango/core/room/treasure_box/event/RefreshBoxRankingEvent.java b/core/src/main/java/com/mango/core/room/treasure_box/event/RefreshBoxRankingEvent.java new file mode 100644 index 000000000..d06fd09d9 --- /dev/null +++ b/core/src/main/java/com/mango/core/room/treasure_box/event/RefreshBoxRankingEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.room.treasure_box.event; + +public class RefreshBoxRankingEvent { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/settings/ISettingsModel.java b/core/src/main/java/com/mango/core/settings/ISettingsModel.java similarity index 66% rename from core/src/main/java/com/yizhuan/xchat_android_core/settings/ISettingsModel.java rename to core/src/main/java/com/mango/core/settings/ISettingsModel.java index adfbfa2a0..47ad80fd0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/settings/ISettingsModel.java +++ b/core/src/main/java/com/mango/core/settings/ISettingsModel.java @@ -1,13 +1,11 @@ -package com.yizhuan.xchat_android_core.settings; +package com.mango.core.settings; -import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.settings.bean.SysAccount; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.settings.bean.SysAccount; +import com.mango.core.user.bean.UserInfo; import io.reactivex.Single; -import retrofit2.http.Field; public interface ISettingsModel extends IModel { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/settings/SettingsModel.java b/core/src/main/java/com/mango/core/settings/SettingsModel.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/settings/SettingsModel.java rename to core/src/main/java/com/mango/core/settings/SettingsModel.java index 674f5f2c6..b8fdd625f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/settings/SettingsModel.java +++ b/core/src/main/java/com/mango/core/settings/SettingsModel.java @@ -1,15 +1,15 @@ -package com.yizhuan.xchat_android_core.settings; +package com.mango.core.settings; import com.google.gson.JsonElement; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.RequestCallback; import com.netease.nimlib.sdk.friend.FriendService; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.settings.bean.SysAccount; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.settings.bean.SysAccount; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import io.reactivex.SingleOnSubscribe; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/settings/bean/SysAccount.java b/core/src/main/java/com/mango/core/settings/bean/SysAccount.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/settings/bean/SysAccount.java rename to core/src/main/java/com/mango/core/settings/bean/SysAccount.java index 9533a623c..54a6ff15f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/settings/bean/SysAccount.java +++ b/core/src/main/java/com/mango/core/settings/bean/SysAccount.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.settings.bean; +package com.mango.core.settings.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/IShareCoreClient.java b/core/src/main/java/com/mango/core/share/IShareCoreClient.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/IShareCoreClient.java rename to core/src/main/java/com/mango/core/share/IShareCoreClient.java index c495e0471..baf6e0f9f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/IShareCoreClient.java +++ b/core/src/main/java/com/mango/core/share/IShareCoreClient.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.share; +package com.mango.core.share; -import com.yizhuan.xchat_android_library.coremanager.ICoreClient; +import com.mango.xchat_android_library.coremanager.ICoreClient; /** * Created by chenran on 2017/8/14. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/IShareModel.java b/core/src/main/java/com/mango/core/share/IShareModel.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/IShareModel.java rename to core/src/main/java/com/mango/core/share/IShareModel.java index 85133d481..61d32816a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/IShareModel.java +++ b/core/src/main/java/com/mango/core/share/IShareModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.share; +package com.mango.core.share; -import com.yizhuan.xchat_android_core.share.bean.ShareCommonInfo; -import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo; -import com.yizhuan.xchat_android_library.coremanager.IBaseCore; +import com.mango.core.share.bean.ShareCommonInfo; +import com.mango.core.web.bean.WebJsBeanInfo; +import com.mango.xchat_android_library.coremanager.IBaseCore; import cn.sharesdk.framework.Platform; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java b/core/src/main/java/com/mango/core/share/ShareModel.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java rename to core/src/main/java/com/mango/core/share/ShareModel.java index 4ff6ff4dc..13485d1a3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java +++ b/core/src/main/java/com/mango/core/share/ShareModel.java @@ -1,31 +1,26 @@ -package com.yizhuan.xchat_android_core.share; +package com.mango.core.share; import android.annotation.SuppressLint; -import android.net.Uri; -import android.text.Html; -import android.text.TextUtils; -import android.util.Log; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.result.ShareRedPacketResult; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomTipAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.share.bean.ShareCommonInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.UriProvider; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.result.ShareRedPacketResult; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.RoomTipAttachment; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.share.bean.ShareCommonInfo; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.web.bean.WebJsBeanInfo; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.SingleToastUtil; -import java.net.URL; import java.net.URLEncoder; import java.util.HashMap; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingFamilyInfo.java b/core/src/main/java/com/mango/core/share/bean/InAppSharingFamilyInfo.java similarity index 66% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingFamilyInfo.java rename to core/src/main/java/com/mango/core/share/bean/InAppSharingFamilyInfo.java index d0f30c649..f96316901 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingFamilyInfo.java +++ b/core/src/main/java/com/mango/core/share/bean/InAppSharingFamilyInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.share.bean; +package com.mango.core.share.bean; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.mango.core.family.bean.FamilyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingInfo.java b/core/src/main/java/com/mango/core/share/bean/InAppSharingInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingInfo.java rename to core/src/main/java/com/mango/core/share/bean/InAppSharingInfo.java index c3c73928a..4cf723571 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingInfo.java +++ b/core/src/main/java/com/mango/core/share/bean/InAppSharingInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.share.bean; +package com.mango.core.share.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingMiniWorldInfo.java b/core/src/main/java/com/mango/core/share/bean/InAppSharingMiniWorldInfo.java similarity index 60% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingMiniWorldInfo.java rename to core/src/main/java/com/mango/core/share/bean/InAppSharingMiniWorldInfo.java index 27560b1be..ec941b1fe 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingMiniWorldInfo.java +++ b/core/src/main/java/com/mango/core/share/bean/InAppSharingMiniWorldInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.share.bean; +package com.mango.core.share.bean; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; +import com.mango.core.miniworld.bean.MiniWorldDetailInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingRoomInfo.java b/core/src/main/java/com/mango/core/share/bean/InAppSharingRoomInfo.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingRoomInfo.java rename to core/src/main/java/com/mango/core/share/bean/InAppSharingRoomInfo.java index ae2e26350..eadfc1a2a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingRoomInfo.java +++ b/core/src/main/java/com/mango/core/share/bean/InAppSharingRoomInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.share.bean; +package com.mango.core.share.bean; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.mango.core.room.bean.RoomInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingTeamInfo.java b/core/src/main/java/com/mango/core/share/bean/InAppSharingTeamInfo.java similarity index 66% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingTeamInfo.java rename to core/src/main/java/com/mango/core/share/bean/InAppSharingTeamInfo.java index 5dc66ee9f..94992602f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingTeamInfo.java +++ b/core/src/main/java/com/mango/core/share/bean/InAppSharingTeamInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.share.bean; +package com.mango.core.share.bean; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; +import com.mango.core.team.bean.TeamInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/SessionType.java b/core/src/main/java/com/mango/core/share/bean/SessionType.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/bean/SessionType.java rename to core/src/main/java/com/mango/core/share/bean/SessionType.java index 3db629caf..aa1a927c1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/SessionType.java +++ b/core/src/main/java/com/mango/core/share/bean/SessionType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.share.bean; +package com.mango.core.share.bean; import android.util.SparseArray; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/ShareCommonInfo.java b/core/src/main/java/com/mango/core/share/bean/ShareCommonInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/bean/ShareCommonInfo.java rename to core/src/main/java/com/mango/core/share/bean/ShareCommonInfo.java index 16dd1de6f..f7643bbd2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/ShareCommonInfo.java +++ b/core/src/main/java/com/mango/core/share/bean/ShareCommonInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.share.bean; +package com.mango.core.share.bean; import lombok.Getter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillNotifyEntity.kt b/core/src/main/java/com/mango/core/skill/entity/SkillNotifyEntity.kt similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillNotifyEntity.kt rename to core/src/main/java/com/mango/core/skill/entity/SkillNotifyEntity.kt index d6b344484..32ca23683 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillNotifyEntity.kt +++ b/core/src/main/java/com/mango/core/skill/entity/SkillNotifyEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.skill.entity +package com.mango.core.skill.entity data class SkillNotifyEntity(val layout: LayoutBean) diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillPostServerEntity.kt b/core/src/main/java/com/mango/core/skill/entity/SkillPostServerEntity.kt similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillPostServerEntity.kt rename to core/src/main/java/com/mango/core/skill/entity/SkillPostServerEntity.kt index 44a296a66..a2b6769f6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillPostServerEntity.kt +++ b/core/src/main/java/com/mango/core/skill/entity/SkillPostServerEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.skill.entity +package com.mango.core.skill.entity /** * ...... diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillPropertyEntity.kt b/core/src/main/java/com/mango/core/skill/entity/SkillPropertyEntity.kt similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillPropertyEntity.kt rename to core/src/main/java/com/mango/core/skill/entity/SkillPropertyEntity.kt index 13316d1a1..664711ff0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillPropertyEntity.kt +++ b/core/src/main/java/com/mango/core/skill/entity/SkillPropertyEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.skill.entity +package com.mango.core.skill.entity import com.google.gson.annotations.SerializedName diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillRecordEntity.kt b/core/src/main/java/com/mango/core/skill/entity/SkillRecordEntity.kt similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillRecordEntity.kt rename to core/src/main/java/com/mango/core/skill/entity/SkillRecordEntity.kt index a65b2756e..a972fa0e9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillRecordEntity.kt +++ b/core/src/main/java/com/mango/core/skill/entity/SkillRecordEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.skill.entity +package com.mango.core.skill.entity import com.google.gson.annotations.SerializedName diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillTypeEntity.kt b/core/src/main/java/com/mango/core/skill/entity/SkillTypeEntity.kt similarity index 60% rename from core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillTypeEntity.kt rename to core/src/main/java/com/mango/core/skill/entity/SkillTypeEntity.kt index 0100c773a..b1e0d9b34 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillTypeEntity.kt +++ b/core/src/main/java/com/mango/core/skill/entity/SkillTypeEntity.kt @@ -1,3 +1,3 @@ -package com.yizhuan.xchat_android_core.skill.entity +package com.mango.core.skill.entity data class SkillTypeEntity(val cardId: Int, val name: String, val icon: String) \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/skill/event/SkillEvent.java b/core/src/main/java/com/mango/core/skill/event/SkillEvent.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/skill/event/SkillEvent.java rename to core/src/main/java/com/mango/core/skill/event/SkillEvent.java index 750a91734..ecd1ad9c9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/event/SkillEvent.java +++ b/core/src/main/java/com/mango/core/skill/event/SkillEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.skill.event; +package com.mango.core.skill.event; public class SkillEvent { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatLogKey.java b/core/src/main/java/com/mango/core/statistic/StatLogKey.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatLogKey.java rename to core/src/main/java/com/mango/core/statistic/StatLogKey.java index fbb075088..d7526b3b5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatLogKey.java +++ b/core/src/main/java/com/mango/core/statistic/StatLogKey.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.statistic; +package com.mango.core.statistic; /** *

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java b/core/src/main/java/com/mango/core/statistic/StatisticManager.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java rename to core/src/main/java/com/mango/core/statistic/StatisticManager.java index 885a0e38b..4eae29a29 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java +++ b/core/src/main/java/com/mango/core/statistic/StatisticManager.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.statistic; +package com.mango.core.statistic; import android.content.Context; import androidx.annotation.Keep; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.util.Map; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java b/core/src/main/java/com/mango/core/statistic/StatisticModel.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java rename to core/src/main/java/com/mango/core/statistic/StatisticModel.java index 8baca3f8c..5feadfde6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java +++ b/core/src/main/java/com/mango/core/statistic/StatisticModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.statistic; +package com.mango.core.statistic; import android.content.Context; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java b/core/src/main/java/com/mango/core/statistic/protocol/StatisticsProtocol.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java rename to core/src/main/java/com/mango/core/statistic/protocol/StatisticsProtocol.java index 50f060c1a..d638ce104 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java +++ b/core/src/main/java/com/mango/core/statistic/protocol/StatisticsProtocol.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.statistic.protocol; +package com.mango.core.statistic.protocol; /** * @author jiajie diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/RespTeamMemberInfo.java b/core/src/main/java/com/mango/core/team/bean/RespTeamMemberInfo.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/bean/RespTeamMemberInfo.java rename to core/src/main/java/com/mango/core/team/bean/RespTeamMemberInfo.java index 8f05c00a1..75919e68e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/RespTeamMemberInfo.java +++ b/core/src/main/java/com/mango/core/team/bean/RespTeamMemberInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.team.bean; +package com.mango.core.team.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamEvent.java b/core/src/main/java/com/mango/core/team/bean/TeamEvent.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamEvent.java rename to core/src/main/java/com/mango/core/team/bean/TeamEvent.java index 8c9bf782d..8d07eae35 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamEvent.java +++ b/core/src/main/java/com/mango/core/team/bean/TeamEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.team.bean; +package com.mango.core.team.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamInfo.java b/core/src/main/java/com/mango/core/team/bean/TeamInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamInfo.java rename to core/src/main/java/com/mango/core/team/bean/TeamInfo.java index f7c10be7d..e5ede9755 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamInfo.java +++ b/core/src/main/java/com/mango/core/team/bean/TeamInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.team.bean; +package com.mango.core.team.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamMemberInfo.java b/core/src/main/java/com/mango/core/team/bean/TeamMemberInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamMemberInfo.java rename to core/src/main/java/com/mango/core/team/bean/TeamMemberInfo.java index c83521f95..d71947257 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamMemberInfo.java +++ b/core/src/main/java/com/mango/core/team/bean/TeamMemberInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.team.bean; +package com.mango.core.team.bean; -import com.yizhuan.xchat_android_core.level.UserLevelVo; +import com.mango.core.level.UserLevelVo; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamTransactionInfo.java b/core/src/main/java/com/mango/core/team/bean/TeamTransactionInfo.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamTransactionInfo.java rename to core/src/main/java/com/mango/core/team/bean/TeamTransactionInfo.java index d62b65f40..b8a04bf8a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamTransactionInfo.java +++ b/core/src/main/java/com/mango/core/team/bean/TeamTransactionInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.team.bean; +package com.mango.core.team.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamTransactionRecordInfo.java b/core/src/main/java/com/mango/core/team/bean/TeamTransactionRecordInfo.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamTransactionRecordInfo.java rename to core/src/main/java/com/mango/core/team/bean/TeamTransactionRecordInfo.java index 86fbb6b99..ca8360e0e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamTransactionRecordInfo.java +++ b/core/src/main/java/com/mango/core/team/bean/TeamTransactionRecordInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.team.bean; +package com.mango.core.team.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/model/ITeamModel.java b/core/src/main/java/com/mango/core/team/model/ITeamModel.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/model/ITeamModel.java rename to core/src/main/java/com/mango/core/team/model/ITeamModel.java index 940cfa928..57c3fcbc9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/model/ITeamModel.java +++ b/core/src/main/java/com/mango/core/team/model/ITeamModel.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.team.model; +package com.mango.core.team.model; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyRecordsInfo; -import com.yizhuan.xchat_android_core.team.bean.RespTeamMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.luckymoney.LuckyMoneyInfo; +import com.mango.core.luckymoney.LuckyMoneyRecordsInfo; +import com.mango.core.team.bean.RespTeamMemberInfo; +import com.mango.core.team.bean.TeamInfo; +import com.mango.core.team.bean.TeamMemberInfo; +import com.mango.core.team.bean.TeamTransactionInfo; import java.util.List; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/model/TeamModel.java b/core/src/main/java/com/mango/core/team/model/TeamModel.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/model/TeamModel.java rename to core/src/main/java/com/mango/core/team/model/TeamModel.java index e678a3c26..79f2bdddb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/model/TeamModel.java +++ b/core/src/main/java/com/mango/core/team/model/TeamModel.java @@ -1,22 +1,21 @@ -package com.yizhuan.xchat_android_core.team.model; +package com.mango.core.team.model; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.msg.MsgService; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyRecordsInfo; -import com.yizhuan.xchat_android_core.team.bean.RespTeamMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionInfo; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.family.model.FamilyModel; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.luckymoney.LuckyMoneyInfo; +import com.mango.core.luckymoney.LuckyMoneyRecordsInfo; +import com.mango.core.team.bean.RespTeamMemberInfo; +import com.mango.core.team.bean.TeamInfo; +import com.mango.core.team.bean.TeamMemberInfo; +import com.mango.core.team.bean.TeamTransactionInfo; -import java.util.Arrays; import java.util.Hashtable; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/AttentionModel.java b/core/src/main/java/com/mango/core/user/AttentionModel.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/AttentionModel.java rename to core/src/main/java/com/mango/core/user/AttentionModel.java index bacb6be00..0a6358590 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/AttentionModel.java +++ b/core/src/main/java/com/mango/core/user/AttentionModel.java @@ -1,15 +1,12 @@ -package com.yizhuan.xchat_android_core.user; +package com.mango.core.user; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.AttentionListResult; -import com.yizhuan.xchat_android_core.bean.response.result.FansListResult; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.coremanager.AbstractBaseCore; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.result.AttentionListResult; +import com.mango.core.bean.response.result.FansListResult; +import com.mango.core.user.bean.AttentionInfo; +import com.mango.core.user.bean.FansListInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/IAttentionModel.java b/core/src/main/java/com/mango/core/user/IAttentionModel.java similarity index 65% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/IAttentionModel.java rename to core/src/main/java/com/mango/core/user/IAttentionModel.java index 9f2e6d4ce..4925ec9c1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/IAttentionModel.java +++ b/core/src/main/java/com/mango/core/user/IAttentionModel.java @@ -1,9 +1,8 @@ -package com.yizhuan.xchat_android_core.user; +package com.mango.core.user; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_library.coremanager.IBaseCore; +import com.mango.core.base.IModel; +import com.mango.core.user.bean.AttentionInfo; +import com.mango.core.user.bean.FansListInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserDynamicModel.java b/core/src/main/java/com/mango/core/user/IUserDynamicModel.java similarity index 65% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/IUserDynamicModel.java rename to core/src/main/java/com/mango/core/user/IUserDynamicModel.java index 2dac5cb21..634fd2d91 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserDynamicModel.java +++ b/core/src/main/java/com/mango/core/user/IUserDynamicModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.user; +package com.mango.core.user; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; +import com.mango.core.base.IModel; +import com.mango.core.community.bean.WorldDynamicBean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java b/core/src/main/java/com/mango/core/user/IUserModel.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java rename to core/src/main/java/com/mango/core/user/IUserModel.java index b269a1dd2..3ed107a91 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java +++ b/core/src/main/java/com/mango/core/user/IUserModel.java @@ -1,19 +1,19 @@ -package com.yizhuan.xchat_android_core.user; +package com.mango.core.user; import androidx.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.home.bean.VisitorInfo; -import com.yizhuan.xchat_android_core.user.bean.GiftAchievementInfo; -import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo; -import com.yizhuan.xchat_android_core.user.bean.NewUserInfo; -import com.yizhuan.xchat_android_core.user.bean.ProtocolInfo; -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo; -import com.yizhuan.xchat_android_core.user.bean.UserGameInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.bean.UserRandomConfig; +import com.mango.core.base.IModel; +import com.mango.core.bean.RoomHistoryInfo; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.home.bean.VisitorInfo; +import com.mango.core.user.bean.GiftAchievementInfo; +import com.mango.core.user.bean.GiftWallInfo; +import com.mango.core.user.bean.NewUserInfo; +import com.mango.core.user.bean.ProtocolInfo; +import com.mango.core.user.bean.UserDetailInfo; +import com.mango.core.user.bean.UserGameInfo; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.user.bean.UserRandomConfig; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserDynamicModel.java b/core/src/main/java/com/mango/core/user/UserDynamicModel.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/UserDynamicModel.java rename to core/src/main/java/com/mango/core/user/UserDynamicModel.java index bf12ff04f..8a5c5167e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserDynamicModel.java +++ b/core/src/main/java/com/mango/core/user/UserDynamicModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.user; +package com.mango.core.user; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java b/core/src/main/java/com/mango/core/user/UserInfoUiMgr.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java rename to core/src/main/java/com/mango/core/user/UserInfoUiMgr.java index dc25f4b93..7e3d0fd5b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java +++ b/core/src/main/java/com/mango/core/user/UserInfoUiMgr.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.user; +package com.mango.core.user; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.core.user.bean.UserInfo; /** * 个人主页/客态页用户信息监听 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java b/core/src/main/java/com/mango/core/user/UserModel.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java rename to core/src/main/java/com/mango/core/user/UserModel.java index 34a25aee9..b9d8e2546 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java +++ b/core/src/main/java/com/mango/core/user/UserModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user; +package com.mango.core.user; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -7,39 +7,39 @@ import android.util.LruCache; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.GiftWallListResult; -import com.yizhuan.xchat_android_core.bean.response.result.UserListResult; -import com.yizhuan.xchat_android_core.bean.response.result.UserResult; -import com.yizhuan.xchat_android_core.home.bean.VisitorInfo; -import com.yizhuan.xchat_android_core.level.event.CharmLevelUpEvent; -import com.yizhuan.xchat_android_core.level.event.LevelUpEvent; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.GiftAchievementInfo; -import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo; -import com.yizhuan.xchat_android_core.user.bean.NewUserInfo; -import com.yizhuan.xchat_android_core.user.bean.ProtocolInfo; -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo; -import com.yizhuan.xchat_android_core.user.bean.UserGameInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.bean.UserRandomConfig; -import com.yizhuan.xchat_android_core.user.event.CurrentUserInfoCompleteEvent; -import com.yizhuan.xchat_android_core.user.event.CurrentUserInfoCompleteFailEvent; -import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; -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.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.StringUtils; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.event.LoginEvent; +import com.mango.core.auth.event.LogoutEvent; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.RoomHistoryInfo; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.bean.response.result.GiftWallListResult; +import com.mango.core.bean.response.result.UserListResult; +import com.mango.core.bean.response.result.UserResult; +import com.mango.core.home.bean.VisitorInfo; +import com.mango.core.level.event.CharmLevelUpEvent; +import com.mango.core.level.event.LevelUpEvent; +import com.mango.core.noble.NobleUtil; +import com.mango.core.user.bean.GiftAchievementInfo; +import com.mango.core.user.bean.GiftWallInfo; +import com.mango.core.user.bean.NewUserInfo; +import com.mango.core.user.bean.ProtocolInfo; +import com.mango.core.user.bean.UserDetailInfo; +import com.mango.core.user.bean.UserGameInfo; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.user.bean.UserRandomConfig; +import com.mango.core.user.event.CurrentUserInfoCompleteEvent; +import com.mango.core.user.event.CurrentUserInfoCompleteFailEvent; +import com.mango.core.user.event.LoadLoginUserInfoEvent; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.core.user.event.NeedBindPhoneEvent; +import com.mango.core.user.event.NeedCompleteInfoEvent; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.StringUtils; +import com.mango.xchat_android_library.utils.codec.DESUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionInfo.java b/core/src/main/java/com/mango/core/user/bean/AttentionInfo.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionInfo.java rename to core/src/main/java/com/mango/core/user/bean/AttentionInfo.java index 799d038aa..43679d042 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/AttentionInfo.java @@ -1,16 +1,14 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.noble.NobleInfo; +import com.mango.core.room.bean.RoomInfo; +import com.mango.core.vip.UserVipInfo; import java.io.Serializable; import java.util.List; import lombok.Data; -import lombok.Getter; -import lombok.Setter; /** * Created by Administrator on 2017/7/8 0008. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionItem.java b/core/src/main/java/com/mango/core/user/bean/AttentionItem.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionItem.java rename to core/src/main/java/com/mango/core/user/bean/AttentionItem.java index 178b7b1c5..6e0c2105f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionItem.java +++ b/core/src/main/java/com/mango/core/user/bean/AttentionItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseInfo.java b/core/src/main/java/com/mango/core/user/bean/BaseInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseInfo.java rename to core/src/main/java/com/mango/core/user/bean/BaseInfo.java index 81d820808..7047abd26 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/BaseInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import android.text.TextUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseUserInfo.java b/core/src/main/java/com/mango/core/user/bean/BaseUserInfo.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseUserInfo.java rename to core/src/main/java/com/mango/core/user/bean/BaseUserInfo.java index af4bd7b73..75a66907f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseUserInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/BaseUserInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.mango.core.vip.UserVipInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansInfo.java b/core/src/main/java/com/mango/core/user/bean/FansInfo.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansInfo.java rename to core/src/main/java/com/mango/core/user/bean/FansInfo.java index e7d11335d..529e8c1ed 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/FansInfo.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.noble.NobleInfo; +import com.mango.core.vip.UserVipInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansListInfo.java b/core/src/main/java/com/mango/core/user/bean/FansListInfo.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansListInfo.java rename to core/src/main/java/com/mango/core/user/bean/FansListInfo.java index 30902d5de..17ceb79a3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansListInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/FansListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfo.java b/core/src/main/java/com/mango/core/user/bean/GiftAchievementInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfo.java rename to core/src/main/java/com/mango/core/user/bean/GiftAchievementInfo.java index 155881e73..fe327af29 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/GiftAchievementInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfoSub.java b/core/src/main/java/com/mango/core/user/bean/GiftAchievementInfoSub.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfoSub.java rename to core/src/main/java/com/mango/core/user/bean/GiftAchievementInfoSub.java index c789c5a2c..009ce8766 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfoSub.java +++ b/core/src/main/java/com/mango/core/user/bean/GiftAchievementInfoSub.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementItem.java b/core/src/main/java/com/mango/core/user/bean/GiftAchievementItem.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementItem.java rename to core/src/main/java/com/mango/core/user/bean/GiftAchievementItem.java index 00b7d90ea..6a7fd4ab7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementItem.java +++ b/core/src/main/java/com/mango/core/user/bean/GiftAchievementItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftWallInfo.java b/core/src/main/java/com/mango/core/user/bean/GiftWallInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftWallInfo.java rename to core/src/main/java/com/mango/core/user/bean/GiftWallInfo.java index 2f85910fe..1b4fe0259 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftWallInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/GiftWallInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/InviteUserInfo.java b/core/src/main/java/com/mango/core/user/bean/InviteUserInfo.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/InviteUserInfo.java rename to core/src/main/java/com/mango/core/user/bean/InviteUserInfo.java index 200aba630..ca81b009e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/InviteUserInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/InviteUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/JoinWorldInfo.java b/core/src/main/java/com/mango/core/user/bean/JoinWorldInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/JoinWorldInfo.java rename to core/src/main/java/com/mango/core/user/bean/JoinWorldInfo.java index b31c4073f..5a9c74151 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/JoinWorldInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/JoinWorldInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/LiveTagInfo.java b/core/src/main/java/com/mango/core/user/bean/LiveTagInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/LiveTagInfo.java rename to core/src/main/java/com/mango/core/user/bean/LiveTagInfo.java index c3a70fb6f..4226a3d5a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/LiveTagInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/LiveTagInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/NewUserInfo.java b/core/src/main/java/com/mango/core/user/bean/NewUserInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/NewUserInfo.java rename to core/src/main/java/com/mango/core/user/bean/NewUserInfo.java index 689b0c71c..989474e67 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/NewUserInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/NewUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; public class NewUserInfo { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/ProtocolInfo.kt b/core/src/main/java/com/mango/core/user/bean/ProtocolInfo.kt similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/ProtocolInfo.kt rename to core/src/main/java/com/mango/core/user/bean/ProtocolInfo.kt index bcb929e64..4b91e0d94 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/ProtocolInfo.kt +++ b/core/src/main/java/com/mango/core/user/bean/ProtocolInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean +package com.mango.core.user.bean data class ProtocolInfo( val content: String = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/RadishWallInfo.java b/core/src/main/java/com/mango/core/user/bean/RadishWallInfo.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/RadishWallInfo.java rename to core/src/main/java/com/mango/core/user/bean/RadishWallInfo.java index 36c000a57..eb9f322cc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/RadishWallInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/RadishWallInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/SimpleUserInfo.java b/core/src/main/java/com/mango/core/user/bean/SimpleUserInfo.java similarity index 74% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/SimpleUserInfo.java rename to core/src/main/java/com/mango/core/user/bean/SimpleUserInfo.java index cbfcca1af..395476d0b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/SimpleUserInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/SimpleUserInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; -import com.yizhuan.xchat_android_core.level.UserLevelVo; +import com.mango.core.level.UserLevelVo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserDetailInfo.java b/core/src/main/java/com/mango/core/user/bean/UserDetailInfo.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserDetailInfo.java rename to core/src/main/java/com/mango/core/user/bean/UserDetailInfo.java index b1d3203e6..fdbccfc05 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserDetailInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/UserDetailInfo.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; +import com.mango.core.community.bean.WorldDynamicBean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserGameInfo.java b/core/src/main/java/com/mango/core/user/bean/UserGameInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserGameInfo.java rename to core/src/main/java/com/mango/core/user/bean/UserGameInfo.java index cc64dde34..d6f243bef 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserGameInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/UserGameInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; public class UserGameInfo { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java b/core/src/main/java/com/mango/core/user/bean/UserInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java rename to core/src/main/java/com/mango/core/user/bean/UserInfo.java index 0f45ab7d4..9e9505ef2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/UserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import android.graphics.Color; @@ -10,13 +10,13 @@ import android.text.style.ForegroundColorSpan; import androidx.annotation.Nullable; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.utils.StarUtils; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.noble.NobleInfo; +import com.mango.core.noble.NobleResourceType; +import com.mango.core.utils.StarUtils; +import com.mango.core.vip.UserVipInfo; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfoSkillEntity.kt b/core/src/main/java/com/mango/core/user/bean/UserInfoSkillEntity.kt similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfoSkillEntity.kt rename to core/src/main/java/com/mango/core/user/bean/UserInfoSkillEntity.kt index ba082aedd..d26ebfc24 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfoSkillEntity.kt +++ b/core/src/main/java/com/mango/core/user/bean/UserInfoSkillEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean +package com.mango.core.user.bean /** * { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserPhoto.java b/core/src/main/java/com/mango/core/user/bean/UserPhoto.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserPhoto.java rename to core/src/main/java/com/mango/core/user/bean/UserPhoto.java index 1464916ef..a4e40e0ec 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserPhoto.java +++ b/core/src/main/java/com/mango/core/user/bean/UserPhoto.java @@ -1,7 +1,6 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import java.io.Serializable; -import io.realm.RealmObject; import io.realm.annotations.PrimaryKey; /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRandomConfig.java b/core/src/main/java/com/mango/core/user/bean/UserRandomConfig.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRandomConfig.java rename to core/src/main/java/com/mango/core/user/bean/UserRandomConfig.java index 4d6f34b8d..3eb9cc11b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRandomConfig.java +++ b/core/src/main/java/com/mango/core/user/bean/UserRandomConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRankInfo.java b/core/src/main/java/com/mango/core/user/bean/UserRankInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRankInfo.java rename to core/src/main/java/com/mango/core/user/bean/UserRankInfo.java index e964c1420..5e08d49a8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRankInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/UserRankInfo.java @@ -1,9 +1,7 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import java.io.Serializable; -import io.realm.RealmObject; - /** * Created by huangmeng1 on 2018/5/17. */ diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRecommendRoomInfo.java b/core/src/main/java/com/mango/core/user/bean/UserRecommendRoomInfo.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRecommendRoomInfo.java rename to core/src/main/java/com/mango/core/user/bean/UserRecommendRoomInfo.java index 3c2ed8734..26f876ff7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRecommendRoomInfo.java +++ b/core/src/main/java/com/mango/core/user/bean/UserRecommendRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.mango.core.user.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/CurrentUserInfoCompleteEvent.java b/core/src/main/java/com/mango/core/user/event/CurrentUserInfoCompleteEvent.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/event/CurrentUserInfoCompleteEvent.java rename to core/src/main/java/com/mango/core/user/event/CurrentUserInfoCompleteEvent.java index f4bb7e1ed..3d4434bb3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/CurrentUserInfoCompleteEvent.java +++ b/core/src/main/java/com/mango/core/user/event/CurrentUserInfoCompleteEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.event; +package com.mango.core.user.event; /** * 补全资料成功的事件，一般来说，这个事件，整个用户周期只会触发一次 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/CurrentUserInfoCompleteFailEvent.java b/core/src/main/java/com/mango/core/user/event/CurrentUserInfoCompleteFailEvent.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/event/CurrentUserInfoCompleteFailEvent.java rename to core/src/main/java/com/mango/core/user/event/CurrentUserInfoCompleteFailEvent.java index e41535a04..2637eea8b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/CurrentUserInfoCompleteFailEvent.java +++ b/core/src/main/java/com/mango/core/user/event/CurrentUserInfoCompleteFailEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.event; +package com.mango.core.user.event; public class CurrentUserInfoCompleteFailEvent { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/LoadLoginUserInfoEvent.java b/core/src/main/java/com/mango/core/user/event/LoadLoginUserInfoEvent.java similarity index 66% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/event/LoadLoginUserInfoEvent.java rename to core/src/main/java/com/mango/core/user/event/LoadLoginUserInfoEvent.java index dcd1d7639..f8d62e332 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/LoadLoginUserInfoEvent.java +++ b/core/src/main/java/com/mango/core/user/event/LoadLoginUserInfoEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.event; +package com.mango.core.user.event; /** * @author jack diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/LoginUserInfoUpdateEvent.java b/core/src/main/java/com/mango/core/user/event/LoginUserInfoUpdateEvent.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/event/LoginUserInfoUpdateEvent.java rename to core/src/main/java/com/mango/core/user/event/LoginUserInfoUpdateEvent.java index 24938a389..ae5a56fb8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/LoginUserInfoUpdateEvent.java +++ b/core/src/main/java/com/mango/core/user/event/LoginUserInfoUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.event; +package com.mango.core.user.event; /** * @author jack diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedBindPhoneEvent.java b/core/src/main/java/com/mango/core/user/event/NeedBindPhoneEvent.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedBindPhoneEvent.java rename to core/src/main/java/com/mango/core/user/event/NeedBindPhoneEvent.java index 0750d28ad..53cf75a48 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedBindPhoneEvent.java +++ b/core/src/main/java/com/mango/core/user/event/NeedBindPhoneEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.event; +package com.mango.core.user.event; /** * 需要绑定手机号 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedCompleteInfoEvent.java b/core/src/main/java/com/mango/core/user/event/NeedCompleteInfoEvent.java similarity index 62% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedCompleteInfoEvent.java rename to core/src/main/java/com/mango/core/user/event/NeedCompleteInfoEvent.java index efaa5610d..e27058d12 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedCompleteInfoEvent.java +++ b/core/src/main/java/com/mango/core/user/event/NeedCompleteInfoEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.event; +package com.mango.core.user.event; /** * create by lvzebiao on 2018/8/31 diff --git a/core/src/main/java/com/mango/core/user/event/ShowMeEvent.kt b/core/src/main/java/com/mango/core/user/event/ShowMeEvent.kt new file mode 100644 index 000000000..dbb6ea5a6 --- /dev/null +++ b/core/src/main/java/com/mango/core/user/event/ShowMeEvent.kt @@ -0,0 +1,3 @@ +package com.mango.core.user.event + +class ShowMeEvent diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/APIEncryptUtil.java b/core/src/main/java/com/mango/core/utils/APIEncryptUtil.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/APIEncryptUtil.java rename to core/src/main/java/com/mango/core/utils/APIEncryptUtil.java index 18c60ad83..133692340 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/APIEncryptUtil.java +++ b/core/src/main/java/com/mango/core/utils/APIEncryptUtil.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import com.google.gson.Gson; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; -import com.yizhuan.xchat_android_library.utils.codec.MD5Utils; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.xchat_android_library.utils.codec.DESUtils; +import com.mango.xchat_android_library.utils.codec.MD5Utils; import java.net.URLEncoder; import java.util.ArrayList; @@ -73,7 +73,7 @@ public class APIEncryptUtil { // 构造URL 键值对的格式 StringBuilder buf = new StringBuilder(); for (Map.Entry item : infoIds) { - if (com.yizhuan.xchat_android_library.utils.StringUtils.isNotBlank(item.getKey())) { + if (com.mango.xchat_android_library.utils.StringUtils.isNotBlank(item.getKey())) { String key = item.getKey(); String val = item.getValue(); if (urlEncode) { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ActivityUtil.java b/core/src/main/java/com/mango/core/utils/ActivityUtil.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/ActivityUtil.java rename to core/src/main/java/com/mango/core/utils/ActivityUtil.java index 3eba2545c..1f674954b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ActivityUtil.java +++ b/core/src/main/java/com/mango/core/utils/ActivityUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import android.app.Activity; import android.content.Context; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ArrayUtils.java b/core/src/main/java/com/mango/core/utils/ArrayUtils.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/ArrayUtils.java rename to core/src/main/java/com/mango/core/utils/ArrayUtils.java index 8d51144ba..c18808cef 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ArrayUtils.java +++ b/core/src/main/java/com/mango/core/utils/ArrayUtils.java @@ -1,5 +1,5 @@ -package com.yizhuan.xchat_android_core.utils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +package com.mango.core.utils; +import com.mango.xchat_android_library.utils.log.MLog; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/AsyncTaskScanMusicFile.java b/core/src/main/java/com/mango/core/utils/AsyncTaskScanMusicFile.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/AsyncTaskScanMusicFile.java rename to core/src/main/java/com/mango/core/utils/AsyncTaskScanMusicFile.java index e2251dcb2..35e39d64b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/AsyncTaskScanMusicFile.java +++ b/core/src/main/java/com/mango/core/utils/AsyncTaskScanMusicFile.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import android.content.ContentResolver; import android.content.Context; @@ -9,10 +9,10 @@ import android.os.AsyncTask; import android.os.Environment; import android.provider.MediaStore; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.db.model.LocalMusicDbModel; -import com.yizhuan.xchat_android_library.utils.BlankUtil; -import com.yizhuan.xchat_android_library.utils.file.BasicFileUtils; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.music.db.model.LocalMusicDbModel; +import com.mango.xchat_android_library.utils.BlankUtil; +import com.mango.xchat_android_library.utils.file.BasicFileUtils; import java.io.File; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java b/core/src/main/java/com/mango/core/utils/BitmapLruCacheHelper.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java rename to core/src/main/java/com/mango/core/utils/BitmapLruCacheHelper.java index 66a030399..091077de5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java +++ b/core/src/main/java/com/mango/core/utils/BitmapLruCacheHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import android.graphics.Bitmap; import androidx.collection.LruCache; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapUtils.java b/core/src/main/java/com/mango/core/utils/BitmapUtils.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapUtils.java rename to core/src/main/java/com/mango/core/utils/BitmapUtils.java index 0d088db6d..db0501d01 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapUtils.java +++ b/core/src/main/java/com/mango/core/utils/BitmapUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import android.content.res.Resources; import android.graphics.Bitmap; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/CheckUtils.java b/core/src/main/java/com/mango/core/utils/CheckUtils.java similarity index 53% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/CheckUtils.java rename to core/src/main/java/com/mango/core/utils/CheckUtils.java index b896f9a76..850275634 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/CheckUtils.java +++ b/core/src/main/java/com/mango/core/utils/CheckUtils.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.core.auth.AuthModel; +import com.mango.core.initial.InitialModel; +import com.mango.core.initial.bean.InitInfo; +import com.mango.xchat_android_library.utils.ListUtils; public class CheckUtils { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/CurrentTimeUtils.java b/core/src/main/java/com/mango/core/utils/CurrentTimeUtils.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/CurrentTimeUtils.java rename to core/src/main/java/com/mango/core/utils/CurrentTimeUtils.java index d13a2414e..6ab4d239b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/CurrentTimeUtils.java +++ b/core/src/main/java/com/mango/core/utils/CurrentTimeUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; public class CurrentTimeUtils { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/DirectoryHelper.java b/core/src/main/java/com/mango/core/utils/DirectoryHelper.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/DirectoryHelper.java rename to core/src/main/java/com/mango/core/utils/DirectoryHelper.java index 816e467b0..63067003b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/DirectoryHelper.java +++ b/core/src/main/java/com/mango/core/utils/DirectoryHelper.java @@ -1,12 +1,11 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import android.content.Context; import android.os.Environment; -import android.text.TextUtils; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.file.StorageUtils; +import com.mango.core.Constants; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.file.StorageUtils; import java.io.File; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/EmojiUtil.java b/core/src/main/java/com/mango/core/utils/EmojiUtil.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/EmojiUtil.java rename to core/src/main/java/com/mango/core/utils/EmojiUtil.java index 654ba4286..3e1a20025 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/EmojiUtil.java +++ b/core/src/main/java/com/mango/core/utils/EmojiUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import java.util.regex.Pattern; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtil.java b/core/src/main/java/com/mango/core/utils/ExtensionUtil.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtil.java rename to core/src/main/java/com/mango/core/utils/ExtensionUtil.java index a15b45fb8..c853b5202 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtil.java +++ b/core/src/main/java/com/mango/core/utils/ExtensionUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import android.text.TextUtils; @@ -7,9 +7,9 @@ import com.netease.nim.uikit.common.util.log.LogUtil; 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.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.FaceAttachment; +import com.mango.core.im.custom.bean.RoomTipAttachment; import java.util.HashMap; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtils.java b/core/src/main/java/com/mango/core/utils/ExtensionUtils.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtils.java rename to core/src/main/java/com/mango/core/utils/ExtensionUtils.java index 1c76c5cff..c92a4be9d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtils.java +++ b/core/src/main/java/com/mango/core/utils/ExtensionUtils.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import androidx.annotation.NonNull; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.level.UserLevelVo; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.core.user.bean.UserInfo; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IConnectivityClient.java b/core/src/main/java/com/mango/core/utils/IConnectivityClient.java similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/IConnectivityClient.java rename to core/src/main/java/com/mango/core/utils/IConnectivityClient.java index 96d91645d..d733b7ed4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IConnectivityClient.java +++ b/core/src/main/java/com/mango/core/utils/IConnectivityClient.java @@ -1,10 +1,10 @@ /** * */ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; -import com.yizhuan.xchat_android_library.coremanager.ICoreClient; +import com.mango.xchat_android_library.coremanager.ICoreClient; /** * @author daixiang diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IConnectivityCore.java b/core/src/main/java/com/mango/core/utils/IConnectivityCore.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/IConnectivityCore.java rename to core/src/main/java/com/mango/core/utils/IConnectivityCore.java index 0fad2d60f..2aaadeb5b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IConnectivityCore.java +++ b/core/src/main/java/com/mango/core/utils/IConnectivityCore.java @@ -1,10 +1,10 @@ /** * */ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; -import com.yizhuan.xchat_android_library.coremanager.IBaseCore; +import com.mango.xchat_android_library.coremanager.IBaseCore; /** * @author daixiang diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IHandlerCore.java b/core/src/main/java/com/mango/core/utils/IHandlerCore.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/IHandlerCore.java rename to core/src/main/java/com/mango/core/utils/IHandlerCore.java index 2f69262d8..db0fc9146 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IHandlerCore.java +++ b/core/src/main/java/com/mango/core/utils/IHandlerCore.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; -import com.yizhuan.xchat_android_library.coremanager.IBaseCore; -import com.yizhuan.xchat_android_library.coremanager.ICoreClient; +import com.mango.xchat_android_library.coremanager.IBaseCore; +import com.mango.xchat_android_library.coremanager.ICoreClient; /** * Handler相关逻辑处理 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ImageSplitter.java b/core/src/main/java/com/mango/core/utils/ImageSplitter.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/ImageSplitter.java rename to core/src/main/java/com/mango/core/utils/ImageSplitter.java index f558d0ee3..cc648b495 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ImageSplitter.java +++ b/core/src/main/java/com/mango/core/utils/ImageSplitter.java @@ -1,16 +1,12 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.graphics.Matrix; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.os.Environment; -import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; +import com.mango.core.manager.AvRoomDataManager; -import java.io.ByteArrayOutputStream; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ImgServiceUrlUtil.java b/core/src/main/java/com/mango/core/utils/ImgServiceUrlUtil.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/ImgServiceUrlUtil.java rename to core/src/main/java/com/mango/core/utils/ImgServiceUrlUtil.java index 35e454317..d385cc576 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ImgServiceUrlUtil.java +++ b/core/src/main/java/com/mango/core/utils/ImgServiceUrlUtil.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; -import com.yizhuan.xchat_android_library.utils.StringUtils; -import com.yizhuan.xchat_android_library.utils.file.JXFileUtils; +import com.mango.xchat_android_library.utils.StringUtils; +import com.mango.xchat_android_library.utils.file.JXFileUtils; /** * Created by lijun3 on 2016/3/15. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IntentUtils.java b/core/src/main/java/com/mango/core/utils/IntentUtils.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/IntentUtils.java rename to core/src/main/java/com/mango/core/utils/IntentUtils.java index 79b254410..5dc18bcbe 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IntentUtils.java +++ b/core/src/main/java/com/mango/core/utils/IntentUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import android.app.Activity; import android.app.PendingIntent; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/LogUtils.java b/core/src/main/java/com/mango/core/utils/LogUtils.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/LogUtils.java rename to core/src/main/java/com/mango/core/utils/LogUtils.java index 2a904315e..d04b9a459 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/LogUtils.java +++ b/core/src/main/java/com/mango/core/utils/LogUtils.java @@ -3,12 +3,12 @@ // (powered by Fernflower decompiler) // -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import android.util.Log; -import com.yizhuan.xchat_android_core.BuildConfig; +import com.mango.core.BuildConfig; import java.util.Locale; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/Logger.java b/core/src/main/java/com/mango/core/utils/Logger.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/Logger.java rename to core/src/main/java/com/mango/core/utils/Logger.java index a78ed8399..097222aad 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/Logger.java +++ b/core/src/main/java/com/mango/core/utils/Logger.java @@ -4,7 +4,7 @@ * 使用前需要先调用init初始化 * 内部使用android的Log类实现，并支持写入文件 */ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import android.annotation.SuppressLint; import android.os.Bundle; @@ -13,9 +13,9 @@ import android.os.Looper; import android.os.Message; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.StringUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.StringUtils; +import com.mango.xchat_android_library.utils.log.MLog; import java.io.BufferedWriter; import java.io.File; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/OaidUtil.java b/core/src/main/java/com/mango/core/utils/OaidUtil.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/OaidUtil.java rename to core/src/main/java/com/mango/core/utils/OaidUtil.java index c5aea8456..9207b212c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/OaidUtil.java +++ b/core/src/main/java/com/mango/core/utils/OaidUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; public class OaidUtil { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/OldHttpErrorHandleUtil.java b/core/src/main/java/com/mango/core/utils/OldHttpErrorHandleUtil.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/OldHttpErrorHandleUtil.java rename to core/src/main/java/com/mango/core/utils/OldHttpErrorHandleUtil.java index e2f9495b5..9df2c7600 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/OldHttpErrorHandleUtil.java +++ b/core/src/main/java/com/mango/core/utils/OldHttpErrorHandleUtil.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.mango.core.bean.response.ServiceResult; import java.nio.charset.Charset; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SharedPreferenceUtils.java b/core/src/main/java/com/mango/core/utils/SharedPreferenceUtils.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/SharedPreferenceUtils.java rename to core/src/main/java/com/mango/core/utils/SharedPreferenceUtils.java index 19d230dbc..f8c4f96c4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SharedPreferenceUtils.java +++ b/core/src/main/java/com/mango/core/utils/SharedPreferenceUtils.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import android.content.Context; import android.content.SharedPreferences; -import com.yizhuan.xchat_android_constants.XChatConstants; +import com.mango.xchat_android_constants.XChatConstants; public class SharedPreferenceUtils { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SongUtils.java b/core/src/main/java/com/mango/core/utils/SongUtils.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/SongUtils.java rename to core/src/main/java/com/mango/core/utils/SongUtils.java index 24946c7dd..4f1fd8299 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SongUtils.java +++ b/core/src/main/java/com/mango/core/utils/SongUtils.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; -import com.yizhuan.xchat_android_library.utils.UUIDUtil; +import com.mango.xchat_android_library.utils.UUIDUtil; /** * Creator: 舒强睿 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StarUtils.java b/core/src/main/java/com/mango/core/utils/StarUtils.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/StarUtils.java rename to core/src/main/java/com/mango/core/utils/StarUtils.java index 11fde1748..2d36e3cc9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StarUtils.java +++ b/core/src/main/java/com/mango/core/utils/StarUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import java.util.Calendar; import java.util.Date; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StringExtension.kt b/core/src/main/java/com/mango/core/utils/StringExtension.kt similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/StringExtension.kt rename to core/src/main/java/com/mango/core/utils/StringExtension.kt index d4b1b0045..01fbaddd8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StringExtension.kt +++ b/core/src/main/java/com/mango/core/utils/StringExtension.kt @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.utils +package com.mango.core.utils import android.graphics.Color -import com.yizhuan.xchat_android_library.utils.SingleToastUtil +import com.mango.xchat_android_library.utils.SingleToastUtil fun String?.subAndReplaceDot(maxLength: Int = 6): String { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StringUtils.java b/core/src/main/java/com/mango/core/utils/StringUtils.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/StringUtils.java rename to core/src/main/java/com/mango/core/utils/StringUtils.java index 8debced19..18f337e91 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StringUtils.java +++ b/core/src/main/java/com/mango/core/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import java.net.URLEncoder; import java.text.ParseException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUidUtil.java b/core/src/main/java/com/mango/core/utils/SystemUidUtil.java similarity index 72% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUidUtil.java rename to core/src/main/java/com/mango/core/utils/SystemUidUtil.java index e2da89ad9..bf4c29e76 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUidUtil.java +++ b/core/src/main/java/com/mango/core/utils/SystemUidUtil.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; -import com.yizhuan.xchat_android_constants.XChatConstants; +import com.mango.xchat_android_constants.XChatConstants; public class SystemUidUtil { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUtils.java b/core/src/main/java/com/mango/core/utils/SystemUtils.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUtils.java rename to core/src/main/java/com/mango/core/utils/SystemUtils.java index f35284af5..5ba8c8371 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUtils.java +++ b/core/src/main/java/com/mango/core/utils/SystemUtils.java @@ -1,15 +1,15 @@ /** * */ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import android.content.Context; import android.os.Build; import android.os.Looper; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.log.MLog; import java.lang.reflect.Method; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/TestLog.java b/core/src/main/java/com/mango/core/utils/TestLog.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/TestLog.java rename to core/src/main/java/com/mango/core/utils/TestLog.java index 516687765..c76e5e72f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/TestLog.java +++ b/core/src/main/java/com/mango/core/utils/TestLog.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import com.netease.nim.uikit.common.util.log.sdk.LogBase; import com.netease.nim.uikit.common.util.log.sdk.wrapper.NimLog; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/TextUtils.java b/core/src/main/java/com/mango/core/utils/TextUtils.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/TextUtils.java rename to core/src/main/java/com/mango/core/utils/TextUtils.java index a2f6fbc58..34ce3cd8a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/TextUtils.java +++ b/core/src/main/java/com/mango/core/utils/TextUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import android.content.ClipData; import android.content.ClipboardManager; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/Transformer.java b/core/src/main/java/com/mango/core/utils/Transformer.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/Transformer.java rename to core/src/main/java/com/mango/core/utils/Transformer.java index eb74aea93..3bdb4bd48 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/Transformer.java +++ b/core/src/main/java/com/mango/core/utils/Transformer.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; import io.reactivex.Single; import io.reactivex.SingleSource; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/UploadUtils.java b/core/src/main/java/com/mango/core/utils/UploadUtils.java similarity index 61% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/UploadUtils.java rename to core/src/main/java/com/mango/core/utils/UploadUtils.java index ba4c30af3..748b7a8cd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/UploadUtils.java +++ b/core/src/main/java/com/mango/core/utils/UploadUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.mango.core.utils; /** * create by lvzebiao @2019/11/20 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BalanceNotEnoughExeption.java b/core/src/main/java/com/mango/core/utils/net/BalanceNotEnoughExeption.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BalanceNotEnoughExeption.java rename to core/src/main/java/com/mango/core/utils/net/BalanceNotEnoughExeption.java index 08dbfa3cb..bf1816861 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BalanceNotEnoughExeption.java +++ b/core/src/main/java/com/mango/core/utils/net/BalanceNotEnoughExeption.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.mango.core.utils.net; /** * Created by huangmeng1 on 2018/5/14. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BeanObserver.java b/core/src/main/java/com/mango/core/utils/net/BeanObserver.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BeanObserver.java rename to core/src/main/java/com/mango/core/utils/net/BeanObserver.java index 8f268216a..fc433ddf4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BeanObserver.java +++ b/core/src/main/java/com/mango/core/utils/net/BeanObserver.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.mango.core.utils.net; import java.net.UnknownHostException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/DontWarnObserver.java b/core/src/main/java/com/mango/core/utils/net/DontWarnObserver.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/DontWarnObserver.java rename to core/src/main/java/com/mango/core/utils/net/DontWarnObserver.java index b25f8f52b..b1cedf857 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/DontWarnObserver.java +++ b/core/src/main/java/com/mango/core/utils/net/DontWarnObserver.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.mango.core.utils.net; import android.text.TextUtils; -import com.yizhuan.xchat_android_constants.XChatConstants; +import com.mango.xchat_android_constants.XChatConstants; import java.net.UnknownHostException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ErrorConsumer.java b/core/src/main/java/com/mango/core/utils/net/ErrorConsumer.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ErrorConsumer.java rename to core/src/main/java/com/mango/core/utils/net/ErrorConsumer.java index 39954e9a1..6663a88cc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ErrorConsumer.java +++ b/core/src/main/java/com/mango/core/utils/net/ErrorConsumer.java @@ -1,14 +1,14 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.mango.core.utils.net; import android.text.TextUtils; -import com.yizhuan.xchat_android_constants.XChatConstants; +import com.mango.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; +import com.mango.core.patriarch.exception.PmRoomLimitException; -import com.yizhuan.xchat_android_library.rxbus.RxBus; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.net.UnknownHostException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/FreezeException.java b/core/src/main/java/com/mango/core/utils/net/FreezeException.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/FreezeException.java rename to core/src/main/java/com/mango/core/utils/net/FreezeException.java index 481fa61a2..4042ad5ac 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/FreezeException.java +++ b/core/src/main/java/com/mango/core/utils/net/FreezeException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.mango.core.utils.net; public class FreezeException extends Exception { public static final int code = 402; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RadishNotEnoughException.java b/core/src/main/java/com/mango/core/utils/net/RadishNotEnoughException.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RadishNotEnoughException.java rename to core/src/main/java/com/mango/core/utils/net/RadishNotEnoughException.java index 5b4bde1c4..7a5449c68 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RadishNotEnoughException.java +++ b/core/src/main/java/com/mango/core/utils/net/RadishNotEnoughException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.mango.core.utils.net; /** * create by lvzebiao @2019/3/21 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt b/core/src/main/java/com/mango/core/utils/net/RxExtension.kt similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt rename to core/src/main/java/com/mango/core/utils/net/RxExtension.kt index c7e4c304b..b4d3c24a5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt +++ b/core/src/main/java/com/mango/core/utils/net/RxExtension.kt @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.utils.net +package com.mango.core.utils.net -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.utils.ifNullOrEmpty +import com.mango.core.bean.response.ServiceResult +import com.mango.core.utils.ifNullOrEmpty import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxHelper.java b/core/src/main/java/com/mango/core/utils/net/RxHelper.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxHelper.java rename to core/src/main/java/com/mango/core/utils/net/RxHelper.java index 475510bbf..88fdfe4cd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxHelper.java +++ b/core/src/main/java/com/mango/core/utils/net/RxHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.mango.core.utils.net; import android.content.Context; import android.text.TextUtils; @@ -11,11 +11,11 @@ import com.trello.rxlifecycle3.android.ActivityEvent; import com.trello.rxlifecycle3.android.FragmentEvent; import com.trello.rxlifecycle3.components.RxActivity; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; -import com.yizhuan.xchat_android_core.super_admin.model.exception.SAdminCannotGameException; -import com.yizhuan.xchat_android_library.rxbus.RxBus; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.patriarch.exception.PmRoomLimitException; +import com.mango.core.super_admin.model.exception.SAdminCannotGameException; +import com.mango.xchat_android_library.rxbus.RxBus; import java.io.IOException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ServerException.java b/core/src/main/java/com/mango/core/utils/net/ServerException.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ServerException.java rename to core/src/main/java/com/mango/core/utils/net/ServerException.java index 2244ebb6d..ba07c6501 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ServerException.java +++ b/core/src/main/java/com/mango/core/utils/net/ServerException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.mango.core.utils.net; /** * Created by fwhm on 2017/7/27. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/VipLevelNotEnoughException.java b/core/src/main/java/com/mango/core/utils/net/VipLevelNotEnoughException.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/VipLevelNotEnoughException.java rename to core/src/main/java/com/mango/core/utils/net/VipLevelNotEnoughException.java index f9e39537e..bcddc5645 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/VipLevelNotEnoughException.java +++ b/core/src/main/java/com/mango/core/utils/net/VipLevelNotEnoughException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.mango.core.utils.net; /** * Created by huangmeng1 on 2018/5/14. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/UserVipInfo.kt b/core/src/main/java/com/mango/core/vip/UserVipInfo.kt similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/UserVipInfo.kt rename to core/src/main/java/com/mango/core/vip/UserVipInfo.kt index 1a3f7dac7..0382e16fc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/UserVipInfo.kt +++ b/core/src/main/java/com/mango/core/vip/UserVipInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.vip +package com.mango.core.vip import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipAuthInfo.kt b/core/src/main/java/com/mango/core/vip/VipAuthInfo.kt similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipAuthInfo.kt rename to core/src/main/java/com/mango/core/vip/VipAuthInfo.kt index 081b009a5..af865a573 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipAuthInfo.kt +++ b/core/src/main/java/com/mango/core/vip/VipAuthInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.vip +package com.mango.core.vip data class VipAuthInfo( val authDesc: String = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipBroadcastInfo.kt b/core/src/main/java/com/mango/core/vip/VipBroadcastInfo.kt similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipBroadcastInfo.kt rename to core/src/main/java/com/mango/core/vip/VipBroadcastInfo.kt index 226dd811e..7a662f9a9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipBroadcastInfo.kt +++ b/core/src/main/java/com/mango/core/vip/VipBroadcastInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.vip +package com.mango.core.vip import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipBroadcastMsgEvent.kt b/core/src/main/java/com/mango/core/vip/VipBroadcastMsgEvent.kt similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipBroadcastMsgEvent.kt rename to core/src/main/java/com/mango/core/vip/VipBroadcastMsgEvent.kt index e682263cf..289676d78 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipBroadcastMsgEvent.kt +++ b/core/src/main/java/com/mango/core/vip/VipBroadcastMsgEvent.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.vip +package com.mango.core.vip import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipInfo.kt b/core/src/main/java/com/mango/core/vip/VipInfo.kt similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipInfo.kt rename to core/src/main/java/com/mango/core/vip/VipInfo.kt index 448572a39..ed83b6e11 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipInfo.kt +++ b/core/src/main/java/com/mango/core/vip/VipInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.vip +package com.mango.core.vip import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipMessageInfo.java b/core/src/main/java/com/mango/core/vip/VipMessageInfo.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipMessageInfo.java rename to core/src/main/java/com/mango/core/vip/VipMessageInfo.java index 92a3d4217..217bd66a2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipMessageInfo.java +++ b/core/src/main/java/com/mango/core/vip/VipMessageInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.vip; +package com.mango.core.vip; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipModel.kt b/core/src/main/java/com/mango/core/vip/VipModel.kt similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipModel.kt rename to core/src/main/java/com/mango/core/vip/VipModel.kt index 59d827052..5da2a3f2a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipModel.kt +++ b/core/src/main/java/com/mango/core/vip/VipModel.kt @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.vip +package com.mango.core.vip -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.net.launchRequest -import com.yizhuan.xchat_android_library.net.rxnet.RxNet +import com.mango.core.base.BaseModel +import com.mango.core.bean.response.ServiceResult +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.utils.net.launchRequest +import com.mango.xchat_android_library.net.rxnet.RxNet import retrofit2.http.GET import retrofit2.http.Query diff --git a/core/src/main/java/com/mango/core/vip/VipOpenEvent.kt b/core/src/main/java/com/mango/core/vip/VipOpenEvent.kt new file mode 100644 index 000000000..d5201b336 --- /dev/null +++ b/core/src/main/java/com/mango/core/vip/VipOpenEvent.kt @@ -0,0 +1,3 @@ +package com.mango.core.vip + + class VipOpenEvent diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipPageInfo.kt b/core/src/main/java/com/mango/core/vip/VipPageInfo.kt similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipPageInfo.kt rename to core/src/main/java/com/mango/core/vip/VipPageInfo.kt index 929e00882..2340c0199 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipPageInfo.kt +++ b/core/src/main/java/com/mango/core/vip/VipPageInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.vip +package com.mango.core.vip data class VipPageInfo( val vipAuthInfos: List? = null, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipUpgradeEvent.kt b/core/src/main/java/com/mango/core/vip/VipUpgradeEvent.kt similarity index 53% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipUpgradeEvent.kt rename to core/src/main/java/com/mango/core/vip/VipUpgradeEvent.kt index 2d4db2c34..f6d83d8ec 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipUpgradeEvent.kt +++ b/core/src/main/java/com/mango/core/vip/VipUpgradeEvent.kt @@ -1,3 +1,3 @@ -package com.yizhuan.xchat_android_core.vip +package com.mango.core.vip data class VipUpgradeEvent(val vipInfo: VipInfo) diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/web/bean/H5NotifyData.java b/core/src/main/java/com/mango/core/web/bean/H5NotifyData.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/web/bean/H5NotifyData.java rename to core/src/main/java/com/mango/core/web/bean/H5NotifyData.java index 3dc21b2fd..b4cdcfd1d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/web/bean/H5NotifyData.java +++ b/core/src/main/java/com/mango/core/web/bean/H5NotifyData.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.web.bean; +package com.mango.core.web.bean; import android.text.TextUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/web/bean/WebJsBeanInfo.java b/core/src/main/java/com/mango/core/web/bean/WebJsBeanInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/web/bean/WebJsBeanInfo.java rename to core/src/main/java/com/mango/core/web/bean/WebJsBeanInfo.java index 84696a2e0..a45f2568c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/web/bean/WebJsBeanInfo.java +++ b/core/src/main/java/com/mango/core/web/bean/WebJsBeanInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.web.bean; +package com.mango.core.web.bean; /** *

js回调字段信息

diff --git a/core/src/main/java/com/mango/core/web/event/WebViewRefreshEvent.java b/core/src/main/java/com/mango/core/web/event/WebViewRefreshEvent.java new file mode 100644 index 000000000..bfab9893d --- /dev/null +++ b/core/src/main/java/com/mango/core/web/event/WebViewRefreshEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.web.event; + +public class WebViewRefreshEvent { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/IWithdrawModel.java b/core/src/main/java/com/mango/core/withdraw/IWithdrawModel.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/IWithdrawModel.java rename to core/src/main/java/com/mango/core/withdraw/IWithdrawModel.java index 04912ffc7..98e1ce9b4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/IWithdrawModel.java +++ b/core/src/main/java/com/mango/core/withdraw/IWithdrawModel.java @@ -1,11 +1,10 @@ -package com.yizhuan.xchat_android_core.withdraw; +package com.mango.core.withdraw; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.initial.bean.TaxInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.ExchangerInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrwaListInfo; -import com.yizhuan.xchat_android_library.coremanager.IBaseCore; +import com.mango.core.base.IModel; +import com.mango.core.initial.bean.TaxInfo; +import com.mango.core.withdraw.bean.ExchangerInfo; +import com.mango.core.withdraw.bean.WithdrawInfo; +import com.mango.core.withdraw.bean.WithdrwaListInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/WithdrawModel.java b/core/src/main/java/com/mango/core/withdraw/WithdrawModel.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/WithdrawModel.java rename to core/src/main/java/com/mango/core/withdraw/WithdrawModel.java index 5eb440333..ac82a4bb4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/WithdrawModel.java +++ b/core/src/main/java/com/mango/core/withdraw/WithdrawModel.java @@ -1,25 +1,25 @@ -package com.yizhuan.xchat_android_core.withdraw; +package com.mango.core.withdraw; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.ExchangeInfoResult; -import com.yizhuan.xchat_android_core.bean.response.result.WithdrawListResult; -import com.yizhuan.xchat_android_core.bean.response.result.WithdrawUserInfoResult; -import com.yizhuan.xchat_android_core.initial.bean.TaxInfo; -import com.yizhuan.xchat_android_core.pay.bean.NotRealNameYetException; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.APIEncryptUtil; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.withdraw.bean.BindAliInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.ExchangerInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.RefreshInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrwaListInfo; -import com.yizhuan.xchat_android_core.withdraw.event.ExchangeInfoEvent; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.bean.response.result.ExchangeInfoResult; +import com.mango.core.bean.response.result.WithdrawListResult; +import com.mango.core.bean.response.result.WithdrawUserInfoResult; +import com.mango.core.initial.bean.TaxInfo; +import com.mango.core.pay.bean.NotRealNameYetException; +import com.mango.core.user.UserModel; +import com.mango.core.utils.APIEncryptUtil; +import com.mango.core.utils.net.RxHelper; +import com.mango.core.withdraw.bean.BindAliInfo; +import com.mango.core.withdraw.bean.ExchangerInfo; +import com.mango.core.withdraw.bean.RefreshInfo; +import com.mango.core.withdraw.bean.WithdrawInfo; +import com.mango.core.withdraw.bean.WithdrwaListInfo; +import com.mango.core.withdraw.event.ExchangeInfoEvent; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.codec.DESUtils; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/BindAliInfo.java b/core/src/main/java/com/mango/core/withdraw/bean/BindAliInfo.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/BindAliInfo.java rename to core/src/main/java/com/mango/core/withdraw/bean/BindAliInfo.java index 473f714a8..cefcf6ef2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/BindAliInfo.java +++ b/core/src/main/java/com/mango/core/withdraw/bean/BindAliInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.withdraw.bean; +package com.mango.core.withdraw.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/ExchangerInfo.java b/core/src/main/java/com/mango/core/withdraw/bean/ExchangerInfo.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/ExchangerInfo.java rename to core/src/main/java/com/mango/core/withdraw/bean/ExchangerInfo.java index 98b2cd430..8b2f422c4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/ExchangerInfo.java +++ b/core/src/main/java/com/mango/core/withdraw/bean/ExchangerInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.withdraw.bean; +package com.mango.core.withdraw.bean; /** * Created by Administrator on 2017/7/27. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/RefreshInfo.java b/core/src/main/java/com/mango/core/withdraw/bean/RefreshInfo.java similarity index 60% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/RefreshInfo.java rename to core/src/main/java/com/mango/core/withdraw/bean/RefreshInfo.java index 68c26ca79..9d7497608 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/RefreshInfo.java +++ b/core/src/main/java/com/mango/core/withdraw/bean/RefreshInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.withdraw.bean; +package com.mango.core.withdraw.bean; /** * Created by Administrator on 2017/7/26. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrawInfo.java b/core/src/main/java/com/mango/core/withdraw/bean/WithdrawInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrawInfo.java rename to core/src/main/java/com/mango/core/withdraw/bean/WithdrawInfo.java index 1528067ef..c4d374a85 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrawInfo.java +++ b/core/src/main/java/com/mango/core/withdraw/bean/WithdrawInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.withdraw.bean; +package com.mango.core.withdraw.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrwaListInfo.java b/core/src/main/java/com/mango/core/withdraw/bean/WithdrwaListInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrwaListInfo.java rename to core/src/main/java/com/mango/core/withdraw/bean/WithdrwaListInfo.java index 19ba871aa..49a8b4ed3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrwaListInfo.java +++ b/core/src/main/java/com/mango/core/withdraw/bean/WithdrwaListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.withdraw.bean; +package com.mango.core.withdraw.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/event/ExchangeInfoEvent.java b/core/src/main/java/com/mango/core/withdraw/event/ExchangeInfoEvent.java similarity index 60% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/event/ExchangeInfoEvent.java rename to core/src/main/java/com/mango/core/withdraw/event/ExchangeInfoEvent.java index c8cdc5bbc..3fb659395 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/event/ExchangeInfoEvent.java +++ b/core/src/main/java/com/mango/core/withdraw/event/ExchangeInfoEvent.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.withdraw.event; +package com.mango.core.withdraw.event; -import com.yizhuan.xchat_android_core.base.BaseDataEvent; -import com.yizhuan.xchat_android_core.withdraw.bean.ExchangerInfo; +import com.mango.core.base.BaseDataEvent; +import com.mango.core.withdraw.bean.ExchangerInfo; /** * Created by Administrator on 2018/9/17. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/event/WithdrawInfoEvent.java b/core/src/main/java/com/mango/core/withdraw/event/WithdrawInfoEvent.java similarity index 59% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/event/WithdrawInfoEvent.java rename to core/src/main/java/com/mango/core/withdraw/event/WithdrawInfoEvent.java index ebbf344d2..622906f90 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/event/WithdrawInfoEvent.java +++ b/core/src/main/java/com/mango/core/withdraw/event/WithdrawInfoEvent.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.withdraw.event; +package com.mango.core.withdraw.event; -import com.yizhuan.xchat_android_core.base.BaseDataEvent; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo; +import com.mango.core.base.BaseDataEvent; +import com.mango.core.withdraw.bean.WithdrawInfo; /** * create by lvzebiao on 2018/9/8 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/activity/model/ActivityModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/activity/model/ActivityModel.java deleted file mode 100644 index db3748c28..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/activity/model/ActivityModel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.xchat_android_core.activity.model; - -import com.yizhuan.xchat_android_core.base.BaseModel; - -public class ActivityModel extends BaseModel implements IActivityModel { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/activity/model/IActivityModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/activity/model/IActivityModel.java deleted file mode 100644 index 11eb61758..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/activity/model/IActivityModel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.xchat_android_core.activity.model; - -import com.yizhuan.xchat_android_core.base.IModel; - -public interface IActivityModel extends IModel { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/IModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/base/IModel.java deleted file mode 100644 index 04cf243d2..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/base/IModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.base; - -public interface IModel { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ActionDialogResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ActionDialogResult.java deleted file mode 100644 index 4c35d7ef5..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ActionDialogResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - - -import com.yizhuan.xchat_android_core.redPacket.bean.ActionDialogInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -import java.util.List; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class ActionDialogResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AttentionListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AttentionListResult.java deleted file mode 100644 index fb0ab0606..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AttentionListResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -import java.util.List; - -/** - * Created by Administrator on 2017/7/5 0005. - */ - -public class AttentionListResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionInfoResult.java deleted file mode 100644 index 1fbfc40a8..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionInfoResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class AuctionInfoResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionListUserInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionListUserInfoResult.java deleted file mode 100644 index 9c4ebf96e..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionListUserInfoResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionListUserInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -import java.util.List; - -/** - * Created by chenran on 2017/8/9. - */ - -public class AuctionListUserInfoResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionUserListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionUserListResult.java deleted file mode 100644 index e5c429fd9..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionUserListResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionUser; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -import java.util.List; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class AuctionUserListResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionUserResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionUserResult.java deleted file mode 100644 index deca8f4c8..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionUserResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionUser; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class AuctionUserResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/BoolApiResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/BoolApiResult.java deleted file mode 100644 index e717f7b92..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/BoolApiResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by chenran on 2017/2/16. - */ - -public class BoolApiResult extends ServiceResult{ - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/BooleanResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/BooleanResult.java deleted file mode 100644 index 96a767260..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/BooleanResult.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/27. - */ - -public class BooleanResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/CheckLostUserResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/CheckLostUserResult.java deleted file mode 100644 index adbf08fc4..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/CheckLostUserResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo; - -public class CheckLostUserResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ExchangeInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ExchangeInfoResult.java deleted file mode 100644 index e6d517cb9..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ExchangeInfoResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.withdraw.bean.ExchangerInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by Administrator on 2017/7/5 0005. - */ - -public class ExchangeInfoResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/FaceResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/FaceResult.java deleted file mode 100644 index e70b396ac..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/FaceResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.room.face.FaceListInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by chenran on 2017/7/27. - */ - -public class FaceResult extends ServiceResult{ -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/FansListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/FansListResult.java deleted file mode 100644 index 5ac750fa8..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/FansListResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by Administrator on 2017/7/5 0005. - */ - -public class FansListResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftInfosResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftInfosResult.java deleted file mode 100644 index 0c11b78dd..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftInfosResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bills.bean.TextInfos; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by Seven on 2017/9/9. - */ - -public class GiftInfosResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftRecieveInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftRecieveInfoResult.java deleted file mode 100644 index 9afd80467..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftRecieveInfoResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by chenran on 2017/11/25. - */ - -public class GiftRecieveInfoResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftResult.java deleted file mode 100644 index e87c188c5..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.gift.bean.GiftListInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by chenran on 2017/7/27. - */ - -public class GiftResult extends ServiceResult{ -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftWallListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftWallListResult.java deleted file mode 100644 index 03b33d1e0..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftWallListResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -import java.util.List; - -/** - * Created by chenran on 2017/10/17. - */ - -public class GiftWallListResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GoBackResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GoBackResult.java deleted file mode 100644 index f6a3fb1de..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GoBackResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.recall.bean.GoBackInfo; - -public class GoBackResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/IdQueryUserInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/IdQueryUserInfoResult.java deleted file mode 100644 index e8631b176..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/IdQueryUserInfoResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.auth.entity.AccountInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by chenran on 2017/2/16. - */ - -public class IdQueryUserInfoResult extends ServiceResult{ - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/InitResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/InitResult.java deleted file mode 100644 index 3bbc95b20..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/InitResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * @author xiaoyu - * @date 2017/12/8 - */ - -public class InitResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/IntegerResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/IntegerResult.java deleted file mode 100644 index 5a015cfcb..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/IntegerResult.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by chenran on 2017/11/15. - */ - -public class IntegerResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/MultiGiftRecieveInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/MultiGiftRecieveInfoResult.java deleted file mode 100644 index ab97f5196..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/MultiGiftRecieveInfoResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by chenran on 2017/11/25. - */ - -public class MultiGiftRecieveInfoResult extends ServiceResult{ -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RedDrawListInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RedDrawListInfoResult.java deleted file mode 100644 index a498e8d30..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RedDrawListInfoResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.redPacket.bean.RedDrawListInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -import java.util.List; - -/** - * Created by chenran on 2017/12/4. - */ - -public class RedDrawListInfoResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RedPacketResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RedPacketResult.java deleted file mode 100644 index 84154e347..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RedPacketResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - - -import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class RedPacketResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RegisterResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RegisterResult.java deleted file mode 100644 index ef094f279..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RegisterResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.auth.entity.TicketInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by chenran on 2017/2/16. - */ - -public class RegisterResult extends ServiceResult{ - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RoomConsumeInfoListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RoomConsumeInfoListResult.java deleted file mode 100644 index 839e52cf7..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RoomConsumeInfoListResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.room.queue.bean.RoomConsumeInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -import java.util.List; - -/** - * Created by chenran on 2017/10/2. - */ - -public class RoomConsumeInfoListResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RoomRewardResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RoomRewardResult.java deleted file mode 100644 index 888a9d94c..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RoomRewardResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.im.custom.bean.RewardBean; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class RoomRewardResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ShareRedPacketResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ShareRedPacketResult.java deleted file mode 100644 index 9abddc511..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ShareRedPacketResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - - -import com.yizhuan.xchat_android_core.redPacket.bean.ShareRedBagInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class ShareRedPacketResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/TabResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/TabResult.java deleted file mode 100644 index a7a64544b..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/TabResult.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo; - -import java.util.List; - -/** - *

- * - * @author Administrator - * @date 2017/11/21 - */ -public class TabResult extends ServiceResult> { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/TicketResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/TicketResult.java deleted file mode 100644 index ef8710945..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/TicketResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.auth.entity.TicketInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class TicketResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/UserListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/UserListResult.java deleted file mode 100644 index d9e0a597c..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/UserListResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -import java.util.List; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class UserListResult extends ServiceResult> { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/UserResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/UserResult.java deleted file mode 100644 index 9689c1138..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/UserResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class UserResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/VersionsResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/VersionsResult.java deleted file mode 100644 index 2ad2ef215..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/VersionsResult.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by Administrator on 2017/7/12 0012. - */ - -public class VersionsResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WalletInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WalletInfoResult.java deleted file mode 100644 index f8377b6d4..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WalletInfoResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class WalletInfoResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawListResult.java deleted file mode 100644 index fa415e1d6..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawListResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrwaListInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -import java.util.List; - -/** - * Created by Administrator on 2017/7/5 0005. - */ - -public class WithdrawListResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawRedListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawRedListResult.java deleted file mode 100644 index cd1d2b493..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawRedListResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - - -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedListInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -import java.util.List; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class WithdrawRedListResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawRedSucceedResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawRedSucceedResult.java deleted file mode 100644 index 8c02d1e5b..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawRedSucceedResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - - -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedSucceedInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class WithdrawRedSucceedResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawUserInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawUserInfoResult.java deleted file mode 100644 index 7fd09f814..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawUserInfoResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class WithdrawUserInfoResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/ChargeResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/ChargeResult.java deleted file mode 100644 index 5311ae36d..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/ChargeResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bills.result; - -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by Seven on 2017/9/9. - */ - -public class ChargeResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/ExpendResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/ExpendResult.java deleted file mode 100644 index 9fe1ff84f..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/ExpendResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bills.result; - -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by Seven on 2017/9/9. - */ - -public class ExpendResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/IncomedResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/IncomedResult.java deleted file mode 100644 index f12259115..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/IncomedResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bills.result; - -import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by Seven on 2017/9/9. - */ - -public class IncomedResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/RadishGiftResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/RadishGiftResult.java deleted file mode 100644 index 949c18b6e..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/RadishGiftResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.xchat_android_core.bills.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftListInfo; - -public class RadishGiftResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/RedBagResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/RedBagResult.java deleted file mode 100644 index c47a8420a..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/RedBagResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bills.result; - -import com.yizhuan.xchat_android_core.bills.bean.RedBagListInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by Seven on 2017/9/9. - */ - -public class RedBagResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/contacts/IContactModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/contacts/IContactModel.java deleted file mode 100644 index 6deae58dc..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/contacts/IContactModel.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yizhuan.xchat_android_core.contacts; - -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; - -import java.util.List; - -import io.reactivex.Single; - -public interface IContactModel extends IModel { - - Single>> searchContacts(String keyword); -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/INamePlateModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/INamePlateModel.java deleted file mode 100644 index 11637e272..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/INamePlateModel.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.yizhuan.xchat_android_core.decoration.nameplate; - -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo; - -import java.util.List; - -import io.reactivex.Single; - -public interface INamePlateModel extends IModel { - - /** - * 获取我的铭牌列表 - * - * @return - */ - Single> getNamePlateList(long uid); - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftLuckyBag.java b/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftLuckyBag.java deleted file mode 100644 index f26280bca..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftLuckyBag.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.yizhuan.xchat_android_core.gift.bean; - -public class GiftLuckyBag { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/HideInputEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/HideInputEvent.java deleted file mode 100644 index 55e610e44..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/HideInputEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.im.chatterbox; - -public class HideInputEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/linked/ILinkedModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/linked/ILinkedModel.java deleted file mode 100644 index 218a3015c..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/linked/ILinkedModel.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.linked; - -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; - - -public interface ILinkedModel extends IModel { - - void setLinkedInfo(LinkedInfo linkedInfo); - - LinkedInfo getLinkedInfo(); - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishRecordResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishRecordResult.java deleted file mode 100644 index 65f29d5cc..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishRecordResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.xchat_android_core.radish; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordListInfo; - -public class RadishRecordResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/recall/IRecallModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/recall/IRecallModel.java deleted file mode 100644 index f1b9ac75b..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/IRecallModel.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.yizhuan.xchat_android_core.recall; - -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo; -import com.yizhuan.xchat_android_core.recall.bean.GoBackInfo; - -import io.reactivex.Single; - -public interface IRecallModel extends IModel { - - // 查询是否是回归状态 - Single checkLostUser(long uid); - // 接收回归礼物 - void goBack(String uid, String inviteCode); -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeGiftItemVO.kt b/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeGiftItemVO.kt deleted file mode 100644 index 0fc100dab..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeGiftItemVO.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.yizhuan.xchat_android_core.redpackage - -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo - - -data class RedEnvelopeGiftItemVO( - var giftNum: Int = 0, - var giftVo: GiftInfo? = null -) \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpBindUnbindEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpBindUnbindEvent.java deleted file mode 100644 index f03544110..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpBindUnbindEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.relation.cp; - -public class CpBindUnbindEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomResult.java deleted file mode 100644 index 9920944fe..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.room.bean; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class RoomResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/EixtCountDownEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/event/EixtCountDownEvent.java deleted file mode 100644 index c11649b4c..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/EixtCountDownEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.room.event; - -public class EixtCountDownEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/FaceIsReadyEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/event/FaceIsReadyEvent.java deleted file mode 100644 index 46c947c13..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/FaceIsReadyEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.room.event; - -public class FaceIsReadyEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/FinishAvRoomEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/event/FinishAvRoomEvent.java deleted file mode 100644 index bd6c9fa2c..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/FinishAvRoomEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.room.event; - -public class FinishAvRoomEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomClearScreenEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomClearScreenEvent.java deleted file mode 100644 index daafca048..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomClearScreenEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.room.event; - -public class RoomClearScreenEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/QueuingMicEmptyEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/QueuingMicEmptyEvent.java deleted file mode 100644 index 652334e25..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/QueuingMicEmptyEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.event; - -public class QueuingMicEmptyEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java deleted file mode 100644 index 30eb36d5f..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.event; - -public class QueuingMicNotEmptyEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/event/RefreshBoxRankingEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/event/RefreshBoxRankingEvent.java deleted file mode 100644 index a6e97400d..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/event/RefreshBoxRankingEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.room.treasure_box.event; - -public class RefreshBoxRankingEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/ShowMeEvent.kt b/core/src/main/java/com/yizhuan/xchat_android_core/user/event/ShowMeEvent.kt deleted file mode 100644 index 3a0e66998..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/ShowMeEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.yizhuan.xchat_android_core.user.event - -class ShowMeEvent diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipOpenEvent.kt b/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipOpenEvent.kt deleted file mode 100644 index a58306696..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipOpenEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.yizhuan.xchat_android_core.vip - - class VipOpenEvent diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/web/event/WebViewRefreshEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/web/event/WebViewRefreshEvent.java deleted file mode 100644 index 904ae9f12..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/web/event/WebViewRefreshEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.web.event; - -public class WebViewRefreshEvent { -} diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 3c1590fcb..6f8e4f608 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - XChat_Android_Core + core diff --git a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/bean/BankCardBean.java b/core/src/model_bank_card/java/com/mango/core/bank_card/bean/BankCardBean.java similarity index 93% rename from core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/bean/BankCardBean.java rename to core/src/model_bank_card/java/com/mango/core/bank_card/bean/BankCardBean.java index 362b9a69f..939070b73 100644 --- a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/bean/BankCardBean.java +++ b/core/src/model_bank_card/java/com/mango/core/bank_card/bean/BankCardBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bank_card.bean; +package com.mango.core.bank_card.bean; import lombok.Data; diff --git a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/bean/BankCardListResp.java b/core/src/model_bank_card/java/com/mango/core/bank_card/bean/BankCardListResp.java similarity index 88% rename from core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/bean/BankCardListResp.java rename to core/src/model_bank_card/java/com/mango/core/bank_card/bean/BankCardListResp.java index fdd73e7a7..06249eead 100644 --- a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/bean/BankCardListResp.java +++ b/core/src/model_bank_card/java/com/mango/core/bank_card/bean/BankCardListResp.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bank_card.bean; +package com.mango.core.bank_card.bean; import java.util.List; diff --git a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/exception/NeedBindBankCardException.java b/core/src/model_bank_card/java/com/mango/core/bank_card/exception/NeedBindBankCardException.java similarity index 63% rename from core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/exception/NeedBindBankCardException.java rename to core/src/model_bank_card/java/com/mango/core/bank_card/exception/NeedBindBankCardException.java index 2678f0915..128e432e1 100644 --- a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/exception/NeedBindBankCardException.java +++ b/core/src/model_bank_card/java/com/mango/core/bank_card/exception/NeedBindBankCardException.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.bank_card.exception; +package com.mango.core.bank_card.exception; -import com.yizhuan.xchat_android_core.exception.FailReasonException; +import com.mango.core.exception.FailReasonException; /** * Created by MadisonRong on 2019-08-16 diff --git a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/model/BankCardModel.java b/core/src/model_bank_card/java/com/mango/core/bank_card/model/BankCardModel.java similarity index 92% rename from core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/model/BankCardModel.java rename to core/src/model_bank_card/java/com/mango/core/bank_card/model/BankCardModel.java index fc12c5b77..70db6e8fb 100644 --- a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/model/BankCardModel.java +++ b/core/src/model_bank_card/java/com/mango/core/bank_card/model/BankCardModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.bank_card.model; +package com.mango.core.bank_card.model; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bank_card.bean.BankCardListResp; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.bank_card.bean.BankCardListResp; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import retrofit2.http.Field; diff --git a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/model/IBankCardModel.java b/core/src/model_bank_card/java/com/mango/core/bank_card/model/IBankCardModel.java similarity index 87% rename from core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/model/IBankCardModel.java rename to core/src/model_bank_card/java/com/mango/core/bank_card/model/IBankCardModel.java index 0571b4d0a..c27242310 100644 --- a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/model/IBankCardModel.java +++ b/core/src/model_bank_card/java/com/mango/core/bank_card/model/IBankCardModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.bank_card.model; +package com.mango.core.bank_card.model; -import com.yizhuan.xchat_android_core.bank_card.bean.BankCardListResp; -import com.yizhuan.xchat_android_core.base.IModel; +import com.mango.core.bank_card.bean.BankCardListResp; +import com.mango.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/view/IAddBankCardAgreementView.java b/core/src/model_bank_card/java/com/mango/core/bank_card/view/IAddBankCardAgreementView.java similarity index 86% rename from core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/view/IAddBankCardAgreementView.java rename to core/src/model_bank_card/java/com/mango/core/bank_card/view/IAddBankCardAgreementView.java index 1d0bf8c00..e3b81d828 100644 --- a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/view/IAddBankCardAgreementView.java +++ b/core/src/model_bank_card/java/com/mango/core/bank_card/view/IAddBankCardAgreementView.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.bank_card.view; +package com.mango.core.bank_card.view; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * Created by MadisonRong on 2019-08-19 diff --git a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/view/IBankCardView.java b/core/src/model_bank_card/java/com/mango/core/bank_card/view/IBankCardView.java similarity index 80% rename from core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/view/IBankCardView.java rename to core/src/model_bank_card/java/com/mango/core/bank_card/view/IBankCardView.java index 1dbd7893b..57fda818e 100644 --- a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/view/IBankCardView.java +++ b/core/src/model_bank_card/java/com/mango/core/bank_card/view/IBankCardView.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.bank_card.view; +package com.mango.core.bank_card.view; -import com.yizhuan.xchat_android_core.bank_card.bean.BankCardListResp; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.bank_card.bean.BankCardListResp; +import com.mango.xchat_android_library.base.IMvpBaseView; /** * Created by MadisonRong on 2019-08-16 diff --git a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/ChannelPageInfo.java b/core/src/model_channel_page/java/com/mango/core/channel_page/bean/ChannelPageInfo.java similarity index 74% rename from core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/ChannelPageInfo.java rename to core/src/model_channel_page/java/com/mango/core/channel_page/bean/ChannelPageInfo.java index 195325678..ecbd6d76a 100644 --- a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/ChannelPageInfo.java +++ b/core/src/model_channel_page/java/com/mango/core/channel_page/bean/ChannelPageInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.channel_page.bean; +package com.mango.core.channel_page.bean; import lombok.Data; diff --git a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/HelloMessageInfo.kt b/core/src/model_channel_page/java/com/mango/core/channel_page/bean/HelloMessageInfo.kt similarity index 77% rename from core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/HelloMessageInfo.kt rename to core/src/model_channel_page/java/com/mango/core/channel_page/bean/HelloMessageInfo.kt index cb32ace91..9d4abc4e5 100644 --- a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/HelloMessageInfo.kt +++ b/core/src/model_channel_page/java/com/mango/core/channel_page/bean/HelloMessageInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.channel_page.bean +package com.mango.core.channel_page.bean import java.io.Serializable diff --git a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/NewUserHelloInfo.kt b/core/src/model_channel_page/java/com/mango/core/channel_page/bean/NewUserHelloInfo.kt similarity index 85% rename from core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/NewUserHelloInfo.kt rename to core/src/model_channel_page/java/com/mango/core/channel_page/bean/NewUserHelloInfo.kt index 0a404fb24..0c23ac4cb 100644 --- a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/NewUserHelloInfo.kt +++ b/core/src/model_channel_page/java/com/mango/core/channel_page/bean/NewUserHelloInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.channel_page.bean +package com.mango.core.channel_page.bean import java.io.Serializable diff --git a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/model/ChannelPageModel.java b/core/src/model_channel_page/java/com/mango/core/channel_page/model/ChannelPageModel.java similarity index 86% rename from core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/model/ChannelPageModel.java rename to core/src/model_channel_page/java/com/mango/core/channel_page/model/ChannelPageModel.java index a9127e8c2..2270c3ce2 100644 --- a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/model/ChannelPageModel.java +++ b/core/src/model_channel_page/java/com/mango/core/channel_page/model/ChannelPageModel.java @@ -1,16 +1,16 @@ -package com.yizhuan.xchat_android_core.channel_page.model; +package com.mango.core.channel_page.model; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.channel_page.bean.ChannelPageInfo; -import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo; -import com.yizhuan.xchat_android_core.channel_page.bean.NewUserHelloInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.user.bean.InviteUserInfo; -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.NetworkUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.channel_page.bean.ChannelPageInfo; +import com.mango.core.channel_page.bean.HelloMessageInfo; +import com.mango.core.channel_page.bean.NewUserHelloInfo; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.user.bean.InviteUserInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.NetworkUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import io.reactivex.Single; import retrofit2.http.Field; diff --git a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/model/IChannelPageModel.java b/core/src/model_channel_page/java/com/mango/core/channel_page/model/IChannelPageModel.java similarity index 56% rename from core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/model/IChannelPageModel.java rename to core/src/model_channel_page/java/com/mango/core/channel_page/model/IChannelPageModel.java index 8b70c984b..299ce9f86 100644 --- a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/model/IChannelPageModel.java +++ b/core/src/model_channel_page/java/com/mango/core/channel_page/model/IChannelPageModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.channel_page.model; +package com.mango.core.channel_page.model; -import com.yizhuan.xchat_android_core.channel_page.bean.ChannelPageInfo; -import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo; -import com.yizhuan.xchat_android_core.channel_page.bean.NewUserHelloInfo; -import com.yizhuan.xchat_android_core.user.bean.InviteUserInfo; +import com.mango.core.channel_page.bean.ChannelPageInfo; +import com.mango.core.channel_page.bean.HelloMessageInfo; +import com.mango.core.channel_page.bean.NewUserHelloInfo; +import com.mango.core.user.bean.InviteUserInfo; import io.reactivex.Single; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/CommunityConstant.java b/core/src/model_community/java/com/mango/core/community/CommunityConstant.java similarity index 86% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/CommunityConstant.java rename to core/src/model_community/java/com/mango/core/community/CommunityConstant.java index 1014608c6..aaaf11037 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/CommunityConstant.java +++ b/core/src/model_community/java/com/mango/core/community/CommunityConstant.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community; +package com.mango.core.community; /** * 社区模块的一些常量定义 diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/IPublishModel.java b/core/src/model_community/java/com/mango/core/community/IPublishModel.java similarity index 58% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/IPublishModel.java rename to core/src/model_community/java/com/mango/core/community/IPublishModel.java index cbf37d647..71bd7da40 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/IPublishModel.java +++ b/core/src/model_community/java/com/mango/core/community/IPublishModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.community; +package com.mango.core.community; -import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo; -import com.yizhuan.xchat_android_core.community.bean.PublishBody; +import com.mango.core.community.bean.MiniWorldChooseInfo; +import com.mango.core.community.bean.PublishBody; import java.util.List; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/ImageUploadConfig.java b/core/src/model_community/java/com/mango/core/community/ImageUploadConfig.java similarity index 90% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/ImageUploadConfig.java rename to core/src/model_community/java/com/mango/core/community/ImageUploadConfig.java index 247125648..cd10d2f51 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/ImageUploadConfig.java +++ b/core/src/model_community/java/com/mango/core/community/ImageUploadConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community; +package com.mango.core.community; /** * 动态上传的一些配置 diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/PublishModel.java b/core/src/model_community/java/com/mango/core/community/PublishModel.java similarity index 81% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/PublishModel.java rename to core/src/model_community/java/com/mango/core/community/PublishModel.java index 6ad59ab93..9725db945 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/PublishModel.java +++ b/core/src/model_community/java/com/mango/core/community/PublishModel.java @@ -1,14 +1,14 @@ -package com.yizhuan.xchat_android_core.community; +package com.mango.core.community; import com.google.gson.JsonElement; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo; -import com.yizhuan.xchat_android_core.community.bean.PublishBody; -import com.yizhuan.xchat_android_core.community.event.DynamicPublishEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.community.bean.MiniWorldChooseInfo; +import com.mango.core.community.bean.PublishBody; +import com.mango.core.community.event.DynamicPublishEvent; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/DynamicSysAttachment.java b/core/src/model_community/java/com/mango/core/community/attachment/DynamicSysAttachment.java similarity index 82% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/DynamicSysAttachment.java rename to core/src/model_community/java/com/mango/core/community/attachment/DynamicSysAttachment.java index 9b7db49b7..d0e7ca74b 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/DynamicSysAttachment.java +++ b/core/src/model_community/java/com/mango/core/community/attachment/DynamicSysAttachment.java @@ -1,11 +1,9 @@ -package com.yizhuan.xchat_android_core.community.attachment; +package com.mango.core.community.attachment; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgInfo; - -import lombok.Data; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.msg.sys.ErbanSysMsgInfo; public class DynamicSysAttachment extends CustomAttachment { private ErbanSysMsgInfo erbanSysMsgInfo; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/UnReadCountAttachment.java b/core/src/model_community/java/com/mango/core/community/attachment/UnReadCountAttachment.java similarity index 90% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/UnReadCountAttachment.java rename to core/src/model_community/java/com/mango/core/community/attachment/UnReadCountAttachment.java index ba86e9d2a..03d71c9a5 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/UnReadCountAttachment.java +++ b/core/src/model_community/java/com/mango/core/community/attachment/UnReadCountAttachment.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.community.attachment; +package com.mango.core.community.attachment; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; public class UnReadCountAttachment extends CustomAttachment { diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/Comment.java b/core/src/model_community/java/com/mango/core/community/bean/Comment.java similarity index 86% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/Comment.java rename to core/src/model_community/java/com/mango/core/community/bean/Comment.java index e162f7505..9266832de 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/Comment.java +++ b/core/src/model_community/java/com/mango/core/community/bean/Comment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.mango.core.community.bean; -import com.yizhuan.xchat_android_core.community.bean.comment.Reply; -import com.yizhuan.xchat_android_core.community.bean.comment.ReplyResult; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.core.community.bean.comment.Reply; +import com.mango.core.community.bean.comment.ReplyResult; +import com.mango.core.vip.UserVipInfo; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommentResult.java b/core/src/model_community/java/com/mango/core/community/bean/CommentResult.java similarity index 78% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommentResult.java rename to core/src/model_community/java/com/mango/core/community/bean/CommentResult.java index cf967eeb9..b505a98d8 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommentResult.java +++ b/core/src/model_community/java/com/mango/core/community/bean/CommentResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.mango.core.community.bean; import java.util.List; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommunityNoticeInfo.java b/core/src/model_community/java/com/mango/core/community/bean/CommunityNoticeInfo.java similarity index 95% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommunityNoticeInfo.java rename to core/src/model_community/java/com/mango/core/community/bean/CommunityNoticeInfo.java index 72dd5f09f..b7a68a5be 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommunityNoticeInfo.java +++ b/core/src/model_community/java/com/mango/core/community/bean/CommunityNoticeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.mango.core.community.bean; import lombok.Data; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/DyChangeData.java b/core/src/model_community/java/com/mango/core/community/bean/DyChangeData.java similarity index 73% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/DyChangeData.java rename to core/src/model_community/java/com/mango/core/community/bean/DyChangeData.java index 25ec551f8..a6ef8d44c 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/DyChangeData.java +++ b/core/src/model_community/java/com/mango/core/community/bean/DyChangeData.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.mango.core.community.bean; import lombok.Data; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/DynamicMedia.java b/core/src/model_community/java/com/mango/core/community/bean/DynamicMedia.java similarity index 95% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/DynamicMedia.java rename to core/src/model_community/java/com/mango/core/community/bean/DynamicMedia.java index 8e5a55155..8f54e49c5 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/DynamicMedia.java +++ b/core/src/model_community/java/com/mango/core/community/bean/DynamicMedia.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.mango.core.community.bean; import android.text.TextUtils; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/MiniWorldChooseInfo.java b/core/src/model_community/java/com/mango/core/community/bean/MiniWorldChooseInfo.java similarity index 82% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/MiniWorldChooseInfo.java rename to core/src/model_community/java/com/mango/core/community/bean/MiniWorldChooseInfo.java index c0aa21d98..58dada730 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/MiniWorldChooseInfo.java +++ b/core/src/model_community/java/com/mango/core/community/bean/MiniWorldChooseInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.mango.core.community.bean; import java.io.Serializable; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/PublishBody.java b/core/src/model_community/java/com/mango/core/community/bean/PublishBody.java similarity index 92% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/PublishBody.java rename to core/src/model_community/java/com/mango/core/community/bean/PublishBody.java index d72f27fcb..350d400f8 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/PublishBody.java +++ b/core/src/model_community/java/com/mango/core/community/bean/PublishBody.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.mango.core.community.bean; import java.util.ArrayList; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/PublishItem.java b/core/src/model_community/java/com/mango/core/community/bean/PublishItem.java similarity index 97% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/PublishItem.java rename to core/src/model_community/java/com/mango/core/community/bean/PublishItem.java index c3763cb76..d23b384e8 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/PublishItem.java +++ b/core/src/model_community/java/com/mango/core/community/bean/PublishItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.mango.core.community.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/UnReadCountInfo.java b/core/src/model_community/java/com/mango/core/community/bean/UnReadCountInfo.java similarity index 94% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/UnReadCountInfo.java rename to core/src/model_community/java/com/mango/core/community/bean/UnReadCountInfo.java index 665af358c..07baf4d1f 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/UnReadCountInfo.java +++ b/core/src/model_community/java/com/mango/core/community/bean/UnReadCountInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.mango.core.community.bean; import java.io.Serializable; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/UserDynamicItem.java b/core/src/model_community/java/com/mango/core/community/bean/UserDynamicItem.java similarity index 96% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/UserDynamicItem.java rename to core/src/model_community/java/com/mango/core/community/bean/UserDynamicItem.java index 88982e69b..0d263d149 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/UserDynamicItem.java +++ b/core/src/model_community/java/com/mango/core/community/bean/UserDynamicItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.mango.core.community.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicBean.java b/core/src/model_community/java/com/mango/core/community/bean/WorldDynamicBean.java similarity index 90% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicBean.java rename to core/src/model_community/java/com/mango/core/community/bean/WorldDynamicBean.java index 7a112db23..c951ea7e0 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicBean.java +++ b/core/src/model_community/java/com/mango/core/community/bean/WorldDynamicBean.java @@ -1,11 +1,9 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.mango.core.community.bean; import android.text.TextUtils; -import com.yizhuan.xchat_android_core.user.bean.BaseUserInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.mango.core.user.bean.BaseUserInfo; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicListResult.java b/core/src/model_community/java/com/mango/core/community/bean/WorldDynamicListResult.java similarity index 82% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicListResult.java rename to core/src/model_community/java/com/mango/core/community/bean/WorldDynamicListResult.java index a73d967cf..445e1f5c6 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicListResult.java +++ b/core/src/model_community/java/com/mango/core/community/bean/WorldDynamicListResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.mango.core.community.bean; import java.util.List; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/PopupParams.java b/core/src/model_community/java/com/mango/core/community/bean/comment/PopupParams.java similarity index 87% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/PopupParams.java rename to core/src/model_community/java/com/mango/core/community/bean/comment/PopupParams.java index 70e48f59f..8ec71d5b2 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/PopupParams.java +++ b/core/src/model_community/java/com/mango/core/community/bean/comment/PopupParams.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean.comment; +package com.mango.core.community.bean.comment; import lombok.Data; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/Reply.java b/core/src/model_community/java/com/mango/core/community/bean/comment/Reply.java similarity index 81% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/Reply.java rename to core/src/model_community/java/com/mango/core/community/bean/comment/Reply.java index 18d90cb98..4e4485233 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/Reply.java +++ b/core/src/model_community/java/com/mango/core/community/bean/comment/Reply.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.community.bean.comment; +package com.mango.core.community.bean.comment; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.mango.core.vip.UserVipInfo; import lombok.Data; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/ReplyResult.java b/core/src/model_community/java/com/mango/core/community/bean/comment/ReplyResult.java similarity index 87% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/ReplyResult.java rename to core/src/model_community/java/com/mango/core/community/bean/comment/ReplyResult.java index f81d89569..b772a869f 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/ReplyResult.java +++ b/core/src/model_community/java/com/mango/core/community/bean/comment/ReplyResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean.comment; +package com.mango.core.community.bean.comment; import java.util.ArrayList; import java.util.List; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/DownloadModel.java b/core/src/model_community/java/com/mango/core/community/download/DownloadModel.java similarity index 96% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/DownloadModel.java rename to core/src/model_community/java/com/mango/core/community/download/DownloadModel.java index 1b5749b8d..301c6b68a 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/DownloadModel.java +++ b/core/src/model_community/java/com/mango/core/community/download/DownloadModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.download; +package com.mango.core.community.download; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -9,7 +9,7 @@ import com.liulishuo.okdownload.core.cause.EndCause; import com.liulishuo.okdownload.core.cause.ResumeFailedCause; import com.liulishuo.okdownload.core.listener.DownloadListener1; import com.liulishuo.okdownload.core.listener.assist.Listener1Assist; -import com.yizhuan.xchat_android_core.base.BaseModel; +import com.mango.core.base.BaseModel; import java.io.File; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/IDownloadModel.java b/core/src/model_community/java/com/mango/core/community/download/IDownloadModel.java similarity index 58% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/IDownloadModel.java rename to core/src/model_community/java/com/mango/core/community/download/IDownloadModel.java index 7d5bc3b54..9c26238b5 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/IDownloadModel.java +++ b/core/src/model_community/java/com/mango/core/community/download/IDownloadModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.download; +package com.mango.core.community.download; /** * create by lvzebiao @2019/11/22 diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicDetailModel.java b/core/src/model_community/java/com/mango/core/community/dynamic/DynamicDetailModel.java similarity index 85% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicDetailModel.java rename to core/src/model_community/java/com/mango/core/community/dynamic/DynamicDetailModel.java index 4703d3d8f..59abbd8bb 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicDetailModel.java +++ b/core/src/model_community/java/com/mango/core/community/dynamic/DynamicDetailModel.java @@ -1,17 +1,17 @@ -package com.yizhuan.xchat_android_core.community.dynamic; +package com.mango.core.community.dynamic; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.bean.CommentResult; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.bean.comment.Reply; -import com.yizhuan.xchat_android_core.community.bean.comment.ReplyResult; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.community.bean.CommentResult; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.core.community.bean.comment.Reply; +import com.mango.core.community.bean.comment.ReplyResult; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import retrofit2.http.GET; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicModel.java b/core/src/model_community/java/com/mango/core/community/dynamic/DynamicModel.java similarity index 86% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicModel.java rename to core/src/model_community/java/com/mango/core/community/dynamic/DynamicModel.java index 463227199..36aeed343 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicModel.java +++ b/core/src/model_community/java/com/mango/core/community/dynamic/DynamicModel.java @@ -1,22 +1,16 @@ -package com.yizhuan.xchat_android_core.community.dynamic; +package com.mango.core.community.dynamic; import com.google.gson.JsonElement; -import com.tencent.wxop.stat.event.EventType; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.CommunityConstant; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.community.CommunityConstant; +import com.mango.core.community.bean.WorldDynamicListResult; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; -import java.util.ArrayList; -import java.util.List; - -import cn.sharesdk.framework.Platform; import io.reactivex.Single; import retrofit2.http.POST; import retrofit2.http.Query; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicDetailModel.java b/core/src/model_community/java/com/mango/core/community/dynamic/IDynamicDetailModel.java similarity index 62% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicDetailModel.java rename to core/src/model_community/java/com/mango/core/community/dynamic/IDynamicDetailModel.java index 2263779e3..46da18a61 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicDetailModel.java +++ b/core/src/model_community/java/com/mango/core/community/dynamic/IDynamicDetailModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.community.dynamic; +package com.mango.core.community.dynamic; -import com.yizhuan.xchat_android_core.community.bean.CommentResult; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.bean.comment.Reply; -import com.yizhuan.xchat_android_core.community.bean.comment.ReplyResult; +import com.mango.core.community.bean.CommentResult; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.core.community.bean.comment.Reply; +import com.mango.core.community.bean.comment.ReplyResult; import io.reactivex.Single; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicModel.java b/core/src/model_community/java/com/mango/core/community/dynamic/IDynamicModel.java similarity index 79% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicModel.java rename to core/src/model_community/java/com/mango/core/community/dynamic/IDynamicModel.java index 28d3f93b1..716e7b113 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicModel.java +++ b/core/src/model_community/java/com/mango/core/community/dynamic/IDynamicModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.community.dynamic; +package com.mango.core.community.dynamic; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult; +import com.mango.core.community.bean.WorldDynamicListResult; import io.reactivex.Single; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicDetailFinishEvent.java b/core/src/model_community/java/com/mango/core/community/event/DynamicDetailFinishEvent.java similarity index 71% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicDetailFinishEvent.java rename to core/src/model_community/java/com/mango/core/community/event/DynamicDetailFinishEvent.java index 87460847e..c5b1f4157 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicDetailFinishEvent.java +++ b/core/src/model_community/java/com/mango/core/community/event/DynamicDetailFinishEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.community.event; +package com.mango.core.community.event; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; +import com.mango.core.community.bean.WorldDynamicBean; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicPublishEvent.java b/core/src/model_community/java/com/mango/core/community/event/DynamicPublishEvent.java similarity index 58% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicPublishEvent.java rename to core/src/model_community/java/com/mango/core/community/event/DynamicPublishEvent.java index 225037a17..426c4a544 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicPublishEvent.java +++ b/core/src/model_community/java/com/mango/core/community/event/DynamicPublishEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.event; +package com.mango.core.community.event; /** * create by lvzebiao @2019/12/1 diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/SquareTaskEvent.java b/core/src/model_community/java/com/mango/core/community/event/SquareTaskEvent.java similarity index 52% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/SquareTaskEvent.java rename to core/src/model_community/java/com/mango/core/community/event/SquareTaskEvent.java index 17bc9262b..f6bb741db 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/SquareTaskEvent.java +++ b/core/src/model_community/java/com/mango/core/community/event/SquareTaskEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.event; +package com.mango.core.community.event; import lombok.Data; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/UnReadCountEvent.java b/core/src/model_community/java/com/mango/core/community/event/UnReadCountEvent.java similarity index 71% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/UnReadCountEvent.java rename to core/src/model_community/java/com/mango/core/community/event/UnReadCountEvent.java index 117b38e03..e9e83a93b 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/UnReadCountEvent.java +++ b/core/src/model_community/java/com/mango/core/community/event/UnReadCountEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.event; +package com.mango.core.community.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/im/DynamicImMsg.java b/core/src/model_community/java/com/mango/core/community/im/DynamicImMsg.java similarity index 91% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/im/DynamicImMsg.java rename to core/src/model_community/java/com/mango/core/community/im/DynamicImMsg.java index 28953ed4e..b12a7071f 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/im/DynamicImMsg.java +++ b/core/src/model_community/java/com/mango/core/community/im/DynamicImMsg.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.community.im; +package com.mango.core.community.im; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; +import com.mango.core.community.bean.WorldDynamicBean; import java.io.Serializable; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/im/WorldDynamicAttachment.java b/core/src/model_community/java/com/mango/core/community/im/WorldDynamicAttachment.java similarity index 94% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/im/WorldDynamicAttachment.java rename to core/src/model_community/java/com/mango/core/community/im/WorldDynamicAttachment.java index 718da67f9..cf1c0cf97 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/im/WorldDynamicAttachment.java +++ b/core/src/model_community/java/com/mango/core/community/im/WorldDynamicAttachment.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.community.im; +package com.mango.core.community.im; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.netease.nimlib.sdk.msg.MessageBuilder; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; import lombok.Getter; import lombok.Setter; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/ISquareModel.java b/core/src/model_community/java/com/mango/core/community/square/ISquareModel.java similarity index 71% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/ISquareModel.java rename to core/src/model_community/java/com/mango/core/community/square/ISquareModel.java index 1616b5149..1c2b13873 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/ISquareModel.java +++ b/core/src/model_community/java/com/mango/core/community/square/ISquareModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.community.square; +package com.mango.core.community.square; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.core.community.bean.WorldDynamicListResult; import java.util.List; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/SquareModel.java b/core/src/model_community/java/com/mango/core/community/square/SquareModel.java similarity index 84% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/SquareModel.java rename to core/src/model_community/java/com/mango/core/community/square/SquareModel.java index a79f19ca2..f34430726 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/SquareModel.java +++ b/core/src/model_community/java/com/mango/core/community/square/SquareModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.community.square; +package com.mango.core.community.square; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.CommunityConstant; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.community.CommunityConstant; +import com.mango.core.community.bean.WorldDynamicBean; +import com.mango.core.community.bean.WorldDynamicListResult; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.ArrayList; import java.util.List; diff --git a/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java b/core/src/model_database_room/java/com/mango/moshen/database/AppDataBase.java similarity index 67% rename from core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java rename to core/src/model_database_room/java/com/mango/moshen/database/AppDataBase.java index 93f6a5a14..c085efba6 100644 --- a/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java +++ b/core/src/model_database_room/java/com/mango/moshen/database/AppDataBase.java @@ -1,15 +1,15 @@ -package com.yizhuan.tutu.database; +package com.mango.moshen.database; import androidx.room.Database; import androidx.room.Room; import androidx.room.RoomDatabase; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.db.bean.SongBean; -import com.yizhuan.xchat_android_core.music.db.dao.LocalMusicDao; -import com.yizhuan.xchat_android_core.music.db.dao.SongDao; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.music.db.bean.SongBean; +import com.mango.core.music.db.dao.LocalMusicDao; +import com.mango.core.music.db.dao.SongDao; +import com.mango.xchat_android_library.utils.config.BasicConfig; @Database(entities = {LocalMusicBean.class, SongBean.class}, version = 1, exportSchema = false) public abstract class AppDataBase extends RoomDatabase { diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/HallModel.java similarity index 91% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/HallModel.java index b713f0601..5c4b326e3 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/HallModel.java @@ -1,29 +1,29 @@ -package com.yizhuan.xchat_android_core.module_hall.hall; +package com.mango.core.module_hall.hall; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ApplyResult; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthListResult; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallMenuByUidResult; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OwnerHallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.event.UserHallUpdateEvent; -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.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.event.LogoutEvent; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.module_hall.hall.bean.ApplyResult; +import com.mango.core.module_hall.hall.bean.AuthInfo; +import com.mango.core.module_hall.hall.bean.AuthListResult; +import com.mango.core.module_hall.hall.bean.ClanAndHallInfo; +import com.mango.core.module_hall.hall.bean.ClanInfo; +import com.mango.core.module_hall.hall.bean.HallInfo; +import com.mango.core.module_hall.hall.bean.HallMenuByUidResult; +import com.mango.core.module_hall.hall.bean.ListMemberInfo; +import com.mango.core.module_hall.hall.bean.OptionInfo; +import com.mango.core.module_hall.hall.bean.OwnerHallInfo; +import com.mango.core.module_hall.hall.bean.SuperAdminHall; +import com.mango.core.module_hall.hall.bean.SuperAdminInfo; +import com.mango.core.module_hall.hall.event.UserHallUpdateEvent; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.user.event.LoginUserInfoUpdateEvent; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallNameModel.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/HallNameModel.java similarity index 72% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallNameModel.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/HallNameModel.java index 59945de8a..ce7c73ff7 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallNameModel.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/HallNameModel.java @@ -1,16 +1,12 @@ -package com.yizhuan.xchat_android_core.module_hall.hall; +package com.mango.core.module_hall.hall; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Function; -import io.reactivex.schedulers.Schedulers; import retrofit2.http.POST; import retrofit2.http.Query; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/IHallModel.java similarity index 74% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/IHallModel.java index 1b073a8f6..c31c2b324 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/IHallModel.java @@ -1,15 +1,15 @@ -package com.yizhuan.xchat_android_core.module_hall.hall; +package com.mango.core.module_hall.hall; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ApplyResult; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OwnerHallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo; +import com.mango.core.module_hall.hall.bean.AuthInfo; +import com.mango.core.module_hall.hall.bean.ClanAndHallInfo; +import com.mango.core.module_hall.hall.bean.OptionInfo; +import com.mango.core.module_hall.hall.bean.ApplyResult; +import com.mango.core.module_hall.hall.bean.HallInfo; +import com.mango.core.module_hall.hall.bean.ListMemberInfo; +import com.mango.core.module_hall.hall.bean.OwnerHallInfo; +import com.mango.core.module_hall.hall.bean.SuperAdminHall; +import com.mango.core.module_hall.hall.bean.SuperAdminInfo; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallNameModel.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/IHallNameModel.java similarity index 57% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallNameModel.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/IHallNameModel.java index 5356717f0..0b9539772 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallNameModel.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/IHallNameModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.module_hall.hall; +package com.mango.core.module_hall.hall; -import com.yizhuan.xchat_android_core.base.IModel; +import com.mango.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ApplyResult.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ApplyResult.java similarity index 84% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ApplyResult.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ApplyResult.java index 7ffb9429c..1c55a01a9 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ApplyResult.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ApplyResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.mango.core.module_hall.hall.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/AuthInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/AuthInfo.java similarity index 96% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/AuthInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/AuthInfo.java index 2bf8cb9d4..19e60ec33 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/AuthInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/AuthInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.mango.core.module_hall.hall.bean; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/AuthListResult.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/AuthListResult.java new file mode 100644 index 000000000..23919250a --- /dev/null +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/AuthListResult.java @@ -0,0 +1,8 @@ +package com.mango.core.module_hall.hall.bean; + +import com.mango.core.bean.response.ServiceResult; + +import java.util.List; + +public class AuthListResult extends ServiceResult> { +} diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanAndHallInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ClanAndHallInfo.java similarity index 70% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanAndHallInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ClanAndHallInfo.java index c39c10edb..32880efcf 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanAndHallInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ClanAndHallInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.mango.core.module_hall.hall.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ClanInfo.java similarity index 87% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ClanInfo.java index 0252ec6c5..2049feece 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ClanInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.mango.core.module_hall.hall.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/GroupListInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/GroupListInfo.java similarity index 79% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/GroupListInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/GroupListInfo.java index 274ad6ef5..b38da43df 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/GroupListInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/GroupListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.mango.core.module_hall.hall.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HTeamInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/HTeamInfo.java similarity index 86% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HTeamInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/HTeamInfo.java index ce828c0cd..bce1e41e6 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HTeamInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/HTeamInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.mango.core.module_hall.hall.bean; -import com.yizhuan.xchat_android_core.module_hall.team.bean.HTeamType; +import com.mango.core.module_hall.team.bean.HTeamType; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HTeamMember.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/HTeamMember.java similarity index 86% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HTeamMember.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/HTeamMember.java index 64309d99a..69f0ff1c9 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HTeamMember.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/HTeamMember.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.mango.core.module_hall.hall.bean; -import com.yizhuan.xchat_android_core.user.bean.SimpleUserInfo; +import com.mango.core.user.bean.SimpleUserInfo; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HallInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/HallInfo.java similarity index 90% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HallInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/HallInfo.java index 127683794..ca153a894 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HallInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/HallInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.mango.core.module_hall.hall.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/HallMenuByUidResult.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/HallMenuByUidResult.java new file mode 100644 index 000000000..00825a032 --- /dev/null +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/HallMenuByUidResult.java @@ -0,0 +1,8 @@ +package com.mango.core.module_hall.hall.bean; + +import com.mango.core.bean.response.ServiceResult; + +import java.util.List; + +public class HallMenuByUidResult extends ServiceResult> { +} diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ListHTeamMember.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ListHTeamMember.java similarity index 83% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ListHTeamMember.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ListHTeamMember.java index c5aadbd3e..909c5481b 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ListHTeamMember.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ListHTeamMember.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.mango.core.module_hall.hall.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ListMemberInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ListMemberInfo.java similarity index 75% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ListMemberInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ListMemberInfo.java index fa42ca693..f5bd010a8 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ListMemberInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/ListMemberInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.mango.core.module_hall.hall.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/MemberInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/MemberInfo.java similarity index 86% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/MemberInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/MemberInfo.java index 145d88e17..a51e35c20 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/MemberInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/MemberInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.mango.core.module_hall.hall.bean; -import com.yizhuan.xchat_android_core.user.bean.SimpleUserInfo; +import com.mango.core.user.bean.SimpleUserInfo; import java.io.Serializable; import java.util.Objects; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OptionInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/OptionInfo.java similarity index 96% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OptionInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/OptionInfo.java index b136149ca..e23a0f211 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OptionInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/OptionInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.mango.core.module_hall.hall.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OwnerHallInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/OwnerHallInfo.java similarity index 89% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OwnerHallInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/OwnerHallInfo.java index 7efed4f8e..ad30be61d 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OwnerHallInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/OwnerHallInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.mango.core.module_hall.hall.bean; -import com.yizhuan.xchat_android_core.module_hall.team.bean.HTeamType; +import com.mango.core.module_hall.team.bean.HTeamType; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/RoleType.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/RoleType.java similarity index 87% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/RoleType.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/RoleType.java index f4e82066c..35775125b 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/RoleType.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/RoleType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.mango.core.module_hall.hall.bean; /** * 模厅角色 diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminHall.kt b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/SuperAdminHall.kt similarity index 76% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminHall.kt rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/SuperAdminHall.kt index dd4dabd19..169a3ece2 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminHall.kt +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/SuperAdminHall.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean +package com.mango.core.module_hall.hall.bean data class SuperAdminHall( val hallAvatar: String? = null, diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminInfo.kt b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/SuperAdminInfo.kt similarity index 80% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminInfo.kt rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/SuperAdminInfo.kt index 43883a24f..c6497c64a 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminInfo.kt +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/bean/SuperAdminInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean +package com.mango.core.module_hall.hall.bean data class SuperAdminInfo( val avatar: String? = null, diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/event/UserHallUpdateEvent.java b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/event/UserHallUpdateEvent.java similarity index 64% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/event/UserHallUpdateEvent.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/hall/event/UserHallUpdateEvent.java index 0e65db512..42b949f3c 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/event/UserHallUpdateEvent.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/hall/event/UserHallUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.event; +package com.mango.core.module_hall.hall.event; /** * 用户模厅更新事件 diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/HallAttachment.java b/core/src/model_labour_union/java/com/mango/core/module_hall/im/HallAttachment.java similarity index 86% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/HallAttachment.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/im/HallAttachment.java index b36ecb10a..90e3d5b37 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/HallAttachment.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/im/HallAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.module_hall.im; +package com.mango.core.module_hall.im; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; /** * 模厅消息 diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/HallImMsgInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/im/HallImMsgInfo.java similarity index 90% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/HallImMsgInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/im/HallImMsgInfo.java index 48dcef4f0..35a934e65 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/HallImMsgInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/im/HallImMsgInfo.java @@ -1,6 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.im; - -import com.yizhuan.xchat_android_core.im.custom.bean.RouterType; +package com.mango.core.module_hall.im; import java.io.Serializable; import java.util.HashMap; @@ -35,7 +33,7 @@ public class HallImMsgInfo implements Serializable{ private int type; /**后台给的显示内容*/ private String layout; - /**{@link com.yizhuan.xchat_android_core.im.custom.bean.RouterType}*/ + /**{@link com.mango.core.im.custom.bean.RouterType}*/ private int routerType; private String routerValue; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/bean/HallMsgComponent.java b/core/src/model_labour_union/java/com/mango/core/module_hall/im/bean/HallMsgComponent.java similarity index 84% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/bean/HallMsgComponent.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/im/bean/HallMsgComponent.java index fd673e753..5b3cd8850 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/bean/HallMsgComponent.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/im/bean/HallMsgComponent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.im.bean; +package com.mango.core.module_hall.im.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/bean/HallMsgLayout.java b/core/src/model_labour_union/java/com/mango/core/module_hall/im/bean/HallMsgLayout.java similarity index 81% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/bean/HallMsgLayout.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/im/bean/HallMsgLayout.java index 6b5914771..8b88c5773 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/bean/HallMsgLayout.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/im/bean/HallMsgLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.im.bean; +package com.mango.core.module_hall.im.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IIncomeModel.java b/core/src/model_labour_union/java/com/mango/core/module_hall/income/IIncomeModel.java similarity index 55% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IIncomeModel.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/income/IIncomeModel.java index 97654b5ee..26d8c70d4 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IIncomeModel.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/income/IIncomeModel.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.module_hall.income; +package com.mango.core.module_hall.income; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeTotalInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.mango.core.base.IModel; +import com.mango.core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.mango.core.module_hall.income.bean.IncomeGiftInfo; +import com.mango.core.module_hall.income.bean.IncomeTotalInfo; +import com.mango.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IncomeModel.java b/core/src/model_labour_union/java/com/mango/core/module_hall/income/IncomeModel.java similarity index 88% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IncomeModel.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/income/IncomeModel.java index af8ed1440..e576dd0cc 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IncomeModel.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/income/IncomeModel.java @@ -1,14 +1,14 @@ -package com.yizhuan.xchat_android_core.module_hall.income; +package com.mango.core.module_hall.income; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeTotalInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.mango.core.module_hall.income.bean.IncomeGiftInfo; +import com.mango.core.module_hall.income.bean.IncomeTotalInfo; +import com.mango.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/ClanIncomeInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/ClanIncomeInfo.java similarity index 84% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/ClanIncomeInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/ClanIncomeInfo.java index 6f880497d..2e617d6df 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/ClanIncomeInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/ClanIncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.mango.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/ClanTotalIncomeInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/ClanTotalIncomeInfo.java similarity index 71% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/ClanTotalIncomeInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/ClanTotalIncomeInfo.java index 732fa4900..69b36061e 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/ClanTotalIncomeInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/ClanTotalIncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.mango.core.module_hall.income.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeGiftInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/IncomeGiftInfo.java similarity index 81% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeGiftInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/IncomeGiftInfo.java index 10d6f0306..4b29c9fd4 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeGiftInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/IncomeGiftInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.mango.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/IncomeInfo.java similarity index 85% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/IncomeInfo.java index ef296cc0e..eb6cf7bb1 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/IncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.mango.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeTotalInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/IncomeTotalInfo.java similarity index 69% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeTotalInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/IncomeTotalInfo.java index c772cdc82..557854f19 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeTotalInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/IncomeTotalInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.mango.core.module_hall.income.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomIncomeInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/SingleRoomIncomeInfo.java similarity index 82% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomIncomeInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/SingleRoomIncomeInfo.java index 5e64ddb81..dc10efd0f 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomIncomeInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/SingleRoomIncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.mango.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java similarity index 73% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java index 3edf88586..ac4afd3c9 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.mango.core.module_hall.income.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/mango/core/module_hall/income/event/UpdateMemberListEvent.java b/core/src/model_labour_union/java/com/mango/core/module_hall/income/event/UpdateMemberListEvent.java new file mode 100644 index 000000000..322c58473 --- /dev/null +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/income/event/UpdateMemberListEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.module_hall.income.event; + +public class UpdateMemberListEvent { +} diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/ISecretCodeModel.java b/core/src/model_labour_union/java/com/mango/core/module_hall/secretcode/ISecretCodeModel.java similarity index 59% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/ISecretCodeModel.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/secretcode/ISecretCodeModel.java index f569a50ba..cd5f04fe5 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/ISecretCodeModel.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/secretcode/ISecretCodeModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.module_hall.secretcode; +package com.mango.core.module_hall.secretcode; -import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.CheckCodeResult; -import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.SecretCodeInfo; +import com.mango.core.module_hall.secretcode.bean.CheckCodeResult; +import com.mango.core.module_hall.secretcode.bean.SecretCodeInfo; import io.reactivex.Single; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/SecretCodeModel.java b/core/src/model_labour_union/java/com/mango/core/module_hall/secretcode/SecretCodeModel.java similarity index 80% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/SecretCodeModel.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/secretcode/SecretCodeModel.java index 2dc1ab5a9..1c58ade73 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/SecretCodeModel.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/secretcode/SecretCodeModel.java @@ -1,17 +1,15 @@ -package com.yizhuan.xchat_android_core.module_hall.secretcode; +package com.mango.core.module_hall.secretcode; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.CheckCodeResult; -import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.SecretCodeInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.module_hall.secretcode.bean.CheckCodeResult; +import com.mango.core.module_hall.secretcode.bean.SecretCodeInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.functions.Function; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/bean/CheckCodeResult.java b/core/src/model_labour_union/java/com/mango/core/module_hall/secretcode/bean/CheckCodeResult.java similarity index 95% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/bean/CheckCodeResult.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/secretcode/bean/CheckCodeResult.java index 1780ebd63..1431c49b4 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/bean/CheckCodeResult.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/secretcode/bean/CheckCodeResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.secretcode.bean; +package com.mango.core.module_hall.secretcode.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/bean/SecretCodeInfo.java b/core/src/model_labour_union/java/com/mango/core/module_hall/secretcode/bean/SecretCodeInfo.java similarity index 90% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/bean/SecretCodeInfo.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/secretcode/bean/SecretCodeInfo.java index 9c5003d6f..59a963bfe 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/bean/SecretCodeInfo.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/secretcode/bean/SecretCodeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.secretcode.bean; +package com.mango.core.module_hall.secretcode.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/HTeamModel.java b/core/src/model_labour_union/java/com/mango/core/module_hall/team/HTeamModel.java similarity index 93% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/HTeamModel.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/team/HTeamModel.java index 5203427c8..001e10b0a 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/HTeamModel.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/team/HTeamModel.java @@ -1,21 +1,21 @@ -package com.yizhuan.xchat_android_core.module_hall.team; +package com.mango.core.module_hall.team; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.msg.MsgService; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListHTeamMember; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; -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.module_hall.team.event.HteamInfoUpdateInfoEvent; -import com.yizhuan.xchat_android_core.module_hall.team.event.HteamListChangeEvent; -import com.yizhuan.xchat_android_core.module_hall.team.event.HteamMemberNumChangeEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.module_hall.hall.HallModel; +import com.mango.core.module_hall.hall.bean.ListHTeamMember; +import com.mango.core.module_hall.hall.bean.ListMemberInfo; +import com.mango.core.module_hall.team.bean.HTeamChatLimit; +import com.mango.core.module_hall.hall.bean.HTeamInfo; +import com.mango.core.module_hall.team.event.HteamInfoUpdateInfoEvent; +import com.mango.core.module_hall.team.event.HteamListChangeEvent; +import com.mango.core.module_hall.team.event.HteamMemberNumChangeEvent; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; @@ -23,9 +23,6 @@ import java.util.ArrayList; import java.util.List; import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; import retrofit2.http.GET; import retrofit2.http.POST; import retrofit2.http.Query; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/IHTeamModel.java b/core/src/model_labour_union/java/com/mango/core/module_hall/team/IHTeamModel.java similarity index 88% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/IHTeamModel.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/team/IHTeamModel.java index 54b1b3054..a3e96f5bb 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/IHTeamModel.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/team/IHTeamModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.module_hall.team; +package com.mango.core.module_hall.team; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListHTeamMember; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; -import com.yizhuan.xchat_android_core.module_hall.team.bean.HTeamChatLimit; +import com.mango.core.module_hall.hall.bean.HTeamInfo; +import com.mango.core.module_hall.hall.bean.ListHTeamMember; +import com.mango.core.module_hall.hall.bean.ListMemberInfo; +import com.mango.core.module_hall.team.bean.HTeamChatLimit; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/bean/HTeamChatLimit.java b/core/src/model_labour_union/java/com/mango/core/module_hall/team/bean/HTeamChatLimit.java similarity index 82% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/bean/HTeamChatLimit.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/team/bean/HTeamChatLimit.java index bc43f60bc..506bfa8be 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/bean/HTeamChatLimit.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/team/bean/HTeamChatLimit.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.team.bean; +package com.mango.core.module_hall.team.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/bean/HTeamType.java b/core/src/model_labour_union/java/com/mango/core/module_hall/team/bean/HTeamType.java similarity index 73% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/bean/HTeamType.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/team/bean/HTeamType.java index 7671d9c9b..dd0c0de26 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/bean/HTeamType.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/team/bean/HTeamType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.team.bean; +package com.mango.core.module_hall.team.bean; /** * 群类型 diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamInfoUpdateInfoEvent.java b/core/src/model_labour_union/java/com/mango/core/module_hall/team/event/HteamInfoUpdateInfoEvent.java similarity index 51% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamInfoUpdateInfoEvent.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/team/event/HteamInfoUpdateInfoEvent.java index e07169e4a..e18ae7604 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamInfoUpdateInfoEvent.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/team/event/HteamInfoUpdateInfoEvent.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.module_hall.team.event; +package com.mango.core.module_hall.team.event; -import com.yizhuan.xchat_android_core.base.BaseBusEvent; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; +import com.mango.core.base.BaseBusEvent; +import com.mango.core.module_hall.hall.bean.HTeamInfo; /** * Created by lvzebiao on 2019/1/15. diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamListChangeEvent.java b/core/src/model_labour_union/java/com/mango/core/module_hall/team/event/HteamListChangeEvent.java similarity index 64% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamListChangeEvent.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/team/event/HteamListChangeEvent.java index e6a1bc850..447ab39b8 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamListChangeEvent.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/team/event/HteamListChangeEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.team.event; +package com.mango.core.module_hall.team.event; /** * 厅群列表改变的事件 diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamMemberNumChangeEvent.java b/core/src/model_labour_union/java/com/mango/core/module_hall/team/event/HteamMemberNumChangeEvent.java similarity index 65% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamMemberNumChangeEvent.java rename to core/src/model_labour_union/java/com/mango/core/module_hall/team/event/HteamMemberNumChangeEvent.java index 802275421..216074c37 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamMemberNumChangeEvent.java +++ b/core/src/model_labour_union/java/com/mango/core/module_hall/team/event/HteamMemberNumChangeEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.module_hall.team.event; +package com.mango.core.module_hall.team.event; -import com.yizhuan.xchat_android_core.base.BaseBusEvent; +import com.mango.core.base.BaseBusEvent; /** * 厅群的成员变动事件 diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/AuthListResult.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/AuthListResult.java deleted file mode 100644 index b1fd0f14d..000000000 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/AuthListResult.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -import java.util.List; - -public class AuthListResult extends ServiceResult> { -} diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HallMenuByUidResult.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HallMenuByUidResult.java deleted file mode 100644 index 2c7e20209..000000000 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HallMenuByUidResult.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo; - -import java.util.List; - -public class HallMenuByUidResult extends ServiceResult> { -} diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/event/UpdateMemberListEvent.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/event/UpdateMemberListEvent.java deleted file mode 100644 index f0a5b6fd6..000000000 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/event/UpdateMemberListEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.module_hall.income.event; - -public class UpdateMemberListEvent { -} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java similarity index 69% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java index a7f17b0b4..d8c7e96c3 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.mango.core.mentoring_relationship.attachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; public class MentoringApprenticeMissionFourAttachment extends MentoringMasterMissionFourAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java similarity index 69% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java index 97751c647..95ccfca1c 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.mango.core.mentoring_relationship.attachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; public class MentoringApprenticeMissionOneAttachment extends MentoringMasterMissionOneAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java similarity index 76% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java index 05756e1f0..411670f8e 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.mango.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MissionVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.SimpleGiftVo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.mentoring_relationship.bean.MissionVo; +import com.mango.core.mentoring_relationship.bean.SimpleGiftVo; public class MentoringApprenticeMissionThreeAttachment extends MentoringMasterMissionThreeAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java similarity index 69% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java index ba2aa4851..63cb1a2f0 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.mango.core.mentoring_relationship.attachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; public class MentoringApprenticeMissionTwoAttachment extends MentoringMasterMissionTwoAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java similarity index 78% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java index e47257880..b3eccc909 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.mango.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.GrabApprenticesMissionInfo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.mentoring_relationship.bean.GrabApprenticesMissionInfo; public class MentoringGrabApprenticesAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java similarity index 79% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java index 8b9002eef..384bae7dc 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.mango.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MissionVo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.mentoring_relationship.bean.MissionVo; public class MentoringMasterMissionFourAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java similarity index 77% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java index ae94ead4a..d8e2ce073 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.mango.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MissionVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.SimpleUserVo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.mentoring_relationship.bean.MissionVo; +import com.mango.core.mentoring_relationship.bean.SimpleUserVo; public class MentoringMasterMissionOneAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java similarity index 79% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java index eed37b113..f9ff428ac 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.mango.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MissionVo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.mentoring_relationship.bean.MissionVo; public class MentoringMasterMissionThreeAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java similarity index 77% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java index 7b01f02bc..4f3af8e53 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.mango.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MissionVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.SimpleGiftVo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.mentoring_relationship.bean.MissionVo; +import com.mango.core.mentoring_relationship.bean.SimpleGiftVo; public class MentoringMasterMissionTwoAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java similarity index 79% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java index 06eec9800..3e7625781 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.mango.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringTipsInfo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.mentoring_relationship.bean.MentoringTipsInfo; public class MentoringMissionTipsAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java similarity index 81% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java index 0ff59eadc..0521c7c0b 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.mango.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringSharingRoomInfo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.mentoring_relationship.bean.MentoringSharingRoomInfo; public class MentoringSharingRoomAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/GrabApprenticesInfo.java similarity index 91% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/GrabApprenticesInfo.java index 285dbd780..ee2364a1e 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/GrabApprenticesInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean; +package com.mango.core.mentoring_relationship.bean; import lombok.Data; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.java similarity index 75% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.java index 6c31f5db5..1152c894d 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean; +package com.mango.core.mentoring_relationship.bean; import java.util.List; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringRankingDataInfo.java similarity index 99% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringRankingDataInfo.java index 5ce4d316d..e8b1a5be0 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringRankingDataInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean; +package com.mango.core.mentoring_relationship.bean; import java.util.List; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java similarity index 82% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java index ca577c8d5..46e003127 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean; +package com.mango.core.mentoring_relationship.bean; import lombok.Data; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringSharingRoomInfo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringSharingRoomInfo.java similarity index 89% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringSharingRoomInfo.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringSharingRoomInfo.java index 8166b1d68..d693b212f 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringSharingRoomInfo.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringSharingRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean; +package com.mango.core.mentoring_relationship.bean; import java.io.Serializable; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringTipsInfo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringTipsInfo.java similarity index 82% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringTipsInfo.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringTipsInfo.java index 0f17af4fd..4d1649093 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringTipsInfo.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringTipsInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean; +package com.mango.core.mentoring_relationship.bean; import java.io.Serializable; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringUserInfo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringUserInfo.java similarity index 96% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringUserInfo.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringUserInfo.java index 3c99cbbff..0f648f23f 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringUserInfo.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MentoringUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean; +package com.mango.core.mentoring_relationship.bean; import lombok.Data; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MissionVo.java similarity index 80% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MissionVo.java index 6fd22c382..059afbe17 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/MissionVo.java @@ -1,11 +1,7 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean; - -import com.netease.nimlib.sdk.msg.model.IMMessage; +package com.mango.core.mentoring_relationship.bean; import java.io.Serializable; -import java.util.HashMap; import java.util.List; -import java.util.Map; import lombok.Data; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/PickUpApprenticeInfo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/PickUpApprenticeInfo.java similarity index 83% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/PickUpApprenticeInfo.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/PickUpApprenticeInfo.java index 4f33a82b3..44b27844b 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/PickUpApprenticeInfo.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/PickUpApprenticeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean; +package com.mango.core.mentoring_relationship.bean; import lombok.Data; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleGiftVo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/SimpleGiftVo.java similarity index 82% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleGiftVo.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/SimpleGiftVo.java index 03e5b2085..63b561d9f 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleGiftVo.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/SimpleGiftVo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean; +package com.mango.core.mentoring_relationship.bean; import java.io.Serializable; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/SimpleUserVo.java similarity index 86% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/SimpleUserVo.java index 2e114ea18..6400ebc19 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/SimpleUserVo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean; +package com.mango.core.mentoring_relationship.bean; import java.io.Serializable; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/GrabApprenticesDataEvent.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/GrabApprenticesDataEvent.java similarity index 58% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/GrabApprenticesDataEvent.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/GrabApprenticesDataEvent.java index 776d39046..b51cc4f30 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/GrabApprenticesDataEvent.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/GrabApprenticesDataEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; +package com.mango.core.mentoring_relationship.event; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.GrabApprenticesInfo; +import com.mango.core.mentoring_relationship.bean.GrabApprenticesInfo; import java.util.List; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/GrabApprenticesEvent.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/GrabApprenticesEvent.java similarity index 63% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/GrabApprenticesEvent.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/GrabApprenticesEvent.java index 82bb871d7..8c45b7f49 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/GrabApprenticesEvent.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/GrabApprenticesEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; +package com.mango.core.mentoring_relationship.event; /** * 抢徒弟消息到达时，在顶部出现一个 dialog 作为提示 diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringCountingEvent.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringCountingEvent.java similarity index 83% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringCountingEvent.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringCountingEvent.java index ad66e26a0..7b6de1186 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringCountingEvent.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringCountingEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; +package com.mango.core.mentoring_relationship.event; import lombok.Data; diff --git a/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringCountingFinishEvent.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringCountingFinishEvent.java new file mode 100644 index 000000000..7a2574e79 --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringCountingFinishEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.mentoring_relationship.event; + +public class MentoringCountingFinishEvent { +} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java similarity index 74% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java index 10b4c076e..d4cea240d 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; +package com.mango.core.mentoring_relationship.event; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; import lombok.Data; diff --git a/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringStartCountingEvent.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringStartCountingEvent.java new file mode 100644 index 000000000..b86f4c48e --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringStartCountingEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.mentoring_relationship.event; + +public class MentoringStartCountingEvent { +} diff --git a/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringStopCountingEvent.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringStopCountingEvent.java new file mode 100644 index 000000000..9ab077e78 --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringStopCountingEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.mentoring_relationship.event; + +public class MentoringStopCountingEvent { +} diff --git a/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringSuccessEvent.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringSuccessEvent.java new file mode 100644 index 000000000..01a87f29d --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/event/MentoringSuccessEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.mentoring_relationship.event; + +public class MentoringSuccessEvent { +} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java similarity index 82% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java index 7ae9081b6..92f2adc87 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.exception; +package com.mango.core.mentoring_relationship.exception; public class MentoringAlreadyHasMasterException extends Exception { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java similarity index 51% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java index a2c1e78bc..5bf19ac37 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.exception; +package com.mango.core.mentoring_relationship.exception; public class MentoringCanNotPickUpApprenticeException extends Exception { } diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java similarity index 79% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java index 783ad9965..122fe0c7a 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.exception; +package com.mango.core.mentoring_relationship.exception; public class MentoringLessThanFiveMinutesException extends Exception { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringMissionExpiredException.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/exception/MentoringMissionExpiredException.java similarity index 79% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringMissionExpiredException.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/exception/MentoringMissionExpiredException.java index d8748c451..690d6385c 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringMissionExpiredException.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/exception/MentoringMissionExpiredException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.exception; +package com.mango.core.mentoring_relationship.exception; public class MentoringMissionExpiredException extends Exception { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/IMentoringRelationshipModel.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/model/IMentoringRelationshipModel.java similarity index 68% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/IMentoringRelationshipModel.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/model/IMentoringRelationshipModel.java index 418de5faf..e3c510788 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/IMentoringRelationshipModel.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/model/IMentoringRelationshipModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.model; +package com.mango.core.mentoring_relationship.model; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringRankingDataInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringResultMarqueeInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringUserInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.PickUpApprenticeInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.gift.bean.GiftReceiveInfo; +import com.mango.core.mentoring_relationship.bean.MentoringRankingDataInfo; +import com.mango.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; +import com.mango.core.mentoring_relationship.bean.MentoringUserInfo; +import com.mango.core.mentoring_relationship.bean.PickUpApprenticeInfo; import java.util.List; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/MentoringRelationshipModel.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/model/MentoringRelationshipModel.java similarity index 91% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/MentoringRelationshipModel.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/model/MentoringRelationshipModel.java index e460ca779..7cb34e7f7 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/MentoringRelationshipModel.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/model/MentoringRelationshipModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.model; +package com.mango.core.mentoring_relationship.model; import android.os.CountDownTimer; import android.util.Log; @@ -8,52 +8,52 @@ import com.netease.nimlib.sdk.msg.constant.MsgDirectionEnum; import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.exception.UnKnowException; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.exception.GiftOutOfDateException; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringGrabApprenticesAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.GrabApprenticesInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.GrabApprenticesMissionInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringRankingDataInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringResultMarqueeInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringTipsInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringUserInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MissionVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.PickUpApprenticeInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.SimpleGiftVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.SimpleUserVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.GrabApprenticesDataEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.GrabApprenticesEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringCountingEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringCountingFinishEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringRelationshipMissionEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringStartCountingEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringStopCountingEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringSuccessEvent; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.rxbus.RxBus; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.auth.event.LogoutEvent; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.exception.FailReasonException; +import com.mango.core.exception.UnKnowException; +import com.mango.core.gift.bean.GiftReceiveInfo; +import com.mango.core.gift.exception.GiftOutOfDateException; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringGrabApprenticesAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; +import com.mango.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; +import com.mango.core.mentoring_relationship.bean.GrabApprenticesInfo; +import com.mango.core.mentoring_relationship.bean.GrabApprenticesMissionInfo; +import com.mango.core.mentoring_relationship.bean.MentoringRankingDataInfo; +import com.mango.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; +import com.mango.core.mentoring_relationship.bean.MentoringTipsInfo; +import com.mango.core.mentoring_relationship.bean.MentoringUserInfo; +import com.mango.core.mentoring_relationship.bean.MissionVo; +import com.mango.core.mentoring_relationship.bean.PickUpApprenticeInfo; +import com.mango.core.mentoring_relationship.bean.SimpleGiftVo; +import com.mango.core.mentoring_relationship.bean.SimpleUserVo; +import com.mango.core.mentoring_relationship.event.GrabApprenticesDataEvent; +import com.mango.core.mentoring_relationship.event.GrabApprenticesEvent; +import com.mango.core.mentoring_relationship.event.MentoringCountingEvent; +import com.mango.core.mentoring_relationship.event.MentoringCountingFinishEvent; +import com.mango.core.mentoring_relationship.event.MentoringRelationshipMissionEvent; +import com.mango.core.mentoring_relationship.event.MentoringStartCountingEvent; +import com.mango.core.mentoring_relationship.event.MentoringStopCountingEvent; +import com.mango.core.mentoring_relationship.event.MentoringSuccessEvent; +import com.mango.core.msg.sys.ErbanSysMsgInfo; +import com.mango.core.utils.SharedPreferenceUtils; +import com.mango.core.utils.net.BalanceNotEnoughExeption; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.rxbus.RxBus; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/view/IMentoringRelationshipView.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/view/IMentoringRelationshipView.java similarity index 75% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/view/IMentoringRelationshipView.java rename to core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/view/IMentoringRelationshipView.java index 72ba2cb2a..25478af95 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/view/IMentoringRelationshipView.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/view/IMentoringRelationshipView.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.view; +package com.mango.core.mentoring_relationship.view; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringRankingDataInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringResultMarqueeInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringUserInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.PickUpApprenticeInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.mentoring_relationship.bean.MentoringRankingDataInfo; +import com.mango.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; +import com.mango.core.mentoring_relationship.bean.MentoringUserInfo; +import com.mango.core.mentoring_relationship.bean.PickUpApprenticeInfo; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringCountingFinishEvent.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringCountingFinishEvent.java deleted file mode 100644 index 5bd290da4..000000000 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringCountingFinishEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; - -public class MentoringCountingFinishEvent { -} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringStartCountingEvent.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringStartCountingEvent.java deleted file mode 100644 index 27221874d..000000000 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringStartCountingEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; - -public class MentoringStartCountingEvent { -} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringStopCountingEvent.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringStopCountingEvent.java deleted file mode 100644 index 2b23c02e1..000000000 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringStopCountingEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; - -public class MentoringStopCountingEvent { -} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringSuccessEvent.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringSuccessEvent.java deleted file mode 100644 index 08787d3e0..000000000 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringSuccessEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; - -public class MentoringSuccessEvent { -} diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/AudioPartyInfo.java similarity index 90% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/AudioPartyInfo.java index c7d1fc1b1..88640c443 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/AudioPartyInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyItem.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/AudioPartyItem.java similarity index 96% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyItem.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/AudioPartyItem.java index 5e577ae04..8c58fa73f 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyItem.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/AudioPartyItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyListInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/AudioPartyListInfo.java similarity index 77% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyListInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/AudioPartyListInfo.java index 76dafc929..ffb469813 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyListInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/AudioPartyListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import java.util.ArrayList; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MWChatInfo.java similarity index 88% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MWChatInfo.java index 80efb08fb..5fb5b8be8 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MWChatInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatMemberCountAttachment.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MWChatMemberCountAttachment.java similarity index 91% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatMemberCountAttachment.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MWChatMemberCountAttachment.java index 64eec818a..2056d9061 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatMemberCountAttachment.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MWChatMemberCountAttachment.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatTopicAttachment.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MWChatTopicAttachment.java similarity index 88% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatTopicAttachment.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MWChatTopicAttachment.java index d40ef0792..f31e3490f 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatTopicAttachment.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MWChatTopicAttachment.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; public class MWChatTopicAttachment extends CustomAttachment { public long getWorldId() { diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldCategoryInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldCategoryInfo.java similarity index 88% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldCategoryInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldCategoryInfo.java index c3914d5ab..778d93ff6 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldCategoryInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldCategoryInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldDetailInfo.java similarity index 96% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldDetailInfo.java index 0d4925abb..c5d979ab2 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldDetailInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java similarity index 91% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java index 12b2926b6..95890b2de 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java similarity index 91% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java index b6474e84b..e7f234edc 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldEditClassifyInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldEditClassifyInfo.java similarity index 85% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldEditClassifyInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldEditClassifyInfo.java index 33287b54d..374ed7042 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldEditClassifyInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldEditClassifyInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldInWorldInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldInWorldInfo.java similarity index 80% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldInWorldInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldInWorldInfo.java index da0f95e73..aa784bde8 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldInWorldInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldInWorldInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldInfo.java similarity index 93% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldInfo.java index b2aa3a140..1e51082d4 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.mango.core.user.bean.UserInfo; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldListInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldListInfo.java similarity index 68% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldListInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldListInfo.java index 7edbd0cf4..16e962506 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldListInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMainInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldMainInfo.java similarity index 68% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMainInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldMainInfo.java index b1e9ad79e..d51575e0e 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMainInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldMainInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.mango.core.home.bean.BannerInfo; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMainItemInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldMainItemInfo.java similarity index 93% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMainItemInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldMainItemInfo.java index e87322a8c..e292e3706 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMainItemInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldMainItemInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMemberListInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldMemberListInfo.java similarity index 83% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMemberListInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldMemberListInfo.java index ca800dd59..fa7db4a52 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMemberListInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldMemberListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMemberListMemberInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldMemberListMemberInfo.java similarity index 87% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMemberListMemberInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldMemberListMemberInfo.java index 95b77615b..4e4beb0f6 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMemberListMemberInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/MiniWorldMemberListMemberInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; -import com.yizhuan.xchat_android_core.level.UserLevelVo; +import com.mango.core.level.UserLevelVo; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/OpenAudioPartyAttachment.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/OpenAudioPartyAttachment.java similarity index 90% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/OpenAudioPartyAttachment.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/OpenAudioPartyAttachment.java index 15911b96e..fdf65c4f8 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/OpenAudioPartyAttachment.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/OpenAudioPartyAttachment.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; public class OpenAudioPartyAttachment extends CustomAttachment { diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/OpenSuccessInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/OpenSuccessInfo.java similarity index 60% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/OpenSuccessInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/OpenSuccessInfo.java index 7cf9a2d83..3ac90f9d0 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/OpenSuccessInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/OpenSuccessInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/TopicInfo.java b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/TopicInfo.java similarity index 59% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/TopicInfo.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/bean/TopicInfo.java index 5a0e880ba..1f8f03b55 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/TopicInfo.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/bean/TopicInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.mango.core.miniworld.bean; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/mango/core/miniworld/event/AudioPartyOpenEvent.java b/core/src/model_mini_world/java/com/mango/core/miniworld/event/AudioPartyOpenEvent.java new file mode 100644 index 000000000..2cb50595c --- /dev/null +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/event/AudioPartyOpenEvent.java @@ -0,0 +1,4 @@ +package com.mango.core.miniworld.event; + +public class AudioPartyOpenEvent { +} diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWChatTopicEvent.java b/core/src/model_mini_world/java/com/mango/core/miniworld/event/MWChatTopicEvent.java similarity index 67% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWChatTopicEvent.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/event/MWChatTopicEvent.java index 164d75d01..ca5c9abe5 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWChatTopicEvent.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/event/MWChatTopicEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.event; +package com.mango.core.miniworld.event; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWGroupChatMemberEvent.java b/core/src/model_mini_world/java/com/mango/core/miniworld/event/MWGroupChatMemberEvent.java similarity index 75% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWGroupChatMemberEvent.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/event/MWGroupChatMemberEvent.java index e63804446..e842aa404 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWGroupChatMemberEvent.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/event/MWGroupChatMemberEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.event; +package com.mango.core.miniworld.event; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWOpenAudioPartyEvent.java b/core/src/model_mini_world/java/com/mango/core/miniworld/event/MWOpenAudioPartyEvent.java similarity index 72% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWOpenAudioPartyEvent.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/event/MWOpenAudioPartyEvent.java index c301cd5db..ea10af970 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWOpenAudioPartyEvent.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/event/MWOpenAudioPartyEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.event; +package com.mango.core.miniworld.event; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldJoinVerifiedEvent.java b/core/src/model_mini_world/java/com/mango/core/miniworld/event/MiniWorldJoinVerifiedEvent.java similarity index 75% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldJoinVerifiedEvent.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/event/MiniWorldJoinVerifiedEvent.java index 688ba2b55..0ad78fd29 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldJoinVerifiedEvent.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/event/MiniWorldJoinVerifiedEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.event; +package com.mango.core.miniworld.event; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldStateChangedEvent.java b/core/src/model_mini_world/java/com/mango/core/miniworld/event/MiniWorldStateChangedEvent.java similarity index 93% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldStateChangedEvent.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/event/MiniWorldStateChangedEvent.java index 3eaf6ee81..7747916f0 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldStateChangedEvent.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/event/MiniWorldStateChangedEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.event; +package com.mango.core.miniworld.event; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldTeamExitEvent.java b/core/src/model_mini_world/java/com/mango/core/miniworld/event/MiniWorldTeamExitEvent.java similarity index 72% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldTeamExitEvent.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/event/MiniWorldTeamExitEvent.java index 5510dee6d..769638aae 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldTeamExitEvent.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/event/MiniWorldTeamExitEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.event; +package com.mango.core.miniworld.event; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/OpenedMyMiniWorldEvent.java b/core/src/model_mini_world/java/com/mango/core/miniworld/event/OpenedMyMiniWorldEvent.java similarity index 82% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/OpenedMyMiniWorldEvent.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/event/OpenedMyMiniWorldEvent.java index a064506ca..9850fadd3 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/OpenedMyMiniWorldEvent.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/event/OpenedMyMiniWorldEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.event; +package com.mango.core.miniworld.event; /** * 打开我加入的事件 diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/IMiniWorldModel.java b/core/src/model_mini_world/java/com/mango/core/miniworld/model/IMiniWorldModel.java similarity index 76% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/IMiniWorldModel.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/model/IMiniWorldModel.java index 173fab614..5a778ba21 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/IMiniWorldModel.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/model/IMiniWorldModel.java @@ -1,21 +1,19 @@ -package com.yizhuan.xchat_android_core.miniworld.model; +package com.mango.core.miniworld.model; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyListInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldEditClassifyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.OpenSuccessInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.TopicInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.miniworld.bean.AudioPartyInfo; +import com.mango.core.miniworld.bean.AudioPartyListInfo; +import com.mango.core.miniworld.bean.MiniWorldInWorldInfo; +import com.mango.core.miniworld.bean.MWChatInfo; +import com.mango.core.miniworld.bean.MiniWorldCategoryInfo; +import com.mango.core.miniworld.bean.MiniWorldDetailInfo; +import com.mango.core.miniworld.bean.MiniWorldEditClassifyInfo; +import com.mango.core.miniworld.bean.MiniWorldInfo; +import com.mango.core.miniworld.bean.MiniWorldMainInfo; +import com.mango.core.miniworld.bean.MiniWorldMemberListInfo; +import com.mango.core.miniworld.bean.TopicInfo; -import java.util.ArrayList; import java.util.List; import io.reactivex.Single; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldHelper.java b/core/src/model_mini_world/java/com/mango/core/miniworld/model/MiniWorldHelper.java similarity index 91% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldHelper.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/model/MiniWorldHelper.java index 79532ff2a..768de42d9 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldHelper.java +++ b/core/src/model_mini_world/java/com/mango/core/miniworld/model/MiniWorldHelper.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.miniworld.model; +package com.mango.core.miniworld.model; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.mango.core.auth.AuthModel; +import com.mango.core.utils.SharedPreferenceUtils; import java.util.HashMap; import java.util.Map; 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/mango/core/miniworld/model/MiniWorldModel.java similarity index 94% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldModel.java rename to core/src/model_mini_world/java/com/mango/core/miniworld/model/MiniWorldModel.java index 4d094754b..19ae2313c 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/mango/core/miniworld/model/MiniWorldModel.java @@ -1,27 +1,27 @@ -package com.yizhuan.xchat_android_core.miniworld.model; +package com.mango.core.miniworld.model; import androidx.annotation.Nullable; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyListInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldEditClassifyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldListInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.OpenSuccessInfo; -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.mango.core.auth.AuthModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.exception.FailReasonException; +import com.mango.core.miniworld.bean.AudioPartyInfo; +import com.mango.core.miniworld.bean.AudioPartyListInfo; +import com.mango.core.miniworld.bean.MWChatInfo; +import com.mango.core.miniworld.bean.MiniWorldCategoryInfo; +import com.mango.core.miniworld.bean.MiniWorldDetailInfo; +import com.mango.core.miniworld.bean.MiniWorldEditClassifyInfo; +import com.mango.core.miniworld.bean.MiniWorldInWorldInfo; +import com.mango.core.miniworld.bean.MiniWorldInfo; +import com.mango.core.miniworld.bean.MiniWorldListInfo; +import com.mango.core.miniworld.bean.MiniWorldMainInfo; +import com.mango.core.miniworld.bean.MiniWorldMemberListInfo; +import com.mango.core.miniworld.bean.OpenSuccessInfo; +import com.mango.core.miniworld.bean.TopicInfo; +import com.mango.core.monsterhunting.model.MonsterHuntingModel; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/AudioPartyOpenEvent.java b/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/AudioPartyOpenEvent.java deleted file mode 100644 index 867b97bd7..000000000 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/AudioPartyOpenEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.miniworld.event; - -public class AudioPartyOpenEvent { -} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/BaseMusicInfo.java b/core/src/model_music/java/com/mango/core/music/bean/BaseMusicInfo.java similarity index 95% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/BaseMusicInfo.java rename to core/src/model_music/java/com/mango/core/music/bean/BaseMusicInfo.java index 6e9fdc753..0eed52eff 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/BaseMusicInfo.java +++ b/core/src/model_music/java/com/mango/core/music/bean/BaseMusicInfo.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.bean; +package com.mango.core.music.bean; -import com.yizhuan.xchat_android_library.utils.BlankUtil; -import com.yizhuan.xchat_android_library.utils.json.JsonParser; +import com.mango.xchat_android_library.utils.BlankUtil; +import com.mango.xchat_android_library.utils.json.JsonParser; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/LocalMusicInfo.java b/core/src/model_music/java/com/mango/core/music/bean/LocalMusicInfo.java similarity index 97% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/LocalMusicInfo.java rename to core/src/model_music/java/com/mango/core/music/bean/LocalMusicInfo.java index 5b384a53c..02851c318 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/LocalMusicInfo.java +++ b/core/src/model_music/java/com/mango/core/music/bean/LocalMusicInfo.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.bean; +package com.mango.core.music.bean; -import com.yizhuan.xchat_android_library.utils.BlankUtil; -import com.yizhuan.xchat_android_library.utils.json.JsonParser; +import com.mango.xchat_android_library.utils.BlankUtil; +import com.mango.xchat_android_library.utils.json.JsonParser; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/ShareMusicInfo.java b/core/src/model_music/java/com/mango/core/music/bean/ShareMusicInfo.java similarity index 95% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/ShareMusicInfo.java rename to core/src/model_music/java/com/mango/core/music/bean/ShareMusicInfo.java index 91e1cb5bb..0be0eb515 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/ShareMusicInfo.java +++ b/core/src/model_music/java/com/mango/core/music/bean/ShareMusicInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.bean; +package com.mango.core.music.bean; import java.io.Serializable; 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/mango/core/music/db/bean/LocalMusicBean.java similarity index 94% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java rename to core/src/model_music/java/com/mango/core/music/db/bean/LocalMusicBean.java index 6ff647790..0d049d978 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java +++ b/core/src/model_music/java/com/mango/core/music/db/bean/LocalMusicBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.db.bean; +package com.mango.core.music.db.bean; import androidx.room.ColumnInfo; import androidx.room.Entity; 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/mango/core/music/db/bean/SongBean.java similarity index 95% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java rename to core/src/model_music/java/com/mango/core/music/db/bean/SongBean.java index 62e6a76c9..18345e473 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java +++ b/core/src/model_music/java/com/mango/core/music/db/bean/SongBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.db.bean; +package com.mango.core.music.db.bean; import androidx.room.ColumnInfo; import androidx.room.Entity; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/converter/LocalMusicBeanConverter.java b/core/src/model_music/java/com/mango/core/music/db/converter/LocalMusicBeanConverter.java similarity index 81% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/converter/LocalMusicBeanConverter.java rename to core/src/model_music/java/com/mango/core/music/db/converter/LocalMusicBeanConverter.java index 63139a48a..b7bae8b17 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/converter/LocalMusicBeanConverter.java +++ b/core/src/model_music/java/com/mango/core/music/db/converter/LocalMusicBeanConverter.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.db.converter; +package com.mango.core.music.db.converter; -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; +import com.mango.core.music.bean.LocalMusicInfo; +import com.mango.core.music.db.bean.LocalMusicBean; /** * 方便将 UI 实体 跟 数据库实体 互相转换的工具类 diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/converter/ShareMusicConverter.java b/core/src/model_music/java/com/mango/core/music/db/converter/ShareMusicConverter.java similarity index 67% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/converter/ShareMusicConverter.java rename to core/src/model_music/java/com/mango/core/music/db/converter/ShareMusicConverter.java index a4839bf2b..c7320a63a 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/converter/ShareMusicConverter.java +++ b/core/src/model_music/java/com/mango/core/music/db/converter/ShareMusicConverter.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.db.converter; +package com.mango.core.music.db.converter; -import com.yizhuan.xchat_android_core.music.bean.ShareMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.SongBean; +import com.mango.core.music.bean.ShareMusicInfo; +import com.mango.core.music.db.bean.SongBean; /** * 方便将 UI 实体 跟 数据库实体 互相转换的工具类 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/mango/core/music/db/dao/LocalMusicDao.java similarity index 91% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java rename to core/src/model_music/java/com/mango/core/music/db/dao/LocalMusicDao.java index 46220ad96..1aeed4fc1 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java +++ b/core/src/model_music/java/com/mango/core/music/db/dao/LocalMusicDao.java @@ -1,12 +1,11 @@ -package com.yizhuan.xchat_android_core.music.db.dao; +package com.mango.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 com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; +import com.mango.core.music.db.bean.LocalMusicBean; import java.util.List; 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/mango/core/music/db/dao/SongDao.java similarity index 78% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java rename to core/src/model_music/java/com/mango/core/music/db/dao/SongDao.java index 405303cb9..e913d975d 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java +++ b/core/src/model_music/java/com/mango/core/music/db/dao/SongDao.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.db.dao; +package com.mango.core.music.db.dao; import androidx.room.Dao; import androidx.room.Delete; @@ -6,8 +6,8 @@ import androidx.room.Insert; import androidx.room.OnConflictStrategy; import androidx.room.Query; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.db.bean.SongBean; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.music.db.bean.SongBean; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/ILocalMusicDbModel.java b/core/src/model_music/java/com/mango/core/music/db/model/ILocalMusicDbModel.java similarity index 77% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/ILocalMusicDbModel.java rename to core/src/model_music/java/com/mango/core/music/db/model/ILocalMusicDbModel.java index ee3be5319..c28e580ef 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/ILocalMusicDbModel.java +++ b/core/src/model_music/java/com/mango/core/music/db/model/ILocalMusicDbModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.music.db.model; +package com.mango.core.music.db.model; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; +import com.mango.core.base.IModel; +import com.mango.core.music.bean.LocalMusicInfo; +import com.mango.core.music.db.bean.LocalMusicBean; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/IPlayerDbModel.java b/core/src/model_music/java/com/mango/core/music/db/model/IPlayerDbModel.java similarity index 85% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/IPlayerDbModel.java rename to core/src/model_music/java/com/mango/core/music/db/model/IPlayerDbModel.java index 215f2d991..a9671a68a 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/IPlayerDbModel.java +++ b/core/src/model_music/java/com/mango/core/music/db/model/IPlayerDbModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.db.model; +package com.mango.core.music.db.model; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; +import com.mango.core.base.IModel; +import com.mango.core.music.bean.LocalMusicInfo; import java.util.List; 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/mango/core/music/db/model/LocalMusicDbModel.java similarity index 93% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java rename to core/src/model_music/java/com/mango/core/music/db/model/LocalMusicDbModel.java index 18fcb9291..d979b7542 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java +++ b/core/src/model_music/java/com/mango/core/music/db/model/LocalMusicDbModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.db.model; +package com.mango.core.music.db.model; import android.annotation.SuppressLint; import android.content.Context; @@ -6,17 +6,17 @@ import android.database.Cursor; import android.provider.MediaStore; import androidx.annotation.Nullable; -import com.yizhuan.tutu.database.AppDataBase; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.db.converter.LocalMusicBeanConverter; -import com.yizhuan.xchat_android_core.music.event.RefreshLocalMusicEvent; -import com.yizhuan.xchat_android_core.utils.AsyncTaskScanMusicFile; -import com.yizhuan.xchat_android_core.utils.SongUtils; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.moshen.database.AppDataBase; +import com.mango.core.base.BaseModel; +import com.mango.core.music.bean.LocalMusicInfo; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.music.db.converter.LocalMusicBeanConverter; +import com.mango.core.music.event.RefreshLocalMusicEvent; +import com.mango.core.utils.AsyncTaskScanMusicFile; +import com.mango.core.utils.SongUtils; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/PlayerDbModel.java b/core/src/model_music/java/com/mango/core/music/db/model/PlayerDbModel.java similarity index 95% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/PlayerDbModel.java rename to core/src/model_music/java/com/mango/core/music/db/model/PlayerDbModel.java index 3c9800441..81a3460a6 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/PlayerDbModel.java +++ b/core/src/model_music/java/com/mango/core/music/db/model/PlayerDbModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.db.model; +package com.mango.core.music.db.model; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; +import com.mango.core.base.BaseModel; +import com.mango.core.music.bean.LocalMusicInfo; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/CurrentMusicUpdateEvent.java b/core/src/model_music/java/com/mango/core/music/event/CurrentMusicUpdateEvent.java similarity index 61% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/CurrentMusicUpdateEvent.java rename to core/src/model_music/java/com/mango/core/music/event/CurrentMusicUpdateEvent.java index 6acf9c02b..fc26ce1eb 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/CurrentMusicUpdateEvent.java +++ b/core/src/model_music/java/com/mango/core/music/event/CurrentMusicUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.event; +package com.mango.core.music.event; /** * create by lvzebiao on 2018/9/5 diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/JumpToShareMusicListFragmentEvent.java b/core/src/model_music/java/com/mango/core/music/event/JumpToShareMusicListFragmentEvent.java similarity index 50% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/JumpToShareMusicListFragmentEvent.java rename to core/src/model_music/java/com/mango/core/music/event/JumpToShareMusicListFragmentEvent.java index bd22fc0ff..66cac6039 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/JumpToShareMusicListFragmentEvent.java +++ b/core/src/model_music/java/com/mango/core/music/event/JumpToShareMusicListFragmentEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.event; +package com.mango.core.music.event; public class JumpToShareMusicListFragmentEvent { } diff --git a/core/src/model_music/java/com/mango/core/music/event/MusicAddEvent.java b/core/src/model_music/java/com/mango/core/music/event/MusicAddEvent.java new file mode 100644 index 000000000..ec96ad550 --- /dev/null +++ b/core/src/model_music/java/com/mango/core/music/event/MusicAddEvent.java @@ -0,0 +1,11 @@ +package com.mango.core.music.event; + +import com.mango.core.music.bean.LocalMusicInfo; + +import lombok.Data; + +@Data +public class MusicAddEvent { + + private LocalMusicInfo localMusicInfo; +} diff --git a/core/src/model_music/java/com/mango/core/music/event/MusicDeleteEvent.java b/core/src/model_music/java/com/mango/core/music/event/MusicDeleteEvent.java new file mode 100644 index 000000000..a0c599c78 --- /dev/null +++ b/core/src/model_music/java/com/mango/core/music/event/MusicDeleteEvent.java @@ -0,0 +1,11 @@ +package com.mango.core.music.event; + +import com.mango.core.music.bean.LocalMusicInfo; + +import lombok.Data; + +@Data +public class MusicDeleteEvent { + + private LocalMusicInfo localMusicInfo; +} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicPauseEvent.java b/core/src/model_music/java/com/mango/core/music/event/MusicPauseEvent.java similarity index 59% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicPauseEvent.java rename to core/src/model_music/java/com/mango/core/music/event/MusicPauseEvent.java index 3498148be..a945fb39f 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicPauseEvent.java +++ b/core/src/model_music/java/com/mango/core/music/event/MusicPauseEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.event; +package com.mango.core.music.event; /** * create by lvzebiao on 2018/9/6 diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicPlayingEvent.java b/core/src/model_music/java/com/mango/core/music/event/MusicPlayingEvent.java similarity index 60% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicPlayingEvent.java rename to core/src/model_music/java/com/mango/core/music/event/MusicPlayingEvent.java index 6e7ea987e..cbb833ca3 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicPlayingEvent.java +++ b/core/src/model_music/java/com/mango/core/music/event/MusicPlayingEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.event; +package com.mango.core.music.event; /** * create by lvzebiao on 2018/9/6 diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicStopEvent.java b/core/src/model_music/java/com/mango/core/music/event/MusicStopEvent.java similarity index 59% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicStopEvent.java rename to core/src/model_music/java/com/mango/core/music/event/MusicStopEvent.java index 95dd25b6a..2744e5425 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicStopEvent.java +++ b/core/src/model_music/java/com/mango/core/music/event/MusicStopEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.event; +package com.mango.core.music.event; /** * create by lvzebiao on 2018/9/6 diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/RefreshLocalMusicEvent.java b/core/src/model_music/java/com/mango/core/music/event/RefreshLocalMusicEvent.java similarity index 61% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/RefreshLocalMusicEvent.java rename to core/src/model_music/java/com/mango/core/music/event/RefreshLocalMusicEvent.java index 48d58386b..3398c6d7e 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/RefreshLocalMusicEvent.java +++ b/core/src/model_music/java/com/mango/core/music/event/RefreshLocalMusicEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.event; +package com.mango.core.music.event; /** * create by lvzebiao on 2018/9/5 diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/RefreshPlayerListEvent.java b/core/src/model_music/java/com/mango/core/music/event/RefreshPlayerListEvent.java similarity index 61% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/RefreshPlayerListEvent.java rename to core/src/model_music/java/com/mango/core/music/event/RefreshPlayerListEvent.java index 4e168b6de..795b4aeb4 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/RefreshPlayerListEvent.java +++ b/core/src/model_music/java/com/mango/core/music/event/RefreshPlayerListEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.event; +package com.mango.core.music.event; /** * create by lvzebiao on 2018/9/5 diff --git a/core/src/model_music/java/com/mango/core/music/model/ILocalMusicListModel.java b/core/src/model_music/java/com/mango/core/music/model/ILocalMusicListModel.java new file mode 100644 index 000000000..923a5ce85 --- /dev/null +++ b/core/src/model_music/java/com/mango/core/music/model/ILocalMusicListModel.java @@ -0,0 +1,6 @@ +package com.mango.core.music.model; + +import com.mango.core.base.IModel; + +public interface ILocalMusicListModel extends IModel { +} diff --git a/core/src/model_music/java/com/mango/core/music/model/IMusicListModel.java b/core/src/model_music/java/com/mango/core/music/model/IMusicListModel.java new file mode 100644 index 000000000..38fd63b8d --- /dev/null +++ b/core/src/model_music/java/com/mango/core/music/model/IMusicListModel.java @@ -0,0 +1,6 @@ +package com.mango.core.music.model; + +import com.mango.core.base.IModel; + +public interface IMusicListModel extends IModel { +} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IPlayerModel.java b/core/src/model_music/java/com/mango/core/music/model/IPlayerModel.java similarity index 84% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IPlayerModel.java rename to core/src/model_music/java/com/mango/core/music/model/IPlayerModel.java index 5ce4a2c51..2c982225b 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IPlayerModel.java +++ b/core/src/model_music/java/com/mango/core/music/model/IPlayerModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.music.model; +package com.mango.core.music.model; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; +import com.mango.core.base.IModel; +import com.mango.core.music.bean.LocalMusicInfo; +import com.mango.core.music.db.bean.LocalMusicBean; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IShareMusicListModel.java b/core/src/model_music/java/com/mango/core/music/model/IShareMusicListModel.java similarity index 64% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IShareMusicListModel.java rename to core/src/model_music/java/com/mango/core/music/model/IShareMusicListModel.java index 979f30201..ffcddbce6 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IShareMusicListModel.java +++ b/core/src/model_music/java/com/mango/core/music/model/IShareMusicListModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.model; +package com.mango.core.music.model; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.music.bean.ShareMusicInfo; +import com.mango.core.base.IModel; +import com.mango.core.music.bean.ShareMusicInfo; import java.util.List; diff --git a/core/src/model_music/java/com/mango/core/music/model/LocalMusicListModel.java b/core/src/model_music/java/com/mango/core/music/model/LocalMusicListModel.java new file mode 100644 index 000000000..52436dda4 --- /dev/null +++ b/core/src/model_music/java/com/mango/core/music/model/LocalMusicListModel.java @@ -0,0 +1,7 @@ +package com.mango.core.music.model; + +import com.mango.core.base.BaseModel; +import com.mango.core.base.IModel; + +public class LocalMusicListModel extends BaseModel implements IModel { +} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/MusicListModel.java b/core/src/model_music/java/com/mango/core/music/model/MusicListModel.java similarity index 76% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/MusicListModel.java rename to core/src/model_music/java/com/mango/core/music/model/MusicListModel.java index e380c88cb..dde17899f 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/MusicListModel.java +++ b/core/src/model_music/java/com/mango/core/music/model/MusicListModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.music.model; +package com.mango.core.music.model; -import com.yizhuan.xchat_android_core.base.BaseModel; +import com.mango.core.base.BaseModel; public class MusicListModel extends BaseModel implements IMusicListModel { diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/PlayerModel.java b/core/src/model_music/java/com/mango/core/music/model/PlayerModel.java similarity index 92% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/PlayerModel.java rename to core/src/model_music/java/com/mango/core/music/model/PlayerModel.java index ece568962..b76b87390 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/PlayerModel.java +++ b/core/src/model_music/java/com/mango/core/music/model/PlayerModel.java @@ -1,24 +1,24 @@ -package com.yizhuan.xchat_android_core.music.model; +package com.mango.core.music.model; import android.os.Handler; import android.os.Message; import android.text.TextUtils; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.db.model.LocalMusicDbModel; -import com.yizhuan.xchat_android_core.music.db.model.PlayerDbModel; -import com.yizhuan.xchat_android_core.music.event.MusicPauseEvent; -import com.yizhuan.xchat_android_core.music.event.MusicPlayingEvent; -import com.yizhuan.xchat_android_core.music.event.MusicStopEvent; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.pref.CommonPref; +import com.mango.core.DemoCache; +import com.mango.core.base.BaseModel; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.manager.RoomEvent; +import com.mango.core.manager.AudioEngineManager; +import com.mango.core.music.bean.LocalMusicInfo; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.music.db.model.LocalMusicDbModel; +import com.mango.core.music.db.model.PlayerDbModel; +import com.mango.core.music.event.MusicPauseEvent; +import com.mango.core.music.event.MusicPlayingEvent; +import com.mango.core.music.event.MusicStopEvent; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.pref.CommonPref; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/ShareMusicListModel.java b/core/src/model_music/java/com/mango/core/music/model/ShareMusicListModel.java similarity index 90% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/ShareMusicListModel.java rename to core/src/model_music/java/com/mango/core/music/model/ShareMusicListModel.java index f9f24b031..2f790af88 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/ShareMusicListModel.java +++ b/core/src/model_music/java/com/mango/core/music/model/ShareMusicListModel.java @@ -1,15 +1,15 @@ -package com.yizhuan.xchat_android_core.music.model; +package com.mango.core.music.model; -import com.yizhuan.tutu.database.AppDataBase; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.music.bean.ShareMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -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.ListUtils; +import com.mango.moshen.database.AppDataBase; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.music.bean.ShareMusicInfo; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.ListUtils; import java.net.URL; import java.net.URLConnection; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IAddLocalMusicListView.java b/core/src/model_music/java/com/mango/core/music/view/IAddLocalMusicListView.java similarity index 83% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IAddLocalMusicListView.java rename to core/src/model_music/java/com/mango/core/music/view/IAddLocalMusicListView.java index 58c6b73f4..0647c9d3a 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IAddLocalMusicListView.java +++ b/core/src/model_music/java/com/mango/core/music/view/IAddLocalMusicListView.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.view; +package com.mango.core.music.view; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/ILocalMusicListView.java b/core/src/model_music/java/com/mango/core/music/view/ILocalMusicListView.java similarity index 82% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/ILocalMusicListView.java rename to core/src/model_music/java/com/mango/core/music/view/ILocalMusicListView.java index 2884c6031..f4c36e8c7 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/ILocalMusicListView.java +++ b/core/src/model_music/java/com/mango/core/music/view/ILocalMusicListView.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.view; +package com.mango.core.music.view; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/model_music/java/com/mango/core/music/view/IMusicListView.java b/core/src/model_music/java/com/mango/core/music/view/IMusicListView.java new file mode 100644 index 000000000..503c2ac2b --- /dev/null +++ b/core/src/model_music/java/com/mango/core/music/view/IMusicListView.java @@ -0,0 +1,6 @@ +package com.mango.core.music.view; + +import com.mango.xchat_android_library.base.IMvpBaseView; + +public interface IMusicListView extends IMvpBaseView { +} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IShareMusicListView.java b/core/src/model_music/java/com/mango/core/music/view/IShareMusicListView.java similarity index 78% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IShareMusicListView.java rename to core/src/model_music/java/com/mango/core/music/view/IShareMusicListView.java index 0a5011533..2703214a0 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IShareMusicListView.java +++ b/core/src/model_music/java/com/mango/core/music/view/IShareMusicListView.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.music.view; +package com.mango.core.music.view; -import com.yizhuan.xchat_android_core.music.bean.ShareMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.core.music.bean.ShareMusicInfo; +import com.mango.core.music.db.bean.LocalMusicBean; +import com.mango.xchat_android_library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicAddEvent.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicAddEvent.java deleted file mode 100644 index e6bb2913b..000000000 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicAddEvent.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.music.event; - -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; - -import lombok.Data; - -@Data -public class MusicAddEvent { - - private LocalMusicInfo localMusicInfo; -} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicDeleteEvent.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicDeleteEvent.java deleted file mode 100644 index 9f5e87ce8..000000000 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicDeleteEvent.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.music.event; - -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; - -import lombok.Data; - -@Data -public class MusicDeleteEvent { - - private LocalMusicInfo localMusicInfo; -} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/ILocalMusicListModel.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/ILocalMusicListModel.java deleted file mode 100644 index 25ed78ff1..000000000 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/ILocalMusicListModel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.xchat_android_core.music.model; - -import com.yizhuan.xchat_android_core.base.IModel; - -public interface ILocalMusicListModel extends IModel { -} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IMusicListModel.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IMusicListModel.java deleted file mode 100644 index 2571e1128..000000000 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IMusicListModel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.xchat_android_core.music.model; - -import com.yizhuan.xchat_android_core.base.IModel; - -public interface IMusicListModel extends IModel { -} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/LocalMusicListModel.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/LocalMusicListModel.java deleted file mode 100644 index 612a021d4..000000000 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/LocalMusicListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.xchat_android_core.music.model; - -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.base.IModel; - -public class LocalMusicListModel extends BaseModel implements IModel { -} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IMusicListView.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IMusicListView.java deleted file mode 100644 index 1bfd5c665..000000000 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IMusicListView.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.xchat_android_core.music.view; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface IMusicListView extends IMvpBaseView { -} diff --git a/core/src/model_pay/java/com/kuaixiang/haha/wxapi/WXPayEntryActivity.java b/core/src/model_pay/java/com/kuaixiang/haha/wxapi/WXPayEntryActivity.java deleted file mode 100644 index 563e93f18..000000000 --- a/core/src/model_pay/java/com/kuaixiang/haha/wxapi/WXPayEntryActivity.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.kuaixiang.haha.wxapi; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.util.Log; - -import com.tencent.mm.opensdk.constants.ConstantsAPI; -import com.tencent.mm.opensdk.modelbase.BaseReq; -import com.tencent.mm.opensdk.modelbase.BaseResp; -import com.tencent.mm.opensdk.openapi.IWXAPI; -import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler; -import com.tencent.mm.opensdk.openapi.WXAPIFactory; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.pay.PaymentActivity; - -public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler { - - private static final String TAG = "WXPayEntryActivity"; - - private IWXAPI api; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - api = WXAPIFactory.createWXAPI(this, XChatConstants.WX_APP_ID); - api.handleIntent(getIntent(), this); - } - - @Override - protected void onNewIntent(Intent intent) { - super.onNewIntent(intent); - setIntent(intent); - api.handleIntent(intent, this); - } - - @Override - protected void onResume() { - super.onResume(); - } - - @Override - public void onReq(BaseReq req) { - } - - @Override - public void onResp(BaseResp baseResp) { - - Log.d(TAG, "onPayFinish, errCode = " + baseResp.errCode + ", errorStr = " + baseResp.errStr); - - if (baseResp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) { - Intent intent = new Intent(this, PaymentActivity.class); - startActivity(intent); - finish(); - } - } -} \ No newline at end of file diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentActivity.java b/core/src/model_pay/java/com/mango/core/pay/PaymentActivity.java similarity index 92% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentActivity.java rename to core/src/model_pay/java/com/mango/core/pay/PaymentActivity.java index eea8ecfa9..48196e9ae 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentActivity.java +++ b/core/src/model_pay/java/com/mango/core/pay/PaymentActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay; +package com.mango.core.pay; import android.annotation.SuppressLint; import android.app.Activity; @@ -17,30 +17,30 @@ import com.tencent.mm.opensdk.modelpay.PayReq; import com.tencent.mm.opensdk.openapi.IWXAPI; import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler; import com.tencent.mm.opensdk.openapi.WXAPIFactory; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.BuildConfig; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bank_card.bean.BankCardBean; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.exception.NullDataException; -import com.yizhuan.xchat_android_core.pay.bean.NotRealNameYetException; -import com.yizhuan.xchat_android_core.pay.bean.PaymentResult; -import com.yizhuan.xchat_android_core.pay.bean.PmChargeLimitException; -import com.yizhuan.xchat_android_core.pay.bean.ShowCommonWebEvent; -import com.yizhuan.xchat_android_core.pay.bean.WxPayType; -import com.yizhuan.xchat_android_core.pay.bean.alipay.AliPayResponseResult; -import com.yizhuan.xchat_android_core.pay.bean.alipay.AliPayResult; -import com.yizhuan.xchat_android_core.pay.bean.alipay.AlipayInfo; -import com.yizhuan.xchat_android_core.pay.bean.unionpay.UnionPayOrder; -import com.yizhuan.xchat_android_core.pay.bean.wechatpay.WeChatAppParam; -import com.yizhuan.xchat_android_core.pay.model.alipay.AliPayModel; -import com.yizhuan.xchat_android_core.pay.model.unionpay.UnionPayModel; -import com.yizhuan.xchat_android_core.pay.model.wechatpay.WeChatPayModel; -import com.yizhuan.xchat_android_core.pay.view.IPaymentView; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.xchat_android_constants.XChatConstants; +import com.mango.core.BuildConfig; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.bank_card.bean.BankCardBean; +import com.mango.core.exception.FailReasonException; +import com.mango.core.exception.NullDataException; +import com.mango.core.pay.bean.NotRealNameYetException; +import com.mango.core.pay.bean.PaymentResult; +import com.mango.core.pay.bean.PmChargeLimitException; +import com.mango.core.pay.bean.ShowCommonWebEvent; +import com.mango.core.pay.bean.WxPayType; +import com.mango.core.pay.bean.alipay.AliPayResponseResult; +import com.mango.core.pay.bean.alipay.AliPayResult; +import com.mango.core.pay.bean.alipay.AlipayInfo; +import com.mango.core.pay.bean.unionpay.UnionPayOrder; +import com.mango.core.pay.bean.wechatpay.WeChatAppParam; +import com.mango.core.pay.model.alipay.AliPayModel; +import com.mango.core.pay.model.unionpay.UnionPayModel; +import com.mango.core.pay.model.wechatpay.WeChatPayModel; +import com.mango.core.pay.view.IPaymentView; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.utils.ListUtils; +import com.mango.xchat_android_library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentSuccessException.java b/core/src/model_pay/java/com/mango/core/pay/PaymentSuccessException.java similarity index 71% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentSuccessException.java rename to core/src/model_pay/java/com/mango/core/pay/PaymentSuccessException.java index bccba08db..abcc1c241 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentSuccessException.java +++ b/core/src/model_pay/java/com/mango/core/pay/PaymentSuccessException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay; +package com.mango.core.pay; /** * Created by MadisonRong on 2019-08-28 diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/NotRealNameYetException.java b/core/src/model_pay/java/com/mango/core/pay/bean/NotRealNameYetException.java similarity index 86% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/NotRealNameYetException.java rename to core/src/model_pay/java/com/mango/core/pay/bean/NotRealNameYetException.java index a5ae7f14a..0174ea94b 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/NotRealNameYetException.java +++ b/core/src/model_pay/java/com/mango/core/pay/bean/NotRealNameYetException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.mango.core.pay.bean; public class NotRealNameYetException extends Exception { diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/PaymentResult.java b/core/src/model_pay/java/com/mango/core/pay/bean/PaymentResult.java similarity index 96% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/PaymentResult.java rename to core/src/model_pay/java/com/mango/core/pay/bean/PaymentResult.java index 2a80d84a0..5b54c4372 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/PaymentResult.java +++ b/core/src/model_pay/java/com/mango/core/pay/bean/PaymentResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.mango.core.pay.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/PmChargeLimitException.java b/core/src/model_pay/java/com/mango/core/pay/bean/PmChargeLimitException.java similarity index 88% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/PmChargeLimitException.java rename to core/src/model_pay/java/com/mango/core/pay/bean/PmChargeLimitException.java index d9e4936fd..a0513a118 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/PmChargeLimitException.java +++ b/core/src/model_pay/java/com/mango/core/pay/bean/PmChargeLimitException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.mango.core.pay.bean; import lombok.Getter; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/ShowCommonWebEvent.java b/core/src/model_pay/java/com/mango/core/pay/bean/ShowCommonWebEvent.java similarity index 84% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/ShowCommonWebEvent.java rename to core/src/model_pay/java/com/mango/core/pay/bean/ShowCommonWebEvent.java index b08ba61ca..16d3f5399 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/ShowCommonWebEvent.java +++ b/core/src/model_pay/java/com/mango/core/pay/bean/ShowCommonWebEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.mango.core.pay.bean; import android.content.Context; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/alipay/AliPayResponseResult.java b/core/src/model_pay/java/com/mango/core/pay/bean/alipay/AliPayResponseResult.java similarity index 93% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/alipay/AliPayResponseResult.java rename to core/src/model_pay/java/com/mango/core/pay/bean/alipay/AliPayResponseResult.java index db4702ec4..e60690363 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/alipay/AliPayResponseResult.java +++ b/core/src/model_pay/java/com/mango/core/pay/bean/alipay/AliPayResponseResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean.alipay; +package com.mango.core.pay.bean.alipay; import lombok.Data; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/alipay/AliPayResult.java b/core/src/model_pay/java/com/mango/core/pay/bean/alipay/AliPayResult.java similarity index 98% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/alipay/AliPayResult.java rename to core/src/model_pay/java/com/mango/core/pay/bean/alipay/AliPayResult.java index 64d5ed623..4d9479750 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/alipay/AliPayResult.java +++ b/core/src/model_pay/java/com/mango/core/pay/bean/alipay/AliPayResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean.alipay; +package com.mango.core.pay.bean.alipay; import android.text.TextUtils; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/alipay/AlipayInfo.java b/core/src/model_pay/java/com/mango/core/pay/bean/alipay/AlipayInfo.java similarity index 67% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/alipay/AlipayInfo.java rename to core/src/model_pay/java/com/mango/core/pay/bean/alipay/AlipayInfo.java index b890f80a5..a38689ac6 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/alipay/AlipayInfo.java +++ b/core/src/model_pay/java/com/mango/core/pay/bean/alipay/AlipayInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean.alipay; +package com.mango.core.pay.bean.alipay; import lombok.Data; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/alipay/AlipayTradeAppPayResponseBean.java b/core/src/model_pay/java/com/mango/core/pay/bean/alipay/AlipayTradeAppPayResponseBean.java similarity index 91% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/alipay/AlipayTradeAppPayResponseBean.java rename to core/src/model_pay/java/com/mango/core/pay/bean/alipay/AlipayTradeAppPayResponseBean.java index 42f9447c8..2fd0321f2 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/alipay/AlipayTradeAppPayResponseBean.java +++ b/core/src/model_pay/java/com/mango/core/pay/bean/alipay/AlipayTradeAppPayResponseBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean.alipay; +package com.mango.core.pay.bean.alipay; import lombok.Data; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/unionpay/UnionPayOrder.java b/core/src/model_pay/java/com/mango/core/pay/bean/unionpay/UnionPayOrder.java similarity index 78% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/unionpay/UnionPayOrder.java rename to core/src/model_pay/java/com/mango/core/pay/bean/unionpay/UnionPayOrder.java index cba3bf012..1a0a76935 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/unionpay/UnionPayOrder.java +++ b/core/src/model_pay/java/com/mango/core/pay/bean/unionpay/UnionPayOrder.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.pay.bean.unionpay; +package com.mango.core.pay.bean.unionpay; -import com.yizhuan.xchat_android_core.bank_card.bean.BankCardBean; +import com.mango.core.bank_card.bean.BankCardBean; import java.util.List; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/wechatpay/WeChatAppParam.java b/core/src/model_pay/java/com/mango/core/pay/bean/wechatpay/WeChatAppParam.java similarity index 95% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/wechatpay/WeChatAppParam.java rename to core/src/model_pay/java/com/mango/core/pay/bean/wechatpay/WeChatAppParam.java index 1e04131d1..f60cc7ba8 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/bean/wechatpay/WeChatAppParam.java +++ b/core/src/model_pay/java/com/mango/core/pay/bean/wechatpay/WeChatAppParam.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean.wechatpay; +package com.mango.core.pay.bean.wechatpay; import com.alibaba.fastjson.annotation.JSONField; import com.google.gson.annotations.SerializedName; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/alipay/AliPayModel.java b/core/src/model_pay/java/com/mango/core/pay/model/alipay/AliPayModel.java similarity index 79% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/alipay/AliPayModel.java rename to core/src/model_pay/java/com/mango/core/pay/model/alipay/AliPayModel.java index 1e8c2fa14..e0b880622 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/alipay/AliPayModel.java +++ b/core/src/model_pay/java/com/mango/core/pay/model/alipay/AliPayModel.java @@ -1,15 +1,15 @@ -package com.yizhuan.xchat_android_core.pay.model.alipay; +package com.mango.core.pay.model.alipay; import android.app.Activity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.pay.bean.alipay.AlipayInfo; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.utils.NetworkUtils; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.pay.bean.alipay.AlipayInfo; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.NetworkUtils; import io.reactivex.Single; import retrofit2.http.POST; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/alipay/IAliPayModel.java b/core/src/model_pay/java/com/mango/core/pay/model/alipay/IAliPayModel.java similarity index 57% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/alipay/IAliPayModel.java rename to core/src/model_pay/java/com/mango/core/pay/model/alipay/IAliPayModel.java index b1ab6faef..a8a7fbdee 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/alipay/IAliPayModel.java +++ b/core/src/model_pay/java/com/mango/core/pay/model/alipay/IAliPayModel.java @@ -1,12 +1,10 @@ -package com.yizhuan.xchat_android_core.pay.model.alipay; +package com.mango.core.pay.model.alipay; import android.app.Activity; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.pay.bean.alipay.AlipayInfo; - -import java.util.Map; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.pay.bean.alipay.AlipayInfo; import io.reactivex.Single; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/unionpay/IUnionPayModel.java b/core/src/model_pay/java/com/mango/core/pay/model/unionpay/IUnionPayModel.java similarity index 73% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/unionpay/IUnionPayModel.java rename to core/src/model_pay/java/com/mango/core/pay/model/unionpay/IUnionPayModel.java index 73d4a134d..19e165e37 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/unionpay/IUnionPayModel.java +++ b/core/src/model_pay/java/com/mango/core/pay/model/unionpay/IUnionPayModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.pay.model.unionpay; +package com.mango.core.pay.model.unionpay; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.pay.bean.unionpay.UnionPayOrder; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.pay.bean.unionpay.UnionPayOrder; import io.reactivex.Single; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/unionpay/UnionPayModel.java b/core/src/model_pay/java/com/mango/core/pay/model/unionpay/UnionPayModel.java similarity index 87% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/unionpay/UnionPayModel.java rename to core/src/model_pay/java/com/mango/core/pay/model/unionpay/UnionPayModel.java index ca1a6123e..cdb39311b 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/unionpay/UnionPayModel.java +++ b/core/src/model_pay/java/com/mango/core/pay/model/unionpay/UnionPayModel.java @@ -1,16 +1,16 @@ -package com.yizhuan.xchat_android_core.pay.model.unionpay; +package com.mango.core.pay.model.unionpay; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bank_card.bean.BankCardBean; -import com.yizhuan.xchat_android_core.bank_card.exception.NeedBindBankCardException; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.exception.NullDataException; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.unionpay.UnionPayOrder; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.bank_card.bean.BankCardBean; +import com.mango.core.bank_card.exception.NeedBindBankCardException; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.exception.FailReasonException; +import com.mango.core.exception.NullDataException; +import com.mango.core.pay.PayModel; +import com.mango.core.pay.bean.unionpay.UnionPayOrder; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; import retrofit2.http.Field; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/wechatpay/IWeChatPayModel.java b/core/src/model_pay/java/com/mango/core/pay/model/wechatpay/IWeChatPayModel.java similarity index 59% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/wechatpay/IWeChatPayModel.java rename to core/src/model_pay/java/com/mango/core/pay/model/wechatpay/IWeChatPayModel.java index 37ff54481..a5ad2461d 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/wechatpay/IWeChatPayModel.java +++ b/core/src/model_pay/java/com/mango/core/pay/model/wechatpay/IWeChatPayModel.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.pay.model.wechatpay; +package com.mango.core.pay.model.wechatpay; import android.app.Activity; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.pay.bean.wechatpay.WeChatAppParam; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.pay.bean.wechatpay.WeChatAppParam; import io.reactivex.Single; diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/wechatpay/WeChatPayModel.java b/core/src/model_pay/java/com/mango/core/pay/model/wechatpay/WeChatPayModel.java similarity index 81% rename from core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/wechatpay/WeChatPayModel.java rename to core/src/model_pay/java/com/mango/core/pay/model/wechatpay/WeChatPayModel.java index 9d61de423..c7d89692d 100644 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/model/wechatpay/WeChatPayModel.java +++ b/core/src/model_pay/java/com/mango/core/pay/model/wechatpay/WeChatPayModel.java @@ -1,16 +1,16 @@ -package com.yizhuan.xchat_android_core.pay.model.wechatpay; +package com.mango.core.pay.model.wechatpay; import android.app.Activity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.pay.bean.wechatpay.WeChatAppParam; -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.NetworkUtils; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.pay.bean.wechatpay.WeChatAppParam; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.NetworkUtils; import java.util.HashMap; import java.util.Map; diff --git a/core/src/model_pay/java/com/mango/core/pay/view/IPaymentView.java b/core/src/model_pay/java/com/mango/core/pay/view/IPaymentView.java new file mode 100644 index 000000000..14c826b8e --- /dev/null +++ b/core/src/model_pay/java/com/mango/core/pay/view/IPaymentView.java @@ -0,0 +1,11 @@ +package com.mango.core.pay.view; + +import com.mango.core.pay.bean.alipay.AliPayResult; +import com.mango.xchat_android_library.base.IMvpBaseView; + +public interface IPaymentView extends IMvpBaseView { + + public void getChargeOrOrderInfoFail(String error); + + public void requestAliPaySuccess(AliPayResult result); +} diff --git a/core/src/model_pay/java/com/mango/yinyou/wxapi/WXEntryActivity.java b/core/src/model_pay/java/com/mango/yinyou/wxapi/WXEntryActivity.java deleted file mode 100644 index ddf39929b..000000000 --- a/core/src/model_pay/java/com/mango/yinyou/wxapi/WXEntryActivity.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.mango.yinyou.wxapi; - -import android.content.Intent; - -import cn.sharesdk.wechat.utils.WXMediaMessage; -import cn.sharesdk.wechat.utils.WechatHandlerActivity; - -/** - * create by lvzebiao @2019/11/8 - */ -public class WXEntryActivity extends WechatHandlerActivity { - - @Override - public void onShowMessageFromWXReq(WXMediaMessage msg) { - super.onShowMessageFromWXReq(msg); - } - - @Override - public void onGetMessageFromWXReq(WXMediaMessage msg) { - super.onGetMessageFromWXReq(msg); - //从小程序返回APP - Intent iLaunchMyself = getPackageManager().getLaunchIntentForPackage(getPackageName()); - startActivity(iLaunchMyself); - } -} diff --git a/core/src/model_pay/java/com/tongdaxing/tutu/wxapi/WXPayEntryActivity.java b/core/src/model_pay/java/com/tongdaxing/tutu/wxapi/WXPayEntryActivity.java deleted file mode 100644 index 2f5e2c029..000000000 --- a/core/src/model_pay/java/com/tongdaxing/tutu/wxapi/WXPayEntryActivity.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.tongdaxing.tutu.wxapi; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.util.Log; - -import com.tencent.mm.opensdk.constants.ConstantsAPI; -import com.tencent.mm.opensdk.modelbase.BaseReq; -import com.tencent.mm.opensdk.modelbase.BaseResp; -import com.tencent.mm.opensdk.openapi.IWXAPI; -import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler; -import com.tencent.mm.opensdk.openapi.WXAPIFactory; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.pay.PaymentActivity; - -public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler { - - private static final String TAG = "WXPayEntryActivity"; - - private IWXAPI api; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - api = WXAPIFactory.createWXAPI(this, XChatConstants.WX_APP_ID); - api.handleIntent(getIntent(), this); - } - - @Override - protected void onNewIntent(Intent intent) { - super.onNewIntent(intent); - setIntent(intent); - api.handleIntent(intent, this); - } - - @Override - protected void onResume() { - super.onResume(); - } - - @Override - public void onReq(BaseReq req) { - } - - @Override - public void onResp(BaseResp baseResp) { - - Log.e(TAG, "onPayFinish, errCode = " + baseResp.errCode + ", errorStr = " + baseResp.errStr); - - if (baseResp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) { - Intent intent = new Intent(this, PaymentActivity.class); - startActivity(intent); - finish(); - } - } -} \ No newline at end of file diff --git a/core/src/model_pay/java/com/xuanyi/accompany/wxapi/WXPayEntryActivity.java b/core/src/model_pay/java/com/xuanyi/accompany/wxapi/WXPayEntryActivity.java deleted file mode 100644 index 03a4109f9..000000000 --- a/core/src/model_pay/java/com/xuanyi/accompany/wxapi/WXPayEntryActivity.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.xuanyi.accompany.wxapi; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.util.Log; - -import com.tencent.mm.opensdk.constants.ConstantsAPI; -import com.tencent.mm.opensdk.modelbase.BaseReq; -import com.tencent.mm.opensdk.modelbase.BaseResp; -import com.tencent.mm.opensdk.openapi.IWXAPI; -import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler; -import com.tencent.mm.opensdk.openapi.WXAPIFactory; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.pay.PaymentActivity; - -public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler { - - private static final String TAG = "WXPayEntryActivity"; - - private IWXAPI api; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - api = WXAPIFactory.createWXAPI(this, XChatConstants.WX_APP_ID); - api.handleIntent(getIntent(), this); - } - - @Override - protected void onNewIntent(Intent intent) { - super.onNewIntent(intent); - setIntent(intent); - api.handleIntent(intent, this); - } - - @Override - protected void onResume() { - super.onResume(); - } - - @Override - public void onReq(BaseReq req) { - } - - @Override - public void onResp(BaseResp baseResp) { - - Log.e(TAG, "onPayFinish, errCode = " + baseResp.errCode + ", errorStr = " + baseResp.errStr); - - if (baseResp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) { - Intent intent = new Intent(this, PaymentActivity.class); - startActivity(intent); - finish(); - } - } -} \ No newline at end of file diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/view/IPaymentView.java b/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/view/IPaymentView.java deleted file mode 100644 index dca22502a..000000000 --- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/view/IPaymentView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.pay.view; - -import com.yizhuan.xchat_android_core.pay.bean.alipay.AliPayResult; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface IPaymentView extends IMvpBaseView { - - public void getChargeOrOrderInfoFail(String error); - - public void requestAliPaySuccess(AliPayResult result); -} diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/attachment/AitFriendsAttachment.java b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/attachment/AitFriendsAttachment.java similarity index 80% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/attachment/AitFriendsAttachment.java rename to core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/attachment/AitFriendsAttachment.java index cbadd9816..00053c970 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/attachment/AitFriendsAttachment.java +++ b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/attachment/AitFriendsAttachment.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.attachment; +package com.mango.core.public_chat_hall.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitFriendsInfo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.public_chat_hall.bean.AitFriendsInfo; public class AitFriendsAttachment extends CustomAttachment { diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/attachment/AitMeAttachment.java b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/attachment/AitMeAttachment.java similarity index 79% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/attachment/AitMeAttachment.java rename to core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/attachment/AitMeAttachment.java index f0e5bb52c..1c60e2299 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/attachment/AitMeAttachment.java +++ b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/attachment/AitMeAttachment.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.attachment; +package com.mango.core.public_chat_hall.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitMeInfo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.public_chat_hall.bean.AitMeInfo; public class AitMeAttachment extends CustomAttachment { diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/AitFriendsInfo.java b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/bean/AitFriendsInfo.java similarity index 90% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/AitFriendsInfo.java rename to core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/bean/AitFriendsInfo.java index d75cf13d6..2dee29efe 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/AitFriendsInfo.java +++ b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/bean/AitFriendsInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.bean; +package com.mango.core.public_chat_hall.bean; import java.util.List; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/AitMeInfo.java b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/bean/AitMeInfo.java similarity index 89% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/AitMeInfo.java rename to core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/bean/AitMeInfo.java index cbcfcc7c0..ce0064ed6 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/AitMeInfo.java +++ b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/bean/AitMeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.bean; +package com.mango.core.public_chat_hall.bean; import java.io.Serializable; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/PublicChatHallMessage.java b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/bean/PublicChatHallMessage.java similarity index 99% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/PublicChatHallMessage.java rename to core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/bean/PublicChatHallMessage.java index d31f26fbf..c00fa4312 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/PublicChatHallMessage.java +++ b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/bean/PublicChatHallMessage.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.bean; +package com.mango.core.public_chat_hall.bean; import java.util.List; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallAitMeEvent.java b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallAitMeEvent.java similarity index 76% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallAitMeEvent.java rename to core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallAitMeEvent.java index 01f0aef1c..97283eb2c 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallAitMeEvent.java +++ b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallAitMeEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.event; +package com.mango.core.public_chat_hall.event; import lombok.Data; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallHistoryEvent.java b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallHistoryEvent.java similarity index 84% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallHistoryEvent.java rename to core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallHistoryEvent.java index b8afdb9b6..333a80127 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallHistoryEvent.java +++ b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallHistoryEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.event; +package com.mango.core.public_chat_hall.event; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java similarity index 87% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java rename to core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java index c8bf24ebc..57cba3cfa 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java +++ b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.event; +package com.mango.core.public_chat_hall.event; import lombok.Data; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java similarity index 84% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java rename to core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java index 4e86a30ce..b670265b5 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java +++ b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.event; +package com.mango.core.public_chat_hall.event; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java similarity index 70% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java rename to core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java index 484ae3499..61883e10e 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java +++ b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.event; +package com.mango.core.public_chat_hall.event; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; +import com.mango.core.gift.bean.GiftReceiveInfo; import lombok.Data; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/manager/PublicChatHallDataManager.java b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/manager/PublicChatHallDataManager.java similarity index 91% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/manager/PublicChatHallDataManager.java rename to core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/manager/PublicChatHallDataManager.java index bd2bb198f..917408bd6 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/manager/PublicChatHallDataManager.java +++ b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/manager/PublicChatHallDataManager.java @@ -1,11 +1,10 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.manager; +package com.mango.core.public_chat_hall.manager; import android.os.CountDownTimer; import android.text.TextUtils; import android.util.Log; import com.netease.nim.uikit.business.session.module.Container; -import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.NIMChatRoomSDK; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.Observer; @@ -23,21 +22,21 @@ import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitFriendsAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitFriendsInfo; -import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallAitMeEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallHistoryEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallMsgCountingDownEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallMsgIncomingEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.core.auth.AuthModel; +import com.mango.core.gift.GiftModel; +import com.mango.core.gift.bean.GiftInfo; +import com.mango.core.gift.bean.GiftReceiveInfo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.GiftAttachment; +import com.mango.core.public_chat_hall.attachment.AitFriendsAttachment; +import com.mango.core.public_chat_hall.bean.AitFriendsInfo; +import com.mango.core.public_chat_hall.event.PublicChatHallAitMeEvent; +import com.mango.core.public_chat_hall.event.PublicChatHallHistoryEvent; +import com.mango.core.public_chat_hall.event.PublicChatHallMsgCountingDownEvent; +import com.mango.core.public_chat_hall.event.PublicChatHallMsgIncomingEvent; +import com.mango.core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent; +import com.mango.core.public_chat_hall.model.PublicChatHallModel; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/IPublicChatHallModel.java b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/model/IPublicChatHallModel.java similarity index 76% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/IPublicChatHallModel.java rename to core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/model/IPublicChatHallModel.java index 70edcc275..76e7a299a 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/IPublicChatHallModel.java +++ b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/model/IPublicChatHallModel.java @@ -1,15 +1,14 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.model; +package com.mango.core.public_chat_hall.model; import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.PublicChatHallMessage; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.public_chat_hall.bean.PublicChatHallMessage; import java.util.List; import io.reactivex.Observable; import io.reactivex.Single; -import retrofit2.http.Field; public interface IPublicChatHallModel extends IModel { 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/mango/core/public_chat_hall/model/PublicChatHallModel.java similarity index 90% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/PublicChatHallModel.java rename to core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/model/PublicChatHallModel.java index 0c02de4d6..fc18eea87 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/mango/core/public_chat_hall/model/PublicChatHallModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.model; +package com.mango.core.public_chat_hall.model; import android.annotation.SuppressLint; import androidx.annotation.Nullable; @@ -11,24 +11,23 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomData; import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.PublicChatHallMessage; -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.LoadLoginUserInfoEvent; -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.ListUtils; +import com.mango.core.Constants; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.decoration.car.bean.CarInfo; +import com.mango.core.decoration.headwear.bean.HeadWearInfo; +import com.mango.core.initial.InitialModel; +import com.mango.core.level.UserLevelVo; +import com.mango.core.noble.NobleInfo; +import com.mango.core.public_chat_hall.bean.PublicChatHallMessage; +import com.mango.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.user.event.LoadLoginUserInfoEvent; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/util/PublicChatHallMessageConvertor.java b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/util/PublicChatHallMessageConvertor.java similarity index 79% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/util/PublicChatHallMessageConvertor.java rename to core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/util/PublicChatHallMessageConvertor.java index 3781cea4a..600ed073c 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/util/PublicChatHallMessageConvertor.java +++ b/core/src/model_public_chat_hall/java/com/mango/core/public_chat_hall/util/PublicChatHallMessageConvertor.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.util; +package com.mango.core.public_chat_hall.util; public class PublicChatHallMessageConvertor { diff --git a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeModel.java b/core/src/model_smscode/java/com/mango/core/code/CodeModel.java similarity index 87% rename from core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeModel.java rename to core/src/model_smscode/java/com/mango/core/code/CodeModel.java index f6909948f..173f7938e 100644 --- a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeModel.java +++ b/core/src/model_smscode/java/com/mango/core/code/CodeModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.code; +package com.mango.core.code; import android.text.TextUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.codec.DESUtils; import io.reactivex.Single; import io.reactivex.SingleSource; diff --git a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeType.java b/core/src/model_smscode/java/com/mango/core/code/CodeType.java similarity index 93% rename from core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeType.java rename to core/src/model_smscode/java/com/mango/core/code/CodeType.java index 2849825f2..687d09b88 100644 --- a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeType.java +++ b/core/src/model_smscode/java/com/mango/core/code/CodeType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.code; +package com.mango.core.code; /** * 验证码类型 diff --git a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/ICodeModel.java b/core/src/model_smscode/java/com/mango/core/code/ICodeModel.java similarity index 73% rename from core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/ICodeModel.java rename to core/src/model_smscode/java/com/mango/core/code/ICodeModel.java index 83023c7ae..370faddca 100644 --- a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/ICodeModel.java +++ b/core/src/model_smscode/java/com/mango/core/code/ICodeModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.code; +package com.mango.core.code; -import com.yizhuan.xchat_android_core.base.IModel; +import com.mango.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SaConstant.java b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SaConstant.java index 52630bd67..cee8e2b86 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SaConstant.java +++ b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SaConstant.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.super_admin; +package com.mango.core.super_admin; /** * create by lvzebiao @2019/8/21 diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SuperAdminDataMrg.java b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SuperAdminDataMrg.java index e838990a2..3fdd539e1 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SuperAdminDataMrg.java +++ b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SuperAdminDataMrg.java @@ -1,30 +1,26 @@ -package com.yizhuan.xchat_android_core.super_admin; +package com.mango.core.super_admin; import android.annotation.SuppressLint; import android.text.TextUtils; -import android.util.Log; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomInfo; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.RoomBaseModel; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.utils.ExtensionUtil; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.room.model.RoomBaseModel; +import com.mango.core.super_admin.util.SuperAdminUtil; +import com.mango.core.utils.ExtensionUtil; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.utils.ListUtils; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.reactivex.Observer; import io.reactivex.Single; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.BiFunction; import io.reactivex.functions.Consumer; import lombok.Getter; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/attachment/SuperAdminOpAttachment.java b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/attachment/SuperAdminOpAttachment.java index bed2dd3ef..cd950f7f0 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/attachment/SuperAdminOpAttachment.java +++ b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/attachment/SuperAdminOpAttachment.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.super_admin.attachment; +package com.mango.core.super_admin.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.super_admin.bean.SaOpInfo; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.super_admin.bean.SaOpInfo; import lombok.Getter; import lombok.Setter; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/KickOutExtBean.java b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/KickOutExtBean.java index 45266397f..f084381c1 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/KickOutExtBean.java +++ b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/KickOutExtBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.super_admin.bean; +package com.mango.core.super_admin.bean; import lombok.Getter; import lombok.Setter; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/SaOpInfo.java b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/SaOpInfo.java index 75708f63b..8c000ad11 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/SaOpInfo.java +++ b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/SaOpInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.super_admin.bean; +package com.mango.core.super_admin.bean; import java.io.Serializable; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/ISuperAdminModel.java b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/ISuperAdminModel.java index 9712fd289..5b7102110 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/ISuperAdminModel.java +++ b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/ISuperAdminModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.super_admin.model; +package com.mango.core.super_admin.model; -import com.yizhuan.xchat_android_core.base.IModel; +import com.mango.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/SuperAdminModel.java b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/SuperAdminModel.java index 330c3cd52..cdaa54409 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/SuperAdminModel.java +++ b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/SuperAdminModel.java @@ -1,16 +1,14 @@ -package com.yizhuan.xchat_android_core.super_admin.model; +package com.mango.core.super_admin.model; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.functions.Function; import retrofit2.http.POST; import retrofit2.http.Query; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/exception/SAdminCannotGameException.java b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/exception/SAdminCannotGameException.java index 8232bcfdc..c212fa4ce 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/exception/SAdminCannotGameException.java +++ b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/exception/SAdminCannotGameException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.super_admin.model.exception; +package com.mango.core.super_admin.model.exception; /** * 超管不能玩游戏 diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java index 130a8ab56..83c0300df 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java +++ b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java @@ -1,16 +1,16 @@ -package com.yizhuan.xchat_android_core.super_admin.util; +package com.mango.core.super_admin.util; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.auth.AuthModel; -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.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.super_admin.bean.KickOutExtBean; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; +import com.mango.core.auth.AuthModel; +import com.mango.core.kick.KickModel; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.manager.IMNetEaseManager; +import com.mango.core.room.model.AvRoomModel; +import com.mango.core.super_admin.bean.KickOutExtBean; +import com.mango.core.utils.net.DontWarnObserver; +import com.mango.xchat_android_library.utils.JavaUtil; +import com.mango.xchat_android_library.utils.SingleToastUtil; import java.util.Map; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaAttachmentFactory.java b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaAttachmentFactory.java index e9747e8bc..7095a30b0 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaAttachmentFactory.java +++ b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaAttachmentFactory.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.super_admin.util; +package com.mango.core.super_admin.util; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.super_admin.attachment.SuperAdminOpAttachment; -import com.yizhuan.xchat_android_core.super_admin.bean.SaOpInfo; -import com.yizhuan.xchat_android_core.user.UserModel; +import com.mango.core.auth.AuthModel; +import com.mango.core.im.custom.bean.CustomAttachment; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.super_admin.attachment.SuperAdminOpAttachment; +import com.mango.core.super_admin.bean.SaOpInfo; +import com.mango.core.user.UserModel; /** * create by lvzebiao @2019/8/22 diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaMsgUtil.java b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaMsgUtil.java index 2eea07ce3..feb97b056 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaMsgUtil.java +++ b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaMsgUtil.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.super_admin.util; +package com.mango.core.super_admin.util; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.mango.core.im.custom.bean.CustomAttachment; /** * 判断超管的自定义消息 是否需要加入公屏 diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SuperAdminUtil.java b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SuperAdminUtil.java index b5404eb8f..642c035e2 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SuperAdminUtil.java +++ b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SuperAdminUtil.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.super_admin.util; +package com.mango.core.super_admin.util; import android.text.TextUtils; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.ExtensionUtil; +import com.mango.core.user.UserModel; +import com.mango.core.user.bean.UserInfo; +import com.mango.core.utils.ExtensionUtil; import java.util.Map; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/BoxOpenStatusInfo.java b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/BoxOpenStatusInfo.java similarity index 95% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/BoxOpenStatusInfo.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/bean/BoxOpenStatusInfo.java index 4453a63ab..f976a7852 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/BoxOpenStatusInfo.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/BoxOpenStatusInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.mango.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/ConfigImgUrl.java b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/ConfigImgUrl.java similarity index 93% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/ConfigImgUrl.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/bean/ConfigImgUrl.java index b7886f8c1..2825fc179 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/ConfigImgUrl.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/ConfigImgUrl.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.mango.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/HonourBuyKeyResultInfo.java b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/HonourBuyKeyResultInfo.java similarity index 92% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/HonourBuyKeyResultInfo.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/bean/HonourBuyKeyResultInfo.java index 0e8f85c3e..97ec5731f 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/HonourBuyKeyResultInfo.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/HonourBuyKeyResultInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.mango.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/HonourKeyInfo.java b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/HonourKeyInfo.java similarity index 93% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/HonourKeyInfo.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/bean/HonourKeyInfo.java index 61b90c113..b7d0ce667 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/HonourKeyInfo.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/HonourKeyInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.mango.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/KeyInfo.java b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/KeyInfo.java similarity index 95% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/KeyInfo.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/bean/KeyInfo.java index 5d02cfacf..d6782f3bb 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/KeyInfo.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/KeyInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.mango.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxHonourResult.java b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/OpenBoxHonourResult.java similarity index 95% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxHonourResult.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/bean/OpenBoxHonourResult.java index 6c5ddc37c..e555bfc43 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxHonourResult.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/OpenBoxHonourResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.mango.treasure_box.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxResult.java b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/OpenBoxResult.java similarity index 95% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxResult.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/bean/OpenBoxResult.java index 5c227ba72..c49d60bde 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxResult.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/OpenBoxResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.mango.treasure_box.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/PrizeInfo.java b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/PrizeInfo.java similarity index 97% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/PrizeInfo.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/bean/PrizeInfo.java index 56c887141..777edbbce 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/PrizeInfo.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/bean/PrizeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.mango.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenBoxEvent.java b/core/src/model_treasure_box/java/com/mango/treasure_box/event/AutoOpenBoxEvent.java similarity index 81% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenBoxEvent.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/event/AutoOpenBoxEvent.java index 58866d2cf..01d44366e 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenBoxEvent.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/event/AutoOpenBoxEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.treasure_box.event; +package com.mango.treasure_box.event; -import com.yizhuan.treasure_box.bean.OpenBoxResult; +import com.mango.treasure_box.bean.OpenBoxResult; import lombok.Data; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenHonourBoxEvent.java b/core/src/model_treasure_box/java/com/mango/treasure_box/event/AutoOpenHonourBoxEvent.java similarity index 74% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenHonourBoxEvent.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/event/AutoOpenHonourBoxEvent.java index 53faa8955..0a9a48eb1 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenHonourBoxEvent.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/event/AutoOpenHonourBoxEvent.java @@ -1,7 +1,7 @@ -package com.yizhuan.treasure_box.event; +package com.mango.treasure_box.event; -import com.yizhuan.treasure_box.bean.OpenBoxHonourResult; -import com.yizhuan.treasure_box.bean.OpenBoxResult; +import com.mango.treasure_box.bean.OpenBoxHonourResult; +import com.mango.treasure_box.bean.OpenBoxResult; import lombok.Data; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/BoxBuyKeyEvent.java b/core/src/model_treasure_box/java/com/mango/treasure_box/event/BoxBuyKeyEvent.java similarity index 90% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/BoxBuyKeyEvent.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/event/BoxBuyKeyEvent.java index 248c4abdc..dcd2bc794 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/BoxBuyKeyEvent.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/event/BoxBuyKeyEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.treasure_box.event; +package com.mango.treasure_box.event; -import com.yizhuan.treasure_box.bean.KeyInfo; +import com.mango.treasure_box.bean.KeyInfo; import lombok.Data; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/HonourBoxBuyKeyEvent.java b/core/src/model_treasure_box/java/com/mango/treasure_box/event/HonourBoxBuyKeyEvent.java similarity index 80% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/HonourBoxBuyKeyEvent.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/event/HonourBoxBuyKeyEvent.java index 3e2df4d26..838f66d0d 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/HonourBoxBuyKeyEvent.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/event/HonourBoxBuyKeyEvent.java @@ -1,8 +1,8 @@ -package com.yizhuan.treasure_box.event; +package com.mango.treasure_box.event; -import com.yizhuan.treasure_box.bean.HonourBuyKeyResultInfo; -import com.yizhuan.treasure_box.bean.HonourKeyInfo; -import com.yizhuan.treasure_box.bean.KeyInfo; +import com.mango.treasure_box.bean.HonourBuyKeyResultInfo; +import com.mango.treasure_box.bean.HonourKeyInfo; +import com.mango.treasure_box.bean.KeyInfo; import lombok.Data; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/BoxModel.java b/core/src/model_treasure_box/java/com/mango/treasure_box/model/BoxModel.java similarity index 90% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/BoxModel.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/model/BoxModel.java index 6577d06de..2f11f12cc 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/BoxModel.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/model/BoxModel.java @@ -1,21 +1,21 @@ -package com.yizhuan.treasure_box.model; +package com.mango.treasure_box.model; -import com.yizhuan.treasure_box.bean.BoxOpenStatusInfo; -import com.yizhuan.treasure_box.bean.HonourBuyKeyResultInfo; -import com.yizhuan.treasure_box.bean.HonourKeyInfo; -import com.yizhuan.treasure_box.bean.OpenBoxHonourResult; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.treasure_box.bean.ConfigImgUrl; -import com.yizhuan.treasure_box.bean.KeyInfo; -import com.yizhuan.treasure_box.bean.OpenBoxResult; -import com.yizhuan.treasure_box.bean.PrizeInfo; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.treasure_box.bean.BoxOpenStatusInfo; +import com.mango.treasure_box.bean.HonourBuyKeyResultInfo; +import com.mango.treasure_box.bean.HonourKeyInfo; +import com.mango.treasure_box.bean.OpenBoxHonourResult; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.exception.FailReasonException; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.treasure_box.bean.ConfigImgUrl; +import com.mango.treasure_box.bean.KeyInfo; +import com.mango.treasure_box.bean.OpenBoxResult; +import com.mango.treasure_box.bean.PrizeInfo; +import com.mango.core.utils.net.BalanceNotEnoughExeption; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/IBoxModel.java b/core/src/model_treasure_box/java/com/mango/treasure_box/model/IBoxModel.java similarity index 79% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/IBoxModel.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/model/IBoxModel.java index e7f9ef0fe..767c57a00 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/IBoxModel.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/model/IBoxModel.java @@ -1,15 +1,15 @@ -package com.yizhuan.treasure_box.model; +package com.mango.treasure_box.model; -import com.yizhuan.treasure_box.bean.BoxOpenStatusInfo; -import com.yizhuan.treasure_box.bean.HonourBuyKeyResultInfo; -import com.yizhuan.treasure_box.bean.HonourKeyInfo; -import com.yizhuan.treasure_box.bean.OpenBoxHonourResult; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.treasure_box.bean.ConfigImgUrl; -import com.yizhuan.treasure_box.bean.KeyInfo; -import com.yizhuan.treasure_box.bean.OpenBoxResult; -import com.yizhuan.treasure_box.bean.PrizeInfo; +import com.mango.treasure_box.bean.BoxOpenStatusInfo; +import com.mango.treasure_box.bean.HonourBuyKeyResultInfo; +import com.mango.treasure_box.bean.HonourKeyInfo; +import com.mango.treasure_box.bean.OpenBoxHonourResult; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.treasure_box.bean.ConfigImgUrl; +import com.mango.treasure_box.bean.KeyInfo; +import com.mango.treasure_box.bean.OpenBoxResult; +import com.mango.treasure_box.bean.PrizeInfo; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/IRadishModel.java b/core/src/model_treasure_box/java/com/mango/treasure_box/model/IRadishModel.java similarity index 72% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/IRadishModel.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/model/IRadishModel.java index add703875..2b1f656d9 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/IRadishModel.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/model/IRadishModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.treasure_box.model; +package com.mango.treasure_box.model; -import com.yizhuan.treasure_box.bean.BoxOpenStatusInfo; -import com.yizhuan.treasure_box.bean.KeyInfo; -import com.yizhuan.treasure_box.bean.OpenBoxResult; -import com.yizhuan.treasure_box.bean.PrizeInfo; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; +import com.mango.treasure_box.bean.BoxOpenStatusInfo; +import com.mango.treasure_box.bean.KeyInfo; +import com.mango.treasure_box.bean.OpenBoxResult; +import com.mango.treasure_box.bean.PrizeInfo; +import com.mango.core.base.IModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.room.treasure_box.bean.BoxRankingInfo; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/RadishModel.java b/core/src/model_treasure_box/java/com/mango/treasure_box/model/RadishModel.java similarity index 88% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/RadishModel.java rename to core/src/model_treasure_box/java/com/mango/treasure_box/model/RadishModel.java index cc411e747..9c308cba6 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/RadishModel.java +++ b/core/src/model_treasure_box/java/com/mango/treasure_box/model/RadishModel.java @@ -1,18 +1,18 @@ -package com.yizhuan.treasure_box.model; +package com.mango.treasure_box.model; -import com.yizhuan.treasure_box.bean.BoxOpenStatusInfo; -import com.yizhuan.treasure_box.bean.KeyInfo; -import com.yizhuan.treasure_box.bean.OpenBoxResult; -import com.yizhuan.treasure_box.bean.PrizeInfo; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.CommunityConstant; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; +import com.mango.treasure_box.bean.BoxOpenStatusInfo; +import com.mango.treasure_box.bean.KeyInfo; +import com.mango.treasure_box.bean.OpenBoxResult; +import com.mango.treasure_box.bean.PrizeInfo; +import com.mango.core.auth.AuthModel; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.community.CommunityConstant; +import com.mango.core.exception.FailReasonException; +import com.mango.core.manager.AvRoomDataManager; +import com.mango.core.room.treasure_box.bean.BoxRankingInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/NewestVersionInfo.java b/core/src/model_upgrade_app/java/com/mango/core/upgrade/bean/NewestVersionInfo.java similarity index 95% rename from core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/NewestVersionInfo.java rename to core/src/model_upgrade_app/java/com/mango/core/upgrade/bean/NewestVersionInfo.java index f50faf03c..3e3aea637 100644 --- a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/NewestVersionInfo.java +++ b/core/src/model_upgrade_app/java/com/mango/core/upgrade/bean/NewestVersionInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.upgrade.bean; +package com.mango.core.upgrade.bean; import lombok.Data; diff --git a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/UpgradeCache.java b/core/src/model_upgrade_app/java/com/mango/core/upgrade/bean/UpgradeCache.java similarity index 79% rename from core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/UpgradeCache.java rename to core/src/model_upgrade_app/java/com/mango/core/upgrade/bean/UpgradeCache.java index a88c11ebe..4175df200 100644 --- a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/UpgradeCache.java +++ b/core/src/model_upgrade_app/java/com/mango/core/upgrade/bean/UpgradeCache.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.upgrade.bean; +package com.mango.core.upgrade.bean; import lombok.Getter; import lombok.Setter; diff --git a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/event/ImPushUpdateAppEvent.java b/core/src/model_upgrade_app/java/com/mango/core/upgrade/event/ImPushUpdateAppEvent.java similarity index 72% rename from core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/event/ImPushUpdateAppEvent.java rename to core/src/model_upgrade_app/java/com/mango/core/upgrade/event/ImPushUpdateAppEvent.java index 60cb55cf5..6c3de7b7b 100644 --- a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/event/ImPushUpdateAppEvent.java +++ b/core/src/model_upgrade_app/java/com/mango/core/upgrade/event/ImPushUpdateAppEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.upgrade.event; +package com.mango.core.upgrade.event; /** * IM推送全局广播-发出事件-用户请求更新接口 diff --git a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/IUpgradeModel.java b/core/src/model_upgrade_app/java/com/mango/core/upgrade/model/IUpgradeModel.java similarity index 83% rename from core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/IUpgradeModel.java rename to core/src/model_upgrade_app/java/com/mango/core/upgrade/model/IUpgradeModel.java index a9c03c01d..4509caca0 100644 --- a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/IUpgradeModel.java +++ b/core/src/model_upgrade_app/java/com/mango/core/upgrade/model/IUpgradeModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.upgrade.model; +package com.mango.core.upgrade.model; -import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo; +import com.mango.core.upgrade.bean.NewestVersionInfo; import io.reactivex.Single; 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/mango/core/upgrade/model/UpgradeModel.java similarity index 94% rename from core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/UpgradeModel.java rename to core/src/model_upgrade_app/java/com/mango/core/upgrade/model/UpgradeModel.java index 86295df33..a3658ef2e 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/mango/core/upgrade/model/UpgradeModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.upgrade.model; +package com.mango.core.upgrade.model; import android.content.Intent; import android.net.Uri; @@ -16,13 +16,13 @@ import com.liulishuo.okdownload.core.cause.EndCause; import com.liulishuo.okdownload.core.cause.ResumeFailedCause; import com.liulishuo.okdownload.core.listener.DownloadListener1; import com.liulishuo.okdownload.core.listener.assist.Listener1Assist; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo; -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.codec.MD5Utils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.core.base.BaseModel; +import com.mango.core.bean.response.ServiceResult; +import com.mango.core.upgrade.bean.NewestVersionInfo; +import com.mango.core.utils.net.RxHelper; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.utils.codec.MD5Utils; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.io.File; import java.io.IOException; diff --git a/core/src/test/java/com/yizhuan/xchat_android_core/ExampleUnitTest.java b/core/src/test/java/com/mango/core/ExampleUnitTest.java similarity index 84% rename from core/src/test/java/com/yizhuan/xchat_android_core/ExampleUnitTest.java rename to core/src/test/java/com/mango/core/ExampleUnitTest.java index aff60b1de..7a54c6575 100644 --- a/core/src/test/java/com/yizhuan/xchat_android_core/ExampleUnitTest.java +++ b/core/src/test/java/com/mango/core/ExampleUnitTest.java @@ -1,14 +1,10 @@ -package com.yizhuan.xchat_android_core; +package com.mango.core; import org.junit.Test; import io.reactivex.Single; import io.reactivex.SingleEmitter; -import io.reactivex.SingleObserver; import io.reactivex.SingleOnSubscribe; -import io.reactivex.SingleSource; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Function; import static org.junit.Assert.*; diff --git a/app/src/androidTest/java/com/yizhuan/erban/ExampleInstrumentedTest.java b/library/src/androidTest/java/com/mango/xchat_android_library/ExampleInstrumentedTest.java similarity index 86% rename from app/src/androidTest/java/com/yizhuan/erban/ExampleInstrumentedTest.java rename to library/src/androidTest/java/com/mango/xchat_android_library/ExampleInstrumentedTest.java index 768f45f57..addb4f60b 100644 --- a/app/src/androidTest/java/com/yizhuan/erban/ExampleInstrumentedTest.java +++ b/library/src/androidTest/java/com/mango/xchat_android_library/ExampleInstrumentedTest.java @@ -1,10 +1,9 @@ -package com.yizhuan.erban; +package com.mango.xchat_android_library; import android.content.Context; import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.ext.junit.runners.AndroidJUnit4; - import org.junit.Test; import org.junit.runner.RunWith; @@ -22,7 +21,6 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("com.yizhuan.erban_android_client", appContext.getPackageName()); + assertEquals("com.moshen.xchat_android_library", appContext.getPackageName()); } - } diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 166034efd..06b585305 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="com.mango.xchat_android_library"> diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java b/library/src/main/java/com/mango/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java rename to library/src/main/java/com/mango/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java index 3df7ed175..238bf2851 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java +++ b/library/src/main/java/com/mango/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.adapters; +package com.mango.xchat_android_library.adapters; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/animator/AbstractPathAnimator.java b/library/src/main/java/com/mango/xchat_android_library/animator/AbstractPathAnimator.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/animator/AbstractPathAnimator.java rename to library/src/main/java/com/mango/xchat_android_library/animator/AbstractPathAnimator.java index 46f19818d..11a086e2a 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/animator/AbstractPathAnimator.java +++ b/library/src/main/java/com/mango/xchat_android_library/animator/AbstractPathAnimator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.xchat_android_library.animator; +package com.mango.xchat_android_library.animator; import android.content.res.Resources; import android.content.res.TypedArray; @@ -21,7 +21,7 @@ import android.graphics.Path; import android.view.View; import android.view.ViewGroup; -import com.yizhuan.xchat_android_library.R; +import com.mango.xchat_android_library.R; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/animator/PathAnimator.java b/library/src/main/java/com/mango/xchat_android_library/animator/PathAnimator.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/animator/PathAnimator.java rename to library/src/main/java/com/mango/xchat_android_library/animator/PathAnimator.java index 21b388cfc..6a768eaf9 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/animator/PathAnimator.java +++ b/library/src/main/java/com/mango/xchat_android_library/animator/PathAnimator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.xchat_android_library.animator; +package com.mango.xchat_android_library.animator; import android.graphics.Matrix; import android.graphics.Path; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/annatation/ActLayoutRes.java b/library/src/main/java/com/mango/xchat_android_library/annatation/ActLayoutRes.java similarity index 85% rename from library/src/main/java/com/yizhuan/xchat_android_library/annatation/ActLayoutRes.java rename to library/src/main/java/com/mango/xchat_android_library/annatation/ActLayoutRes.java index acf027efc..e71e9253d 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/annatation/ActLayoutRes.java +++ b/library/src/main/java/com/mango/xchat_android_library/annatation/ActLayoutRes.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.annatation; +package com.mango.xchat_android_library.annatation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/IMvpBaseView.java b/library/src/main/java/com/mango/xchat_android_library/base/IMvpBaseView.java similarity index 70% rename from library/src/main/java/com/yizhuan/xchat_android_library/base/IMvpBaseView.java rename to library/src/main/java/com/mango/xchat_android_library/base/IMvpBaseView.java index 24534494f..b6c1e984b 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/IMvpBaseView.java +++ b/library/src/main/java/com/mango/xchat_android_library/base/IMvpBaseView.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.base; +package com.mango.xchat_android_library.base; /** *

MVP 模式View 基类

diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/PresenterEvent.java b/library/src/main/java/com/mango/xchat_android_library/base/PresenterEvent.java similarity index 67% rename from library/src/main/java/com/yizhuan/xchat_android_library/base/PresenterEvent.java rename to library/src/main/java/com/mango/xchat_android_library/base/PresenterEvent.java index faa0b04f4..392e94670 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/PresenterEvent.java +++ b/library/src/main/java/com/mango/xchat_android_library/base/PresenterEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.base; +package com.mango.xchat_android_library.base; public enum PresenterEvent { diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/AbstractMvpPresenter.java b/library/src/main/java/com/mango/xchat_android_library/base/factory/AbstractMvpPresenter.java similarity index 95% rename from library/src/main/java/com/yizhuan/xchat_android_library/base/factory/AbstractMvpPresenter.java rename to library/src/main/java/com/mango/xchat_android_library/base/factory/AbstractMvpPresenter.java index d446d5063..035b28904 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/AbstractMvpPresenter.java +++ b/library/src/main/java/com/mango/xchat_android_library/base/factory/AbstractMvpPresenter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.base.factory; +package com.mango.xchat_android_library.base.factory; import android.os.Bundle; import androidx.annotation.NonNull; @@ -9,9 +9,9 @@ import com.trello.rxlifecycle3.LifecycleProvider; import com.trello.rxlifecycle3.LifecycleTransformer; import com.trello.rxlifecycle3.OutsideLifecycleException; import com.trello.rxlifecycle3.RxLifecycle; -import com.yizhuan.xchat_android_library.BuildConfig; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_library.base.PresenterEvent; +import com.mango.xchat_android_library.BuildConfig; +import com.mango.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.PresenterEvent; import io.reactivex.Observable; import io.reactivex.functions.Function; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/BaseMvpProxy.java b/library/src/main/java/com/mango/xchat_android_library/base/factory/BaseMvpProxy.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/base/factory/BaseMvpProxy.java rename to library/src/main/java/com/mango/xchat_android_library/base/factory/BaseMvpProxy.java index 2de3247c8..d9197001f 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/BaseMvpProxy.java +++ b/library/src/main/java/com/mango/xchat_android_library/base/factory/BaseMvpProxy.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_library.base.factory; +package com.mango.xchat_android_library.base.factory; import android.os.Bundle; import android.util.Log; -import com.yizhuan.xchat_android_library.BuildConfig; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.BuildConfig; +import com.mango.xchat_android_library.base.IMvpBaseView; /** diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/CreatePresenter.java b/library/src/main/java/com/mango/xchat_android_library/base/factory/CreatePresenter.java similarity index 86% rename from library/src/main/java/com/yizhuan/xchat_android_library/base/factory/CreatePresenter.java rename to library/src/main/java/com/mango/xchat_android_library/base/factory/CreatePresenter.java index 1a19b8160..5a351283b 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/CreatePresenter.java +++ b/library/src/main/java/com/mango/xchat_android_library/base/factory/CreatePresenter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.base.factory; +package com.mango.xchat_android_library.base.factory; import java.lang.annotation.Inherited; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/PresenterMvpFactory.java b/library/src/main/java/com/mango/xchat_android_library/base/factory/PresenterMvpFactory.java similarity index 72% rename from library/src/main/java/com/yizhuan/xchat_android_library/base/factory/PresenterMvpFactory.java rename to library/src/main/java/com/mango/xchat_android_library/base/factory/PresenterMvpFactory.java index 52b126be6..b9b212dba 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/PresenterMvpFactory.java +++ b/library/src/main/java/com/mango/xchat_android_library/base/factory/PresenterMvpFactory.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_library.base.factory; +package com.mango.xchat_android_library.base.factory; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** *

Presenter 工厂接口

diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/PresenterMvpFactoryImpl.java b/library/src/main/java/com/mango/xchat_android_library/base/factory/PresenterMvpFactoryImpl.java similarity index 92% rename from library/src/main/java/com/yizhuan/xchat_android_library/base/factory/PresenterMvpFactoryImpl.java rename to library/src/main/java/com/mango/xchat_android_library/base/factory/PresenterMvpFactoryImpl.java index e135ebef4..32166e56e 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/PresenterMvpFactoryImpl.java +++ b/library/src/main/java/com/mango/xchat_android_library/base/factory/PresenterMvpFactoryImpl.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_library.base.factory; +package com.mango.xchat_android_library.base.factory; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** *

Presenter 工厂实现类

diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/PresenterProxyInterface.java b/library/src/main/java/com/mango/xchat_android_library/base/factory/PresenterProxyInterface.java similarity index 88% rename from library/src/main/java/com/yizhuan/xchat_android_library/base/factory/PresenterProxyInterface.java rename to library/src/main/java/com/mango/xchat_android_library/base/factory/PresenterProxyInterface.java index 0eaed00c9..03ac26d75 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/base/factory/PresenterProxyInterface.java +++ b/library/src/main/java/com/mango/xchat_android_library/base/factory/PresenterProxyInterface.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_library.base.factory; +package com.mango.xchat_android_library.base.factory; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; +import com.mango.xchat_android_library.base.IMvpBaseView; /** *

提供设置工厂，获取工厂，获取Presenter的方法，由V层实现这个接口

diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/BaseItem.java b/library/src/main/java/com/mango/xchat_android_library/bindinglist/BaseItem.java similarity index 91% rename from library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/BaseItem.java rename to library/src/main/java/com/mango/xchat_android_library/bindinglist/BaseItem.java index a8ab512c8..f3b5547ba 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/BaseItem.java +++ b/library/src/main/java/com/mango/xchat_android_library/bindinglist/BaseItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.bindinglist; +package com.mango.xchat_android_library.bindinglist; import android.content.Context; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/IItem.java b/library/src/main/java/com/mango/xchat_android_library/bindinglist/IItem.java similarity index 79% rename from library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/IItem.java rename to library/src/main/java/com/mango/xchat_android_library/bindinglist/IItem.java index e332e5129..4ea375e8b 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/IItem.java +++ b/library/src/main/java/com/mango/xchat_android_library/bindinglist/IItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.bindinglist; +package com.mango.xchat_android_library.bindinglist; /** * Created by lvzebiao on 2018/10/23. diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/ItemViewHolder.java b/library/src/main/java/com/mango/xchat_android_library/bindinglist/ItemViewHolder.java similarity index 94% rename from library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/ItemViewHolder.java rename to library/src/main/java/com/mango/xchat_android_library/bindinglist/ItemViewHolder.java index 267c74d91..c576320a6 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/ItemViewHolder.java +++ b/library/src/main/java/com/mango/xchat_android_library/bindinglist/ItemViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.bindinglist; +package com.mango.xchat_android_library.bindinglist; import androidx.databinding.DataBindingUtil; import androidx.databinding.ViewDataBinding; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/MultiTypeAdapter.java b/library/src/main/java/com/mango/xchat_android_library/bindinglist/MultiTypeAdapter.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/MultiTypeAdapter.java rename to library/src/main/java/com/mango/xchat_android_library/bindinglist/MultiTypeAdapter.java index 414359302..bbe9857c5 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/MultiTypeAdapter.java +++ b/library/src/main/java/com/mango/xchat_android_library/bindinglist/MultiTypeAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.bindinglist; +package com.mango.xchat_android_library.bindinglist; import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableList; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/AbstractBaseCore.java b/library/src/main/java/com/mango/xchat_android_library/coremanager/AbstractBaseCore.java similarity index 85% rename from library/src/main/java/com/yizhuan/xchat_android_library/coremanager/AbstractBaseCore.java rename to library/src/main/java/com/mango/xchat_android_library/coremanager/AbstractBaseCore.java index 616b120b3..c0e853265 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/AbstractBaseCore.java +++ b/library/src/main/java/com/mango/xchat_android_library/coremanager/AbstractBaseCore.java @@ -2,11 +2,11 @@ * 每个core实现类都应该继承此类 * 提供一些基础设施给子类使用 */ -package com.yizhuan.xchat_android_library.coremanager; +package com.mango.xchat_android_library.coremanager; import android.content.Context; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.config.BasicConfig; /** diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreError.java b/library/src/main/java/com/mango/xchat_android_library/coremanager/CoreError.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreError.java rename to library/src/main/java/com/mango/xchat_android_library/coremanager/CoreError.java index f83f98bee..42344d18c 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreError.java +++ b/library/src/main/java/com/mango/xchat_android_library/coremanager/CoreError.java @@ -1,7 +1,7 @@ /** * */ -package com.yizhuan.xchat_android_library.coremanager; +package com.mango.xchat_android_library.coremanager; /** * @author daixiang diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreEvent.java b/library/src/main/java/com/mango/xchat_android_library/coremanager/CoreEvent.java similarity index 89% rename from library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreEvent.java rename to library/src/main/java/com/mango/xchat_android_library/coremanager/CoreEvent.java index 050c84527..fc4711189 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreEvent.java +++ b/library/src/main/java/com/mango/xchat_android_library/coremanager/CoreEvent.java @@ -1,7 +1,7 @@ /** * 用于使用annotation实现监听某个client的某个回调 */ -package com.yizhuan.xchat_android_library.coremanager; +package com.mango.xchat_android_library.coremanager; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreEventListener.java b/library/src/main/java/com/mango/xchat_android_library/coremanager/CoreEventListener.java similarity index 91% rename from library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreEventListener.java rename to library/src/main/java/com/mango/xchat_android_library/coremanager/CoreEventListener.java index 51e7e9f2e..62f501e7a 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreEventListener.java +++ b/library/src/main/java/com/mango/xchat_android_library/coremanager/CoreEventListener.java @@ -1,7 +1,7 @@ /** * 用于使用annotation实现监听某个client的某个回调 */ -package com.yizhuan.xchat_android_library.coremanager; +package com.mango.xchat_android_library.coremanager; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreException.java b/library/src/main/java/com/mango/xchat_android_library/coremanager/CoreException.java similarity index 91% rename from library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreException.java rename to library/src/main/java/com/mango/xchat_android_library/coremanager/CoreException.java index 54d56344a..988308ebe 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreException.java +++ b/library/src/main/java/com/mango/xchat_android_library/coremanager/CoreException.java @@ -1,7 +1,7 @@ /** * 用于封装core层的异常 */ -package com.yizhuan.xchat_android_library.coremanager; +package com.mango.xchat_android_library.coremanager; /** * @author daixiang diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreFactory.java b/library/src/main/java/com/mango/xchat_android_library/coremanager/CoreFactory.java similarity index 95% rename from library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreFactory.java rename to library/src/main/java/com/mango/xchat_android_library/coremanager/CoreFactory.java index 099e258d6..209fd2c56 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreFactory.java +++ b/library/src/main/java/com/mango/xchat_android_library/coremanager/CoreFactory.java @@ -2,10 +2,10 @@ * Core对象工厂。使用getCore前需要注册对应core接口实现类 * 此类是非线程安全的，必须在主线程调用 */ -package com.yizhuan.xchat_android_library.coremanager; +package com.mango.xchat_android_library.coremanager; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.log.MLog; import java.util.HashMap; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreManager.java b/library/src/main/java/com/mango/xchat_android_library/coremanager/CoreManager.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreManager.java rename to library/src/main/java/com/mango/xchat_android_library/coremanager/CoreManager.java index b2b5ca365..eb1de060f 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/CoreManager.java +++ b/library/src/main/java/com/mango/xchat_android_library/coremanager/CoreManager.java @@ -4,12 +4,12 @@ * 上层未注册core实现类话，注册一个默认实现（调用init函数） * 此类不是线程安全的，应该只在主线程调用 */ -package com.yizhuan.xchat_android_library.coremanager; +package com.mango.xchat_android_library.coremanager; import android.content.Context; import android.text.TextUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.log.MLog; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/IBaseCore.java b/library/src/main/java/com/mango/xchat_android_library/coremanager/IBaseCore.java similarity index 67% rename from library/src/main/java/com/yizhuan/xchat_android_library/coremanager/IBaseCore.java rename to library/src/main/java/com/mango/xchat_android_library/coremanager/IBaseCore.java index ff2bac5b7..c8c5be858 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/IBaseCore.java +++ b/library/src/main/java/com/mango/xchat_android_library/coremanager/IBaseCore.java @@ -1,7 +1,7 @@ /** * 所有的core接口必须继承此接口 */ -package com.yizhuan.xchat_android_library.coremanager; +package com.mango.xchat_android_library.coremanager; /** * @author daixiang diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/ICoreClient.java b/library/src/main/java/com/mango/xchat_android_library/coremanager/ICoreClient.java similarity index 69% rename from library/src/main/java/com/yizhuan/xchat_android_library/coremanager/ICoreClient.java rename to library/src/main/java/com/mango/xchat_android_library/coremanager/ICoreClient.java index 0ca637394..666afbcff 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/coremanager/ICoreClient.java +++ b/library/src/main/java/com/mango/xchat_android_library/coremanager/ICoreClient.java @@ -1,7 +1,7 @@ /** * 所有的core client接口必须继承于此接口 */ -package com.yizhuan.xchat_android_library.coremanager; +package com.mango.xchat_android_library.coremanager; /** * @author daixiang diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/list/AnimatedExpandableListView.java b/library/src/main/java/com/mango/xchat_android_library/list/AnimatedExpandableListView.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/list/AnimatedExpandableListView.java rename to library/src/main/java/com/mango/xchat_android_library/list/AnimatedExpandableListView.java index 37f9bbc42..af78764e1 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/list/AnimatedExpandableListView.java +++ b/library/src/main/java/com/mango/xchat_android_library/list/AnimatedExpandableListView.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.list; +package com.mango.xchat_android_library.list; import android.annotation.SuppressLint; import android.content.Context; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/list/ArrayListAdapter.java b/library/src/main/java/com/mango/xchat_android_library/list/ArrayListAdapter.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/list/ArrayListAdapter.java rename to library/src/main/java/com/mango/xchat_android_library/list/ArrayListAdapter.java index fe2fcb3c8..6b21ae360 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/list/ArrayListAdapter.java +++ b/library/src/main/java/com/mango/xchat_android_library/list/ArrayListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.list; +package com.mango.xchat_android_library.list; import java.util.ArrayList; import java.util.Collections; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/list/BaseAnimatedExpandableListAdapter.java b/library/src/main/java/com/mango/xchat_android_library/list/BaseAnimatedExpandableListAdapter.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/list/BaseAnimatedExpandableListAdapter.java rename to library/src/main/java/com/mango/xchat_android_library/list/BaseAnimatedExpandableListAdapter.java index a5dd8c495..15b5484f4 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/list/BaseAnimatedExpandableListAdapter.java +++ b/library/src/main/java/com/mango/xchat_android_library/list/BaseAnimatedExpandableListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.list; +package com.mango.xchat_android_library.list; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/list/BaseGroupItem.java b/library/src/main/java/com/mango/xchat_android_library/list/BaseGroupItem.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/list/BaseGroupItem.java rename to library/src/main/java/com/mango/xchat_android_library/list/BaseGroupItem.java index cdf846099..fe6034b58 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/list/BaseGroupItem.java +++ b/library/src/main/java/com/mango/xchat_android_library/list/BaseGroupItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.list; +package com.mango.xchat_android_library.list; import android.content.Context; import android.util.Log; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/list/BaseListAdapter.java b/library/src/main/java/com/mango/xchat_android_library/list/BaseListAdapter.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/list/BaseListAdapter.java rename to library/src/main/java/com/mango/xchat_android_library/list/BaseListAdapter.java index a7c01b1c7..277ea2075 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/list/BaseListAdapter.java +++ b/library/src/main/java/com/mango/xchat_android_library/list/BaseListAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.list; +package com.mango.xchat_android_library.list; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/list/BaseListItem.java b/library/src/main/java/com/mango/xchat_android_library/list/BaseListItem.java similarity index 95% rename from library/src/main/java/com/yizhuan/xchat_android_library/list/BaseListItem.java rename to library/src/main/java/com/mango/xchat_android_library/list/BaseListItem.java index ca4932a54..6638515e5 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/list/BaseListItem.java +++ b/library/src/main/java/com/mango/xchat_android_library/list/BaseListItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.list; +package com.mango.xchat_android_library.list; import android.content.Context; import android.view.ViewGroup; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/list/GroupItem.java b/library/src/main/java/com/mango/xchat_android_library/list/GroupItem.java similarity index 76% rename from library/src/main/java/com/yizhuan/xchat_android_library/list/GroupItem.java rename to library/src/main/java/com/mango/xchat_android_library/list/GroupItem.java index f1b22f60d..a7b1e0566 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/list/GroupItem.java +++ b/library/src/main/java/com/mango/xchat_android_library/list/GroupItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.list; +package com.mango.xchat_android_library.list; import java.util.List; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/list/ListItem.java b/library/src/main/java/com/mango/xchat_android_library/list/ListItem.java similarity index 86% rename from library/src/main/java/com/yizhuan/xchat_android_library/list/ListItem.java rename to library/src/main/java/com/mango/xchat_android_library/list/ListItem.java index 6038f7c71..02d5fa8c7 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/list/ListItem.java +++ b/library/src/main/java/com/mango/xchat_android_library/list/ListItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.list; +package com.mango.xchat_android_library.list; import android.view.ViewGroup; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/list/NoScrollingLinearLayoutManager.java b/library/src/main/java/com/mango/xchat_android_library/list/NoScrollingLinearLayoutManager.java similarity index 95% rename from library/src/main/java/com/yizhuan/xchat_android_library/list/NoScrollingLinearLayoutManager.java rename to library/src/main/java/com/mango/xchat_android_library/list/NoScrollingLinearLayoutManager.java index b5e59911a..ac8a966e3 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/list/NoScrollingLinearLayoutManager.java +++ b/library/src/main/java/com/mango/xchat_android_library/list/NoScrollingLinearLayoutManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.list; +package com.mango.xchat_android_library.list; import android.content.Context; import androidx.recyclerview.widget.LinearLayoutManager; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/list/ViewHolder.java b/library/src/main/java/com/mango/xchat_android_library/list/ViewHolder.java similarity index 87% rename from library/src/main/java/com/yizhuan/xchat_android_library/list/ViewHolder.java rename to library/src/main/java/com/mango/xchat_android_library/list/ViewHolder.java index 9beb02436..989197587 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/list/ViewHolder.java +++ b/library/src/main/java/com/mango/xchat_android_library/list/ViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.list; +package com.mango.xchat_android_library.list; import android.view.View; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/manager/TracingManager.java b/library/src/main/java/com/mango/xchat_android_library/manager/TracingManager.java similarity index 93% rename from library/src/main/java/com/yizhuan/xchat_android_library/manager/TracingManager.java rename to library/src/main/java/com/mango/xchat_android_library/manager/TracingManager.java index f343de6c5..48bd49a0a 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/manager/TracingManager.java +++ b/library/src/main/java/com/mango/xchat_android_library/manager/TracingManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.manager; +package com.mango.xchat_android_library.manager; import android.app.Application; import android.os.Debug; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/RxNet.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/RxNet.java similarity index 86% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/RxNet.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/RxNet.java index 3e4439e4b..294ab4758 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/RxNet.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/RxNet.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_library.net.rxnet; +package com.mango.xchat_android_library.net.rxnet; import android.content.Context; -import com.yizhuan.xchat_android_library.net.rxnet.manager.RxNetManager; -import com.yizhuan.xchat_android_library.utils.NullUtils; +import com.mango.xchat_android_library.net.rxnet.manager.RxNetManager; +import com.mango.xchat_android_library.utils.NullUtils; /** diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/callback/CallBack.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/callback/CallBack.java similarity index 86% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/callback/CallBack.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/callback/CallBack.java index a94d3eec8..b89f7dacd 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/callback/CallBack.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/callback/CallBack.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.net.rxnet.callback; +package com.mango.xchat_android_library.net.rxnet.callback; /** *

网络请求回调

diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonConverterFactory.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/converter/GsonConverterFactory.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonConverterFactory.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/converter/GsonConverterFactory.java index 4d2a191b7..4d5df402a 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonConverterFactory.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/converter/GsonConverterFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.xchat_android_library.net.rxnet.converter; +package com.mango.xchat_android_library.net.rxnet.converter; import com.google.gson.Gson; import com.google.gson.TypeAdapter; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonConverterPlugins.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/converter/GsonConverterPlugins.java similarity index 91% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonConverterPlugins.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/converter/GsonConverterPlugins.java index 0e017dc54..ddd36f8fa 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonConverterPlugins.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/converter/GsonConverterPlugins.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.net.rxnet.converter; +package com.mango.xchat_android_library.net.rxnet.converter; import androidx.annotation.Nullable; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonRequestBodyConverter.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/converter/GsonRequestBodyConverter.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonRequestBodyConverter.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/converter/GsonRequestBodyConverter.java index bba0398fa..e692760f4 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonRequestBodyConverter.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/converter/GsonRequestBodyConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.xchat_android_library.net.rxnet.converter; +package com.mango.xchat_android_library.net.rxnet.converter; import com.google.gson.Gson; import com.google.gson.TypeAdapter; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonResponseBodyConverter.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/converter/GsonResponseBodyConverter.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonResponseBodyConverter.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/converter/GsonResponseBodyConverter.java index 6e7eb118f..27af939a6 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/converter/GsonResponseBodyConverter.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/converter/GsonResponseBodyConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.xchat_android_library.net.rxnet.converter; +package com.mango.xchat_android_library.net.rxnet.converter; import com.google.gson.Gson; import com.google.gson.JsonIOException; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/https/HttpsUtils.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/https/HttpsUtils.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/https/HttpsUtils.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/https/HttpsUtils.java index a469d6f71..9e2c84685 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/https/HttpsUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/https/HttpsUtils.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_library.net.rxnet.https; +package com.mango.xchat_android_library.net.rxnet.https; -import com.yizhuan.xchat_android_library.net.rxnet.utils.RxNetLog; +import com.mango.xchat_android_library.net.rxnet.utils.RxNetLog; import java.io.IOException; import java.io.InputStream; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/interceptor/HttpCacheInterceptor.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/interceptor/HttpCacheInterceptor.java similarity index 88% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/interceptor/HttpCacheInterceptor.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/interceptor/HttpCacheInterceptor.java index 495998997..5a5ab5663 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/interceptor/HttpCacheInterceptor.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/interceptor/HttpCacheInterceptor.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_library.net.rxnet.interceptor; +package com.mango.xchat_android_library.net.rxnet.interceptor; import android.content.Context; -import com.yizhuan.xchat_android_library.net.rxnet.utils.RxNetLog; -import com.yizhuan.xchat_android_library.net.rxnet.utils.RxNetWorkUtils; +import com.mango.xchat_android_library.net.rxnet.utils.RxNetLog; +import com.mango.xchat_android_library.net.rxnet.utils.RxNetWorkUtils; import java.io.IOException; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/interceptor/HttpLoggingInterceptor.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/interceptor/HttpLoggingInterceptor.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/interceptor/HttpLoggingInterceptor.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/interceptor/HttpLoggingInterceptor.java index 41afe60cd..c60edc230 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/interceptor/HttpLoggingInterceptor.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/interceptor/HttpLoggingInterceptor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.xchat_android_library.net.rxnet.interceptor; +package com.mango.xchat_android_library.net.rxnet.interceptor; import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/manager/CacheManager.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/manager/CacheManager.java similarity index 77% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/manager/CacheManager.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/manager/CacheManager.java index 2f8d8b419..ac1f4b2fa 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/manager/CacheManager.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/manager/CacheManager.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_library.net.rxnet.manager; +package com.mango.xchat_android_library.net.rxnet.manager; import android.content.Context; -import com.yizhuan.xchat_android_library.net.rxnet.interceptor.HttpCacheInterceptor; -import com.yizhuan.xchat_android_library.net.rxnet.utils.RxFileUtils; +import com.mango.xchat_android_library.net.rxnet.interceptor.HttpCacheInterceptor; +import com.mango.xchat_android_library.net.rxnet.utils.RxFileUtils; import java.io.File; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/manager/RxNetManager.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/manager/RxNetManager.java similarity index 94% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/manager/RxNetManager.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/manager/RxNetManager.java index 563f959b4..411018998 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/manager/RxNetManager.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/manager/RxNetManager.java @@ -1,14 +1,14 @@ -package com.yizhuan.xchat_android_library.net.rxnet.manager; +package com.mango.xchat_android_library.net.rxnet.manager; import android.content.Context; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.yizhuan.xchat_android_library.BuildConfig; -import com.yizhuan.xchat_android_library.net.rxnet.converter.GsonConverterFactory; -import com.yizhuan.xchat_android_library.net.rxnet.https.HttpsUtils; -import com.yizhuan.xchat_android_library.net.rxnet.interceptor.HttpLoggingInterceptor; -import com.yizhuan.xchat_android_library.net.rxnet.utils.RxNetLog; +import com.mango.xchat_android_library.BuildConfig; +import com.mango.xchat_android_library.net.rxnet.converter.GsonConverterFactory; +import com.mango.xchat_android_library.net.rxnet.https.HttpsUtils; +import com.mango.xchat_android_library.net.rxnet.interceptor.HttpLoggingInterceptor; +import com.mango.xchat_android_library.net.rxnet.utils.RxNetLog; import java.io.IOException; import java.io.InputStream; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/model/HttpHeaders.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/model/HttpHeaders.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/model/HttpHeaders.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/model/HttpHeaders.java index a4bc3a7a4..b0b246d0d 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/model/HttpHeaders.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/model/HttpHeaders.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_library.net.rxnet.model; +package com.mango.xchat_android_library.net.rxnet.model; import android.os.Build; import android.text.TextUtils; -import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.net.rxnet.utils.RxNetLog; +import com.mango.xchat_android_library.net.rxnet.RxNet; +import com.mango.xchat_android_library.net.rxnet.utils.RxNetLog; import org.json.JSONException; import org.json.JSONObject; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxFileUtils.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/utils/RxFileUtils.java similarity index 95% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxFileUtils.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/utils/RxFileUtils.java index 98cdb16a8..911caa768 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxFileUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/utils/RxFileUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.net.rxnet.utils; +package com.mango.xchat_android_library.net.rxnet.utils; import android.content.Context; import android.os.Environment; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxNetLog.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/utils/RxNetLog.java similarity index 93% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxNetLog.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/utils/RxNetLog.java index 475d71a9c..4befe895c 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxNetLog.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/utils/RxNetLog.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.net.rxnet.utils; +package com.mango.xchat_android_library.net.rxnet.utils; import android.util.Log; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxNetWorkUtils.java b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/utils/RxNetWorkUtils.java similarity index 89% rename from library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxNetWorkUtils.java rename to library/src/main/java/com/mango/xchat_android_library/net/rxnet/utils/RxNetWorkUtils.java index 79e3b8081..2c1ea05f1 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxNetWorkUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/net/rxnet/utils/RxNetWorkUtils.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_library.net.rxnet.utils; +package com.mango.xchat_android_library.net.rxnet.utils; import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.config.BasicConfig; /** *

网络判断工具类

diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/record/AuditRecorderConfiguration.java b/library/src/main/java/com/mango/xchat_android_library/record/AuditRecorderConfiguration.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/record/AuditRecorderConfiguration.java rename to library/src/main/java/com/mango/xchat_android_library/record/AuditRecorderConfiguration.java index b5302570f..fc5fcc317 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/record/AuditRecorderConfiguration.java +++ b/library/src/main/java/com/mango/xchat_android_library/record/AuditRecorderConfiguration.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.record; +package com.mango.xchat_android_library.record; import android.media.AudioFormat; import android.media.MediaRecorder; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/record/ExtAudioRecorder.java b/library/src/main/java/com/mango/xchat_android_library/record/ExtAudioRecorder.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/record/ExtAudioRecorder.java rename to library/src/main/java/com/mango/xchat_android_library/record/ExtAudioRecorder.java index 34a32eb0a..db89e08af 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/record/ExtAudioRecorder.java +++ b/library/src/main/java/com/mango/xchat_android_library/record/ExtAudioRecorder.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.record; +package com.mango.xchat_android_library.record; import android.media.AudioFormat; import android.media.AudioRecord; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/record/FailRecorder.java b/library/src/main/java/com/mango/xchat_android_library/record/FailRecorder.java similarity index 90% rename from library/src/main/java/com/yizhuan/xchat_android_library/record/FailRecorder.java rename to library/src/main/java/com/mango/xchat_android_library/record/FailRecorder.java index 6b4016038..4d654fc2b 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/record/FailRecorder.java +++ b/library/src/main/java/com/mango/xchat_android_library/record/FailRecorder.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.record; +package com.mango.xchat_android_library.record; public class FailRecorder { private final FailType type; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/record/SimpleRecordFailed.java b/library/src/main/java/com/mango/xchat_android_library/record/SimpleRecordFailed.java similarity index 76% rename from library/src/main/java/com/yizhuan/xchat_android_library/record/SimpleRecordFailed.java rename to library/src/main/java/com/mango/xchat_android_library/record/SimpleRecordFailed.java index 64d5b59e9..aa0752f04 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/record/SimpleRecordFailed.java +++ b/library/src/main/java/com/mango/xchat_android_library/record/SimpleRecordFailed.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.record; +package com.mango.xchat_android_library.record; public class SimpleRecordFailed implements ExtAudioRecorder.RecorderListener{ @Override diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/rx/RxRetryWithDelay.java b/library/src/main/java/com/mango/xchat_android_library/rx/RxRetryWithDelay.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/rx/RxRetryWithDelay.java rename to library/src/main/java/com/mango/xchat_android_library/rx/RxRetryWithDelay.java index 454af1b73..564ebcfb4 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/rx/RxRetryWithDelay.java +++ b/library/src/main/java/com/mango/xchat_android_library/rx/RxRetryWithDelay.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.rx; +package com.mango.xchat_android_library.rx; import android.util.Log; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/rxbus/RxBus.java b/library/src/main/java/com/mango/xchat_android_library/rxbus/RxBus.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/rxbus/RxBus.java rename to library/src/main/java/com/mango/xchat_android_library/rxbus/RxBus.java index d204eea8e..5720a0245 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/rxbus/RxBus.java +++ b/library/src/main/java/com/mango/xchat_android_library/rxbus/RxBus.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.rxbus; +package com.mango.xchat_android_library.rxbus; import io.reactivex.Flowable; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/rxbus/RxBusHelper.java b/library/src/main/java/com/mango/xchat_android_library/rxbus/RxBusHelper.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/rxbus/RxBusHelper.java rename to library/src/main/java/com/mango/xchat_android_library/rxbus/RxBusHelper.java index dec255fff..c4d4e9395 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/rxbus/RxBusHelper.java +++ b/library/src/main/java/com/mango/xchat_android_library/rxbus/RxBusHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.rxbus; +package com.mango.xchat_android_library.rxbus; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java b/library/src/main/java/com/mango/xchat_android_library/service/ErBanService.java similarity index 95% rename from library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java rename to library/src/main/java/com/mango/xchat_android_library/service/ErBanService.java index 432ed774f..ad9c88246 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java +++ b/library/src/main/java/com/mango/xchat_android_library/service/ErBanService.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.service; +package com.mango.xchat_android_library.service; import android.app.job.JobParameters; import android.app.job.JobService; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/softinput/SoftHideKeyBoardUtil.java b/library/src/main/java/com/mango/xchat_android_library/softinput/SoftHideKeyBoardUtil.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/softinput/SoftHideKeyBoardUtil.java rename to library/src/main/java/com/mango/xchat_android_library/softinput/SoftHideKeyBoardUtil.java index c049b91e7..de722b553 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/softinput/SoftHideKeyBoardUtil.java +++ b/library/src/main/java/com/mango/xchat_android_library/softinput/SoftHideKeyBoardUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.softinput; +package com.mango.xchat_android_library.softinput; import android.app.Activity; import android.graphics.Rect; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivity.java b/library/src/main/java/com/mango/xchat_android_library/swipeactivity/SwipeBackActivity.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivity.java rename to library/src/main/java/com/mango/xchat_android_library/swipeactivity/SwipeBackActivity.java index 8d95f303c..d813871e7 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivity.java +++ b/library/src/main/java/com/mango/xchat_android_library/swipeactivity/SwipeBackActivity.java @@ -1,5 +1,5 @@ -package com.yizhuan.xchat_android_library.swipeactivity; +package com.mango.xchat_android_library.swipeactivity; import android.content.Context; import android.os.Bundle; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivityBase.java b/library/src/main/java/com/mango/xchat_android_library/swipeactivity/SwipeBackActivityBase.java similarity index 88% rename from library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivityBase.java rename to library/src/main/java/com/mango/xchat_android_library/swipeactivity/SwipeBackActivityBase.java index 355bc0c5f..afb58a44f 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivityBase.java +++ b/library/src/main/java/com/mango/xchat_android_library/swipeactivity/SwipeBackActivityBase.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.swipeactivity; +package com.mango.xchat_android_library.swipeactivity; /** * @author hm diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivityHelper.java b/library/src/main/java/com/mango/xchat_android_library/swipeactivity/SwipeBackActivityHelper.java similarity index 93% rename from library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivityHelper.java rename to library/src/main/java/com/mango/xchat_android_library/swipeactivity/SwipeBackActivityHelper.java index 96317cd52..e479d3e92 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivityHelper.java +++ b/library/src/main/java/com/mango/xchat_android_library/swipeactivity/SwipeBackActivityHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.swipeactivity; +package com.mango.xchat_android_library.swipeactivity; import android.app.Activity; import android.graphics.Color; @@ -6,7 +6,7 @@ import android.graphics.drawable.ColorDrawable; import android.view.LayoutInflater; import android.view.View; -import com.yizhuan.xchat_android_library.R; +import com.mango.xchat_android_library.R; /** * @author Yrom diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackLayout.java b/library/src/main/java/com/mango/xchat_android_library/swipeactivity/SwipeBackLayout.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackLayout.java rename to library/src/main/java/com/mango/xchat_android_library/swipeactivity/SwipeBackLayout.java index f0a0abe3e..04eb070c0 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackLayout.java +++ b/library/src/main/java/com/mango/xchat_android_library/swipeactivity/SwipeBackLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.swipeactivity; +package com.mango.xchat_android_library.swipeactivity; import android.app.Activity; import android.content.Context; @@ -13,7 +13,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.yizhuan.xchat_android_library.R; +import com.mango.xchat_android_library.R; import java.util.ArrayList; import java.util.List; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/Utils.java b/library/src/main/java/com/mango/xchat_android_library/swipeactivity/Utils.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/Utils.java rename to library/src/main/java/com/mango/xchat_android_library/swipeactivity/Utils.java index 4ca96be9c..4ff38029f 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/Utils.java +++ b/library/src/main/java/com/mango/xchat_android_library/swipeactivity/Utils.java @@ -1,5 +1,5 @@ -package com.yizhuan.xchat_android_library.swipeactivity; +package com.mango.xchat_android_library.swipeactivity; import android.app.Activity; import android.app.ActivityOptions; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/ViewDragHelper.java b/library/src/main/java/com/mango/xchat_android_library/swipeactivity/ViewDragHelper.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/ViewDragHelper.java rename to library/src/main/java/com/mango/xchat_android_library/swipeactivity/ViewDragHelper.java index bd0bb1237..ed32d293b 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/ViewDragHelper.java +++ b/library/src/main/java/com/mango/xchat_android_library/swipeactivity/ViewDragHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yizhuan.xchat_android_library.swipeactivity; +package com.mango.xchat_android_library.swipeactivity; import android.content.Context; import androidx.core.view.MotionEventCompat; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SchedulePolicy.java b/library/src/main/java/com/mango/xchat_android_library/threadmgr/SchedulePolicy.java similarity index 88% rename from library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SchedulePolicy.java rename to library/src/main/java/com/mango/xchat_android_library/threadmgr/SchedulePolicy.java index b49c17824..50409bd86 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SchedulePolicy.java +++ b/library/src/main/java/com/mango/xchat_android_library/threadmgr/SchedulePolicy.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.threadmgr; +package com.mango.xchat_android_library.threadmgr; import android.util.Log; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakPolicy.java b/library/src/main/java/com/mango/xchat_android_library/threadmgr/SpeakPolicy.java similarity index 88% rename from library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakPolicy.java rename to library/src/main/java/com/mango/xchat_android_library/threadmgr/SpeakPolicy.java index 229e37ab7..03c27c795 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakPolicy.java +++ b/library/src/main/java/com/mango/xchat_android_library/threadmgr/SpeakPolicy.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.threadmgr; +package com.mango.xchat_android_library.threadmgr; import android.util.Log; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakThreadFactory.java b/library/src/main/java/com/mango/xchat_android_library/threadmgr/SpeakThreadFactory.java similarity index 85% rename from library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakThreadFactory.java rename to library/src/main/java/com/mango/xchat_android_library/threadmgr/SpeakThreadFactory.java index 6a42a27f9..035b7121e 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakThreadFactory.java +++ b/library/src/main/java/com/mango/xchat_android_library/threadmgr/SpeakThreadFactory.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.threadmgr; +package com.mango.xchat_android_library.threadmgr; import androidx.annotation.NonNull; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/ThreadPoolManager.java b/library/src/main/java/com/mango/xchat_android_library/threadmgr/ThreadPoolManager.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/ThreadPoolManager.java rename to library/src/main/java/com/mango/xchat_android_library/threadmgr/ThreadPoolManager.java index 057655fff..1667579a3 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/ThreadPoolManager.java +++ b/library/src/main/java/com/mango/xchat_android_library/threadmgr/ThreadPoolManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.threadmgr; +package com.mango.xchat_android_library.threadmgr; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java b/library/src/main/java/com/mango/xchat_android_library/utils/AppMetaDataUtil.java similarity index 89% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java rename to library/src/main/java/com/mango/xchat_android_library/utils/AppMetaDataUtil.java index 90496f91f..562c4fa5a 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/AppMetaDataUtil.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.text.TextUtils; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.log.MLog; /** diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/AppUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/AppUtils.java similarity index 90% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/AppUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/AppUtils.java index 09e94cdac..0a35c1169 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/AppUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/AppUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.content.Context; import android.content.pm.PackageManager; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ArrayUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/ArrayUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/ArrayUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/ArrayUtils.java index b0b1cf05b..df65ca42d 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ArrayUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/ArrayUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/BlankUtil.java b/library/src/main/java/com/mango/xchat_android_library/utils/BlankUtil.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/BlankUtil.java rename to library/src/main/java/com/mango/xchat_android_library/utils/BlankUtil.java index 08920c549..29909fa71 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/BlankUtil.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/BlankUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import java.util.Collection; import java.util.Map; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/CenterDrawableHelper.java b/library/src/main/java/com/mango/xchat_android_library/utils/CenterDrawableHelper.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/CenterDrawableHelper.java rename to library/src/main/java/com/mango/xchat_android_library/utils/CenterDrawableHelper.java index 719a755cd..e24a442c6 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/CenterDrawableHelper.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/CenterDrawableHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/CharSequenceUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/CharSequenceUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/CharSequenceUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/CharSequenceUtils.java index bc1d6e81e..631d2e674 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/CharSequenceUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/CharSequenceUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; /** *

Operations on {@link CharSequence} that are diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/CharUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/CharUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/CharUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/CharUtils.java index 1e8e2aab2..b6bb8a5ea 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/CharUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/CharUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; /** *

Operations on char primitives and Character objects.

diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ColorUtil.java b/library/src/main/java/com/mango/xchat_android_library/utils/ColorUtil.java similarity index 90% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/ColorUtil.java rename to library/src/main/java/com/mango/xchat_android_library/utils/ColorUtil.java index 4233fde4e..0532a718a 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ColorUtil.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/ColorUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; /** diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/CommonUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/CommonUtils.java similarity index 88% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/CommonUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/CommonUtils.java index 253b0a6b4..dc724a7cb 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/CommonUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/CommonUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; public class CommonUtils { private static long lastClickTime; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUuidFactory.java b/library/src/main/java/com/mango/xchat_android_library/utils/DeviceUuidFactory.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUuidFactory.java rename to library/src/main/java/com/mango/xchat_android_library/utils/DeviceUuidFactory.java index 871a90d31..7c6391387 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUuidFactory.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/DeviceUuidFactory.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.content.Context; import android.content.SharedPreferences; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/FP.java b/library/src/main/java/com/mango/xchat_android_library/utils/FP.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/FP.java rename to library/src/main/java/com/mango/xchat_android_library/utils/FP.java index 63f4e8578..c9548952d 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/FP.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/FP.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.util.Pair; import android.util.SparseArray; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/FileUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/FileUtils.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/FileUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/FileUtils.java index a8cd05d5f..afa072291 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/FileUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/FileUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import java.io.File; import java.io.FileInputStream; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/FormatUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/FormatUtils.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/FormatUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/FormatUtils.java index f782c83d6..7ad90ab63 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/FormatUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/FormatUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import java.math.RoundingMode; import java.text.DecimalFormat; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/IOUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/IOUtils.java similarity index 91% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/IOUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/IOUtils.java index be6d6a00b..0c17f9da2 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/IOUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/IOUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import java.io.Closeable; import java.io.IOException; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ImageUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/ImageUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/ImageUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/ImageUtils.java index 630bbf0db..e52f24d0a 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ImageUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/ImageUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.content.Context; import android.graphics.Bitmap; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ImeUtil.java b/library/src/main/java/com/mango/xchat_android_library/utils/ImeUtil.java similarity index 94% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/ImeUtil.java rename to library/src/main/java/com/mango/xchat_android_library/utils/ImeUtil.java index 63f7a177c..ba7b96772 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ImeUtil.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/ImeUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.app.Activity; import android.content.Context; @@ -6,7 +6,7 @@ import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; -import com.yizhuan.xchat_android_library.utils.asynctask.ScheduledTask; +import com.mango.xchat_android_library.utils.asynctask.ScheduledTask; /** * Created with IntelliJ IDEA. diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/JavaUtil.java b/library/src/main/java/com/mango/xchat_android_library/utils/JavaUtil.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/JavaUtil.java rename to library/src/main/java/com/mango/xchat_android_library/utils/JavaUtil.java index 0b34143af..0650c45fb 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/JavaUtil.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/JavaUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.annotation.SuppressLint; import android.text.TextUtils; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ListUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/ListUtils.java similarity index 82% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/ListUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/ListUtils.java index e3b6f8fa2..e668631b8 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ListUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/ListUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import java.util.List; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/LogCallerUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/LogCallerUtils.java similarity index 92% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/LogCallerUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/LogCallerUtils.java index 347d3341a..c559e9a9d 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/LogCallerUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/LogCallerUtils.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.log.MLog; /** * Created by xujiexing on 14-3-19. diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/LogUtil.java b/library/src/main/java/com/mango/xchat_android_library/utils/LogUtil.java similarity index 68% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/LogUtil.java rename to library/src/main/java/com/mango/xchat_android_library/utils/LogUtil.java index a224d0bc2..d618df802 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/LogUtil.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/LogUtil.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.util.Log; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.config.BasicConfig; /** * create by lvzebiao @2019/11/20 diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/MacAddressUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/MacAddressUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/MacAddressUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/MacAddressUtils.java index 9fa4ec35a..486a7ca98 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/MacAddressUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/MacAddressUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.content.Context; import android.content.pm.PackageManager; @@ -9,7 +9,7 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Toast; -import com.yizhuan.xchat_android_library.BuildConfig; +import com.mango.xchat_android_library.BuildConfig; import java.io.BufferedReader; import java.io.FileReader; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/MimeType.java b/library/src/main/java/com/mango/xchat_android_library/utils/MimeType.java similarity index 75% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/MimeType.java rename to library/src/main/java/com/mango/xchat_android_library/utils/MimeType.java index f1802e430..56b1b9f5a 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/MimeType.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/MimeType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; /** * Created by lijun on 2015/7/20. diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/NetworkUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/NetworkUtils.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/NetworkUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/NetworkUtils.java index b8e4d4cb7..e1d6c5e85 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/NetworkUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/NetworkUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.content.Context; import android.net.ConnectivityManager; @@ -8,7 +8,7 @@ import android.net.wifi.WifiManager; import android.telephony.TelephonyManager; import android.util.Log; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.net.Inet4Address; import java.net.InetAddress; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/NullUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/NullUtils.java similarity index 89% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/NullUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/NullUtils.java index e9b8d01bb..819371e9f 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/NullUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/NullUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; /** *

diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ObjectUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/ObjectUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/ObjectUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/ObjectUtils.java index ff07184b0..f8015cbf1 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ObjectUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/ObjectUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import java.io.IOException; import java.io.Serializable; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/OperationTimer.java b/library/src/main/java/com/mango/xchat_android_library/utils/OperationTimer.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/OperationTimer.java rename to library/src/main/java/com/mango/xchat_android_library/utils/OperationTimer.java index 51b9e460f..24056d011 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/OperationTimer.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/OperationTimer.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.os.Handler; import android.os.Message; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/RandomStringUtil.java b/library/src/main/java/com/mango/xchat_android_library/utils/RandomStringUtil.java similarity index 95% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/RandomStringUtil.java rename to library/src/main/java/com/mango/xchat_android_library/utils/RandomStringUtil.java index 60d08f92e..23f38ea26 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/RandomStringUtil.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/RandomStringUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import java.util.Random; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ResolutionUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/ResolutionUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/ResolutionUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/ResolutionUtils.java index 419cbfc8d..f3c18f4d4 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ResolutionUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/ResolutionUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.annotation.TargetApi; import android.content.Context; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/SafeDispatchHandler.java b/library/src/main/java/com/mango/xchat_android_library/utils/SafeDispatchHandler.java similarity index 88% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/SafeDispatchHandler.java rename to library/src/main/java/com/mango/xchat_android_library/utils/SafeDispatchHandler.java index d9aada896..be97abe6c 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/SafeDispatchHandler.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/SafeDispatchHandler.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.os.Handler; import android.os.Looper; import android.os.Message; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.log.MLog; /** * 可安全分发任务的Handler diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ScreenUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/ScreenUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/ScreenUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/ScreenUtils.java index b56e0f46f..16e74f54c 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ScreenUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/ScreenUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.app.Activity; import android.app.KeyguardManager; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/SingleToastUtil.java b/library/src/main/java/com/mango/xchat_android_library/utils/SingleToastUtil.java similarity index 95% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/SingleToastUtil.java rename to library/src/main/java/com/mango/xchat_android_library/utils/SingleToastUtil.java index b8f25ebf0..4305487a6 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/SingleToastUtil.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/SingleToastUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.content.Context; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/SizeUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/SizeUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/SizeUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/SizeUtils.java index 2f6eaf36d..7001f654c 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/SizeUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/SizeUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.content.Context; import android.util.DisplayMetrics; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/StringUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/StringUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/StringUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/StringUtils.java index 599dd7016..06c510ea9 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/StringUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/StringUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/SystemUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/SystemUtils.java similarity index 95% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/SystemUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/SystemUtils.java index 0fe00809a..4f6be5afa 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/SystemUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/SystemUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.content.Context; import android.os.Build; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TelephonyUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/TelephonyUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/TelephonyUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/TelephonyUtils.java index 6595153a7..27353f31d 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TelephonyUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/TelephonyUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.annotation.SuppressLint; import android.content.Context; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TextWatcherWrapper.java b/library/src/main/java/com/mango/xchat_android_library/utils/TextWatcherWrapper.java similarity index 89% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/TextWatcherWrapper.java rename to library/src/main/java/com/mango/xchat_android_library/utils/TextWatcherWrapper.java index 87f968891..bcb1318e4 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TextWatcherWrapper.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/TextWatcherWrapper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.text.Editable; import android.text.TextWatcher; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/TimeUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/TimeUtils.java index 09846a80e..d34169ef1 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/TimeUtils.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.content.Context; import android.util.Log; -import com.yizhuan.xchat_android_library.R; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.R; +import com.mango.xchat_android_library.utils.log.MLog; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/UIUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/UIUtils.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/UIUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/UIUtils.java index 47696e2a2..18c585e8d 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/UIUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/UIUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.annotation.TargetApi; import android.app.Activity; @@ -13,7 +13,7 @@ import android.view.WindowManager; import android.widget.ListView; import android.widget.PopupWindow; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.log.MLog; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/UUIDUtil.java b/library/src/main/java/com/mango/xchat_android_library/utils/UUIDUtil.java similarity index 80% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/UUIDUtil.java rename to library/src/main/java/com/mango/xchat_android_library/utils/UUIDUtil.java index dfce81193..e79c02360 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/UUIDUtil.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/UUIDUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import java.util.UUID; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/UriUtil.java b/library/src/main/java/com/mango/xchat_android_library/utils/UriUtil.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/UriUtil.java rename to library/src/main/java/com/mango/xchat_android_library/utils/UriUtil.java index 36eed9119..eeee10f0e 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/UriUtil.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/UriUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.net.Uri; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/Validate.java b/library/src/main/java/com/mango/xchat_android_library/utils/Validate.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/Validate.java rename to library/src/main/java/com/mango/xchat_android_library/utils/Validate.java index 4d6b3489f..752bc1867 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/Validate.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/Validate.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import java.util.Collection; import java.util.Iterator; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/VersionUtil.java b/library/src/main/java/com/mango/xchat_android_library/utils/VersionUtil.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/VersionUtil.java rename to library/src/main/java/com/mango/xchat_android_library/utils/VersionUtil.java index 066837fcf..c308c7406 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/VersionUtil.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/VersionUtil.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.content.Context; import android.content.pm.PackageManager.NameNotFoundException; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.config.BasicConfig; public class VersionUtil { static int sLocalVer[] = null; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ViewUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/ViewUtils.java similarity index 86% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/ViewUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/ViewUtils.java index c6fdcf2ba..1d404f051 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ViewUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/ViewUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.text.InputFilter; import android.widget.EditText; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ZipUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/ZipUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/ZipUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/ZipUtils.java index 99baa3b27..8b3b6e4dc 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ZipUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/ZipUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils; +package com.mango.xchat_android_library.utils; import android.text.TextUtils; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/anim/AnimUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/anim/AnimUtils.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/anim/AnimUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/anim/AnimUtils.java index ae1f4a6e5..66517788a 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/anim/AnimUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/anim/AnimUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.anim; +package com.mango.xchat_android_library.utils.anim; import android.animation.Animator; import android.animation.ArgbEvaluator; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/anim/PauseableAnimManager.java b/library/src/main/java/com/mango/xchat_android_library/utils/anim/PauseableAnimManager.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/anim/PauseableAnimManager.java rename to library/src/main/java/com/mango/xchat_android_library/utils/anim/PauseableAnimManager.java index 18e3ba87a..4d1d7d2ee 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/anim/PauseableAnimManager.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/anim/PauseableAnimManager.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_library.utils.anim; +package com.mango.xchat_android_library.utils.anim; import android.animation.Animator; import android.animation.ValueAnimator; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.log.MLog; /** * Created by lijun on 2015/7/24. diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/asynctask/AsyncTask.java b/library/src/main/java/com/mango/xchat_android_library/utils/asynctask/AsyncTask.java similarity index 88% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/asynctask/AsyncTask.java rename to library/src/main/java/com/mango/xchat_android_library/utils/asynctask/AsyncTask.java index 8205309b0..cdf509c9d 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/asynctask/AsyncTask.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/asynctask/AsyncTask.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_library.utils.asynctask; +package com.mango.xchat_android_library.utils.asynctask; import android.os.Build; import android.os.HandlerThread; import android.os.Looper; -import com.yizhuan.xchat_android_library.utils.SafeDispatchHandler; +import com.mango.xchat_android_library.utils.SafeDispatchHandler; /** * 异步任务工具。 diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/asynctask/ScheduledTask.java b/library/src/main/java/com/mango/xchat_android_library/utils/asynctask/ScheduledTask.java similarity index 92% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/asynctask/ScheduledTask.java rename to library/src/main/java/com/mango/xchat_android_library/utils/asynctask/ScheduledTask.java index 987cb9382..32dc9fb4a 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/asynctask/ScheduledTask.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/asynctask/ScheduledTask.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_library.utils.asynctask; +package com.mango.xchat_android_library.utils.asynctask; import android.os.HandlerThread; import android.os.Looper; -import com.yizhuan.xchat_android_library.utils.SafeDispatchHandler; +import com.mango.xchat_android_library.utils.SafeDispatchHandler; /** * 执行延迟或定时任务。 diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/Cache.java b/library/src/main/java/com/mango/xchat_android_library/utils/cache/Cache.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/Cache.java rename to library/src/main/java/com/mango/xchat_android_library/utils/cache/Cache.java index 23c7f2316..0ec3655bd 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/Cache.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/cache/Cache.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.cache; +package com.mango.xchat_android_library.utils.cache; /** diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheClient.java b/library/src/main/java/com/mango/xchat_android_library/utils/cache/CacheClient.java similarity index 95% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheClient.java rename to library/src/main/java/com/mango/xchat_android_library/utils/cache/CacheClient.java index 2d3a976fc..6606d1cc1 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheClient.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/cache/CacheClient.java @@ -1,15 +1,15 @@ -package com.yizhuan.xchat_android_library.utils.cache; +package com.mango.xchat_android_library.utils.cache; import android.annotation.SuppressLint; import android.os.Handler; import android.os.Looper; import android.os.Message; -import com.yizhuan.xchat_android_library.utils.StringUtils; -import com.yizhuan.xchat_android_library.utils.TimeUtils; -import com.yizhuan.xchat_android_library.utils.asynctask.AsyncTask; -import com.yizhuan.xchat_android_library.utils.json.JsonParser; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.StringUtils; +import com.mango.xchat_android_library.utils.TimeUtils; +import com.mango.xchat_android_library.utils.asynctask.AsyncTask; +import com.mango.xchat_android_library.utils.json.JsonParser; +import com.mango.xchat_android_library.utils.log.MLog; import java.io.Serializable; import java.util.Map; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheClientFactory.java b/library/src/main/java/com/mango/xchat_android_library/utils/cache/CacheClientFactory.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheClientFactory.java rename to library/src/main/java/com/mango/xchat_android_library/utils/cache/CacheClientFactory.java index 5fd6b61b2..825dcc545 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheClientFactory.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/cache/CacheClientFactory.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.cache; +package com.mango.xchat_android_library.utils.cache; import java.io.File; import java.util.Map; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheException.java b/library/src/main/java/com/mango/xchat_android_library/utils/cache/CacheException.java similarity index 91% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheException.java rename to library/src/main/java/com/mango/xchat_android_library/utils/cache/CacheException.java index 3f0cdadec..3008dbbcc 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheException.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/cache/CacheException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.cache; +package com.mango.xchat_android_library.utils.cache; public class CacheException extends Exception { diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheManager.java b/library/src/main/java/com/mango/xchat_android_library/utils/cache/CacheManager.java similarity index 91% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheManager.java rename to library/src/main/java/com/mango/xchat_android_library/utils/cache/CacheManager.java index 27e633fac..5024b2a5a 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/CacheManager.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/cache/CacheManager.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_library.utils.cache; +package com.mango.xchat_android_library.utils.cache; import android.content.Context; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.StringUtils; -import com.yizhuan.xchat_android_library.utils.codec.MD5Utils; -import com.yizhuan.xchat_android_library.utils.file.StorageUtils; -import com.yizhuan.xchat_android_library.utils.json.JsonParser; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.StringUtils; +import com.mango.xchat_android_library.utils.codec.MD5Utils; +import com.mango.xchat_android_library.utils.file.StorageUtils; +import com.mango.xchat_android_library.utils.json.JsonParser; +import com.mango.xchat_android_library.utils.log.MLog; import java.io.File; import java.io.FileNotFoundException; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/ErrorCallback.java b/library/src/main/java/com/mango/xchat_android_library/utils/cache/ErrorCallback.java similarity index 78% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/ErrorCallback.java rename to library/src/main/java/com/mango/xchat_android_library/utils/cache/ErrorCallback.java index 16f48337e..053e19e4b 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/ErrorCallback.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/cache/ErrorCallback.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.cache; +package com.mango.xchat_android_library.utils.cache; public interface ErrorCallback { diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/NoSuchKeyException.java b/library/src/main/java/com/mango/xchat_android_library/utils/cache/NoSuchKeyException.java similarity index 88% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/NoSuchKeyException.java rename to library/src/main/java/com/mango/xchat_android_library/utils/cache/NoSuchKeyException.java index 95dad3029..a9de1022c 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/NoSuchKeyException.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/cache/NoSuchKeyException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.cache; +package com.mango.xchat_android_library.utils.cache; public class NoSuchKeyException extends CacheException { diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/ReturnCallback.java b/library/src/main/java/com/mango/xchat_android_library/utils/cache/ReturnCallback.java similarity index 63% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/ReturnCallback.java rename to library/src/main/java/com/mango/xchat_android_library/utils/cache/ReturnCallback.java index 2b95e4d85..49f8dc96c 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/ReturnCallback.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/cache/ReturnCallback.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.cache; +package com.mango.xchat_android_library.utils.cache; public interface ReturnCallback { diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/StringDiskCache.java b/library/src/main/java/com/mango/xchat_android_library/utils/cache/StringDiskCache.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/StringDiskCache.java rename to library/src/main/java/com/mango/xchat_android_library/utils/cache/StringDiskCache.java index 8e5501b1b..ec7799893 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/StringDiskCache.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/cache/StringDiskCache.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.cache; +package com.mango.xchat_android_library.utils.cache; import android.annotation.TargetApi; import android.os.Build; @@ -6,9 +6,9 @@ import android.os.Environment; import android.os.StatFs; import android.util.Log; -import com.yizhuan.xchat_android_library.utils.StringUtils; -import com.yizhuan.xchat_android_library.utils.json.JsonParser; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.StringUtils; +import com.mango.xchat_android_library.utils.json.JsonParser; +import com.mango.xchat_android_library.utils.log.MLog; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/StringLruCache.java b/library/src/main/java/com/mango/xchat_android_library/utils/cache/StringLruCache.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/StringLruCache.java rename to library/src/main/java/com/mango/xchat_android_library/utils/cache/StringLruCache.java index 4cad75fde..09f593130 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/cache/StringLruCache.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/cache/StringLruCache.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.cache; +package com.mango.xchat_android_library.utils.cache; import java.util.LinkedHashMap; import java.util.Map; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/Base64Utils.java b/library/src/main/java/com/mango/xchat_android_library/utils/codec/Base64Utils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/Base64Utils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/codec/Base64Utils.java index 08ae1a001..40c6875f2 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/Base64Utils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/codec/Base64Utils.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_library.utils.codec; +package com.mango.xchat_android_library.utils.codec; /** * Created by Zhanghuiping on 14/6/9. */ -import com.yizhuan.xchat_android_library.BuildConfig; +import com.mango.xchat_android_library.BuildConfig; import java.io.UnsupportedEncodingException; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/CipherHelper.java b/library/src/main/java/com/mango/xchat_android_library/utils/codec/CipherHelper.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/CipherHelper.java rename to library/src/main/java/com/mango/xchat_android_library/utils/codec/CipherHelper.java index 18b3754a8..e4bbc1440 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/CipherHelper.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/codec/CipherHelper.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_library.utils.codec; +package com.mango.xchat_android_library.utils.codec; import android.util.Base64; -import com.yizhuan.xchat_android_library.utils.StringUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.StringUtils; +import com.mango.xchat_android_library.utils.log.MLog; import java.nio.ByteBuffer; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/DES3Utils.java b/library/src/main/java/com/mango/xchat_android_library/utils/codec/DES3Utils.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/DES3Utils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/codec/DES3Utils.java index b84c2b2da..e041c60c2 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/DES3Utils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/codec/DES3Utils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.codec; +package com.mango.xchat_android_library.utils.codec; import java.security.Key; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/DESUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/codec/DESUtils.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/DESUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/codec/DESUtils.java index b47e58af4..cf357f58e 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/DESUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/codec/DESUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.codec; +package com.mango.xchat_android_library.utils.codec; /** * /** @@ -8,7 +8,7 @@ package com.yizhuan.xchat_android_library.utils.codec; import android.util.Base64; -import com.yizhuan.xchat_android_library.utils.StringUtils; +import com.mango.xchat_android_library.utils.StringUtils; import java.nio.charset.Charset; import java.security.Key; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/MD5Utils.java b/library/src/main/java/com/mango/xchat_android_library/utils/codec/MD5Utils.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/MD5Utils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/codec/MD5Utils.java index 2ff985722..846e2d09e 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/MD5Utils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/codec/MD5Utils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.codec; +package com.mango.xchat_android_library.utils.codec; import java.io.File; import java.io.FileInputStream; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/RC4Utils.java b/library/src/main/java/com/mango/xchat_android_library/utils/codec/RC4Utils.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/RC4Utils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/codec/RC4Utils.java index 2b769d9c7..fbb3c4a62 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/RC4Utils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/codec/RC4Utils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.codec; +package com.mango.xchat_android_library.utils.codec; /** * Created by Zhanghuiping on 14/6/9. diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/SHAUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/codec/SHAUtils.java similarity index 93% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/SHAUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/codec/SHAUtils.java index 7d43558e2..259514a9b 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/codec/SHAUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/codec/SHAUtils.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_library.utils.codec; +package com.mango.xchat_android_library.utils.codec; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.log.MLog; import java.security.MessageDigest; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/config/BasicConfig.java b/library/src/main/java/com/mango/xchat_android_library/utils/config/BasicConfig.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/config/BasicConfig.java rename to library/src/main/java/com/mango/xchat_android_library/utils/config/BasicConfig.java index 820eb64a5..00937e5f6 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/config/BasicConfig.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/config/BasicConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.config; +package com.mango.xchat_android_library.utils.config; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -6,9 +6,9 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.text.TextUtils; -import com.yizhuan.xchat_android_library.utils.cache.CacheClientFactory; -import com.yizhuan.xchat_android_library.utils.file.StorageUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.cache.CacheClientFactory; +import com.mango.xchat_android_library.utils.file.StorageUtils; +import com.mango.xchat_android_library.utils.log.MLog; import java.io.File; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/download/DownloadManagerUtil.java b/library/src/main/java/com/mango/xchat_android_library/utils/download/DownloadManagerUtil.java similarity index 93% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/download/DownloadManagerUtil.java rename to library/src/main/java/com/mango/xchat_android_library/utils/download/DownloadManagerUtil.java index d1a27f7f4..3eae13dc1 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/download/DownloadManagerUtil.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/download/DownloadManagerUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.download; +package com.mango.xchat_android_library.utils.download; import android.app.DownloadManager; import android.content.BroadcastReceiver; @@ -9,11 +9,11 @@ import android.os.Build; import android.os.Environment; import com.google.gson.internal.LinkedTreeMap; -import com.yizhuan.xchat_android_library.utils.cache.CacheClientFactory; -import com.yizhuan.xchat_android_library.utils.cache.ReturnCallback; -import com.yizhuan.xchat_android_library.utils.MimeType; -import com.yizhuan.xchat_android_library.utils.StringUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.cache.CacheClientFactory; +import com.mango.xchat_android_library.utils.cache.ReturnCallback; +import com.mango.xchat_android_library.utils.MimeType; +import com.mango.xchat_android_library.utils.StringUtils; +import com.mango.xchat_android_library.utils.log.MLog; import java.io.File; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/download/DownloadReceiver.java b/library/src/main/java/com/mango/xchat_android_library/utils/download/DownloadReceiver.java similarity index 91% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/download/DownloadReceiver.java rename to library/src/main/java/com/mango/xchat_android_library/utils/download/DownloadReceiver.java index 2438bcd8c..939af8554 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/download/DownloadReceiver.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/download/DownloadReceiver.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_library.utils.download; +package com.mango.xchat_android_library.utils.download; import android.app.DownloadManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.yizhuan.xchat_android_library.utils.MimeType; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.MimeType; +import com.mango.xchat_android_library.utils.log.MLog; /** * Created by lijun on 2015/7/20. diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/BasicFileUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/file/BasicFileUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/file/BasicFileUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/file/BasicFileUtils.java index 476f003ff..3f0c882ee 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/BasicFileUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/file/BasicFileUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.file; +package com.mango.xchat_android_library.utils.file; import android.content.Context; import android.media.MediaScannerConnection; @@ -6,8 +6,8 @@ import android.os.Build; import android.os.Environment; import android.os.StatFs; -import com.yizhuan.xchat_android_library.utils.FP; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.FP; +import com.mango.xchat_android_library.utils.log.MLog; import java.io.File; import java.io.FileInputStream; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/CMDExecute.java b/library/src/main/java/com/mango/xchat_android_library/utils/file/CMDExecute.java similarity index 95% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/file/CMDExecute.java rename to library/src/main/java/com/mango/xchat_android_library/utils/file/CMDExecute.java index 3d2239cf7..9a21767bc 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/CMDExecute.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/file/CMDExecute.java @@ -1,5 +1,5 @@ -package com.yizhuan.xchat_android_library.utils.file; +package com.mango.xchat_android_library.utils.file; import java.io.File; import java.io.IOException; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/CustomFileException.java b/library/src/main/java/com/mango/xchat_android_library/utils/file/CustomFileException.java similarity index 76% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/file/CustomFileException.java rename to library/src/main/java/com/mango/xchat_android_library/utils/file/CustomFileException.java index 18d49a93b..9e45b6785 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/CustomFileException.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/file/CustomFileException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.file; +package com.mango.xchat_android_library.utils.file; /** * Creator: 舒强睿 diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/FileNoSpaceException.java b/library/src/main/java/com/mango/xchat_android_library/utils/file/FileNoSpaceException.java similarity index 76% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/file/FileNoSpaceException.java rename to library/src/main/java/com/mango/xchat_android_library/utils/file/FileNoSpaceException.java index 2b8854c4b..177835f09 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/FileNoSpaceException.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/file/FileNoSpaceException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.file; +package com.mango.xchat_android_library.utils.file; /** * Creator: 舒强睿 diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/JXFileUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/file/JXFileUtils.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/file/JXFileUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/file/JXFileUtils.java index e5afacd2c..ce1141a23 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/JXFileUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/file/JXFileUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.file; +package com.mango.xchat_android_library.utils.file; import android.annotation.TargetApi; import android.content.ContentResolver; @@ -15,12 +15,12 @@ import android.os.Environment; import android.provider.MediaStore; import android.util.Pair; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.FP; -import com.yizhuan.xchat_android_library.utils.StringUtils; -import com.yizhuan.xchat_android_library.utils.codec.MD5Utils; -import com.yizhuan.xchat_android_library.utils.log.MLog; -import com.yizhuan.xchat_android_library.utils.BlankUtil; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.FP; +import com.mango.xchat_android_library.utils.StringUtils; +import com.mango.xchat_android_library.utils.codec.MD5Utils; +import com.mango.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.BlankUtil; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/StorageUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/file/StorageUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/file/StorageUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/file/StorageUtils.java index 9479f5f25..d0efb0d6d 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/StorageUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/file/StorageUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ -package com.yizhuan.xchat_android_library.utils.file; +package com.mango.xchat_android_library.utils.file; import android.content.Context; import android.content.pm.PackageManager; @@ -21,7 +21,7 @@ import android.os.Build; import android.os.Environment; import android.text.TextUtils; -import com.yizhuan.xchat_android_library.utils.StringUtils; +import com.mango.xchat_android_library.utils.StringUtils; import java.io.File; import java.io.IOException; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/TargetNotPreparedException.java b/library/src/main/java/com/mango/xchat_android_library/utils/file/TargetNotPreparedException.java similarity index 80% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/file/TargetNotPreparedException.java rename to library/src/main/java/com/mango/xchat_android_library/utils/file/TargetNotPreparedException.java index 1e65bc980..f7613d456 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/file/TargetNotPreparedException.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/file/TargetNotPreparedException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.file; +package com.mango.xchat_android_library.utils.file; /** * Creator: 舒强睿 diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/image/Blur.java b/library/src/main/java/com/mango/xchat_android_library/utils/image/Blur.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/image/Blur.java rename to library/src/main/java/com/mango/xchat_android_library/utils/image/Blur.java index 3fc4cbee4..12deef490 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/image/Blur.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/image/Blur.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_library.utils.image; +package com.mango.xchat_android_library.utils.image; import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Bitmap; import android.util.Log; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.log.MLog; public class Blur { diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/image/JXImageUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/image/JXImageUtils.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/image/JXImageUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/image/JXImageUtils.java index 1165c6ce9..ebcf7e1fd 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/image/JXImageUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/image/JXImageUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.image; +package com.mango.xchat_android_library.utils.image; import android.content.Context; import android.content.res.Resources; @@ -19,10 +19,10 @@ import android.graphics.RectF; import android.media.ExifInterface; import android.util.Log; -import com.yizhuan.xchat_android_library.utils.LogUtil; -import com.yizhuan.xchat_android_library.utils.StringUtils; -import com.yizhuan.xchat_android_library.utils.file.JXFileUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.LogUtil; +import com.mango.xchat_android_library.utils.StringUtils; +import com.mango.xchat_android_library.utils.file.JXFileUtils; +import com.mango.xchat_android_library.utils.log.MLog; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/json/JsonParser.java b/library/src/main/java/com/mango/xchat_android_library/utils/json/JsonParser.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/json/JsonParser.java rename to library/src/main/java/com/mango/xchat_android_library/utils/json/JsonParser.java index 41b0cf256..9ba1bf9a5 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/json/JsonParser.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/json/JsonParser.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.json; +package com.mango.xchat_android_library.utils.json; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -6,7 +6,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.log.MLog; import java.io.Serializable; import java.util.ArrayList; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/json/JsonUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/json/JsonUtils.java similarity index 89% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/json/JsonUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/json/JsonUtils.java index 6c3c441d6..4c66172ef 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/json/JsonUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/json/JsonUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.json; +package com.mango.xchat_android_library.utils.json; import com.google.gson.Gson; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/AutoActivityLifecycleCallback.java b/library/src/main/java/com/mango/xchat_android_library/utils/keyboard/AutoActivityLifecycleCallback.java similarity index 95% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/AutoActivityLifecycleCallback.java rename to library/src/main/java/com/mango/xchat_android_library/utils/keyboard/AutoActivityLifecycleCallback.java index e2296ea7f..82b948724 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/AutoActivityLifecycleCallback.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/keyboard/AutoActivityLifecycleCallback.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.keyboard; +package com.mango.xchat_android_library.utils.keyboard; import android.app.Activity; import android.app.Application; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/KeyboardUtil.java b/library/src/main/java/com/mango/xchat_android_library/utils/keyboard/KeyboardUtil.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/KeyboardUtil.java rename to library/src/main/java/com/mango/xchat_android_library/utils/keyboard/KeyboardUtil.java index bd9f51352..63855e9af 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/KeyboardUtil.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/keyboard/KeyboardUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.keyboard; +package com.mango.xchat_android_library.utils.keyboard; import android.app.Activity; import android.app.Dialog; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/KeyboardVisibilityEvent.java b/library/src/main/java/com/mango/xchat_android_library/utils/keyboard/KeyboardVisibilityEvent.java similarity index 98% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/KeyboardVisibilityEvent.java rename to library/src/main/java/com/mango/xchat_android_library/utils/keyboard/KeyboardVisibilityEvent.java index 760141b12..2065ae4a5 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/KeyboardVisibilityEvent.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/keyboard/KeyboardVisibilityEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.keyboard; +package com.mango.xchat_android_library.utils.keyboard; import android.app.Activity; import android.graphics.Rect; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/KeyboardVisibilityEventListener.java b/library/src/main/java/com/mango/xchat_android_library/utils/keyboard/KeyboardVisibilityEventListener.java similarity index 63% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/KeyboardVisibilityEventListener.java rename to library/src/main/java/com/mango/xchat_android_library/utils/keyboard/KeyboardVisibilityEventListener.java index 1b3ee3972..e247fa087 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/KeyboardVisibilityEventListener.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/keyboard/KeyboardVisibilityEventListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.keyboard; +package com.mango.xchat_android_library.utils.keyboard; public interface KeyboardVisibilityEventListener { diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/SimpleUnregister.java b/library/src/main/java/com/mango/xchat_android_library/utils/keyboard/SimpleUnregister.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/SimpleUnregister.java rename to library/src/main/java/com/mango/xchat_android_library/utils/keyboard/SimpleUnregister.java index 4580f9a94..f2e51329f 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/SimpleUnregister.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/keyboard/SimpleUnregister.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.keyboard; +package com.mango.xchat_android_library.utils.keyboard; import android.app.Activity; import android.os.Build; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/Unregister.java b/library/src/main/java/com/mango/xchat_android_library/utils/keyboard/Unregister.java similarity index 82% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/Unregister.java rename to library/src/main/java/com/mango/xchat_android_library/utils/keyboard/Unregister.java index 31d644577..5f2b95dc4 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/keyboard/Unregister.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/keyboard/Unregister.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.keyboard; +package com.mango.xchat_android_library.utils.keyboard; import android.view.ViewTreeObserver; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/log/FastDateFormat.java b/library/src/main/java/com/mango/xchat_android_library/utils/log/FastDateFormat.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/log/FastDateFormat.java rename to library/src/main/java/com/mango/xchat_android_library/utils/log/FastDateFormat.java index 8d5f29520..be224b699 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/log/FastDateFormat.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/log/FastDateFormat.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.log; +package com.mango.xchat_android_library.utils.log; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/log/FormatCache.java b/library/src/main/java/com/mango/xchat_android_library/utils/log/FormatCache.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/log/FormatCache.java rename to library/src/main/java/com/mango/xchat_android_library/utils/log/FormatCache.java index 659e04d7d..f84c1dffc 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/log/FormatCache.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/log/FormatCache.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.log; +package com.mango.xchat_android_library.utils.log; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/log/LogToES.java b/library/src/main/java/com/mango/xchat_android_library/utils/log/LogToES.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/log/LogToES.java rename to library/src/main/java/com/mango/xchat_android_library/utils/log/LogToES.java index 276efeee9..92bf88073 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/log/LogToES.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/log/LogToES.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.log; +package com.mango.xchat_android_library.utils.log; import android.os.SystemClock; import android.util.Log; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/log/MLog.java b/library/src/main/java/com/mango/xchat_android_library/utils/log/MLog.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/log/MLog.java rename to library/src/main/java/com/mango/xchat_android_library/utils/log/MLog.java index f5f733900..4a5632c37 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/log/MLog.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/log/MLog.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.log; +package com.mango.xchat_android_library.utils.log; import android.os.Environment; import android.os.Looper; @@ -6,9 +6,9 @@ import android.os.Process; import android.text.TextUtils; import android.util.Log; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.yizhuan.xchat_android_library.utils.FP; -import com.yizhuan.xchat_android_library.utils.LogCallerUtils; +import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.FP; +import com.mango.xchat_android_library.utils.LogCallerUtils; import java.io.IOException; import java.io.PrintWriter; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/net/MobileNumberUtils.java b/library/src/main/java/com/mango/xchat_android_library/utils/net/MobileNumberUtils.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/net/MobileNumberUtils.java rename to library/src/main/java/com/mango/xchat_android_library/utils/net/MobileNumberUtils.java index 290fa79e2..774f2486f 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/net/MobileNumberUtils.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/net/MobileNumberUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.net; +package com.mango.xchat_android_library.utils.net; import android.text.Spannable; import android.text.SpannableString; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/net/NetworkMonitor.java b/library/src/main/java/com/mango/xchat_android_library/utils/net/NetworkMonitor.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/net/NetworkMonitor.java rename to library/src/main/java/com/mango/xchat_android_library/utils/net/NetworkMonitor.java index 5a9838c48..3394ddd66 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/net/NetworkMonitor.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/net/NetworkMonitor.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.net; +package com.mango.xchat_android_library.utils.net; import android.content.BroadcastReceiver; import android.content.Context; @@ -7,7 +7,7 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.util.Log; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.log.MLog; import java.util.concurrent.CopyOnWriteArraySet; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/CommonPref.java b/library/src/main/java/com/mango/xchat_android_library/utils/pref/CommonPref.java similarity index 93% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/CommonPref.java rename to library/src/main/java/com/mango/xchat_android_library/utils/pref/CommonPref.java index 377229b67..351a6cb00 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/CommonPref.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/pref/CommonPref.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.pref; +package com.mango.xchat_android_library.utils.pref; import android.content.Context; import android.content.SharedPreferences; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/ObjectPref.java b/library/src/main/java/com/mango/xchat_android_library/utils/pref/ObjectPref.java similarity index 84% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/ObjectPref.java rename to library/src/main/java/com/mango/xchat_android_library/utils/pref/ObjectPref.java index c84a350c2..bfe300ba9 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/ObjectPref.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/pref/ObjectPref.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_library.utils.pref; +package com.mango.xchat_android_library.utils.pref; import android.content.Context; import android.content.SharedPreferences; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.config.BasicConfig; public class ObjectPref extends XSharedPref { private static ObjectPref sInst; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/SettingsPref.java b/library/src/main/java/com/mango/xchat_android_library/utils/pref/SettingsPref.java similarity index 89% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/SettingsPref.java rename to library/src/main/java/com/mango/xchat_android_library/utils/pref/SettingsPref.java index 618c8e646..89d8913ee 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/SettingsPref.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/pref/SettingsPref.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_library.utils.pref; +package com.mango.xchat_android_library.utils.pref; import android.content.Context; import android.content.SharedPreferences; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.config.BasicConfig; /** * Creator: 舒强睿 diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/XSharedPref.java b/library/src/main/java/com/mango/xchat_android_library/utils/pref/XSharedPref.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/XSharedPref.java rename to library/src/main/java/com/mango/xchat_android_library/utils/pref/XSharedPref.java index c4c7941f4..51f20a01d 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/XSharedPref.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/pref/XSharedPref.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.pref; +package com.mango.xchat_android_library.utils.pref; /** * Created by zhouxiangfeng on 2017/4/15. diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/YSharedPref.java b/library/src/main/java/com/mango/xchat_android_library/utils/pref/YSharedPref.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/YSharedPref.java rename to library/src/main/java/com/mango/xchat_android_library/utils/pref/YSharedPref.java index 03f1945bd..74d28fbd8 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/YSharedPref.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/pref/YSharedPref.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_library.utils.pref; +package com.mango.xchat_android_library.utils.pref; import android.content.SharedPreferences; import android.text.TextUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; +import com.mango.xchat_android_library.utils.log.MLog; import java.util.ArrayList; import java.util.Arrays; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/valid/Validateable.java b/library/src/main/java/com/mango/xchat_android_library/utils/valid/Validateable.java similarity index 57% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/valid/Validateable.java rename to library/src/main/java/com/mango/xchat_android_library/utils/valid/Validateable.java index 0f90da5c5..a1b9fd486 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/valid/Validateable.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/valid/Validateable.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.valid; +package com.mango.xchat_android_library.utils.valid; public interface Validateable { diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/valid/Validation.java b/library/src/main/java/com/mango/xchat_android_library/utils/valid/Validation.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/utils/valid/Validation.java rename to library/src/main/java/com/mango/xchat_android_library/utils/valid/Validation.java index a976dbcb8..0bae65f47 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/valid/Validation.java +++ b/library/src/main/java/com/mango/xchat_android_library/utils/valid/Validation.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_library.utils.valid; +package com.mango.xchat_android_library.utils.valid; -import com.yizhuan.xchat_android_library.utils.BlankUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; +import com.mango.xchat_android_library.utils.BlankUtil; +import com.mango.xchat_android_library.utils.config.BasicConfig; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/DrawableCenterTextView.java b/library/src/main/java/com/mango/xchat_android_library/widget/DrawableCenterTextView.java similarity index 87% rename from library/src/main/java/com/yizhuan/xchat_android_library/widget/DrawableCenterTextView.java rename to library/src/main/java/com/mango/xchat_android_library/widget/DrawableCenterTextView.java index adcf4458e..e0379baca 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/DrawableCenterTextView.java +++ b/library/src/main/java/com/mango/xchat_android_library/widget/DrawableCenterTextView.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_library.widget; +package com.mango.xchat_android_library.widget; import android.content.Context; import android.graphics.Canvas; import androidx.annotation.Nullable; import android.util.AttributeSet; -import com.yizhuan.xchat_android_library.utils.CenterDrawableHelper; +import com.mango.xchat_android_library.utils.CenterDrawableHelper; /** diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/IOSSwitchView.java b/library/src/main/java/com/mango/xchat_android_library/widget/IOSSwitchView.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/widget/IOSSwitchView.java rename to library/src/main/java/com/mango/xchat_android_library/widget/IOSSwitchView.java index 97dc21b30..41c957bb7 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/IOSSwitchView.java +++ b/library/src/main/java/com/mango/xchat_android_library/widget/IOSSwitchView.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.widget; +package com.mango.xchat_android_library.widget; import android.animation.ObjectAnimator; import android.content.Context; @@ -16,7 +16,7 @@ import android.view.MotionEvent; import android.view.View; import android.view.animation.DecelerateInterpolator; -import com.yizhuan.xchat_android_library.R; +import com.mango.xchat_android_library.R; /** * 高仿IOS风格的UISwitchView diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/ShapeConstrainLayout.java b/library/src/main/java/com/mango/xchat_android_library/widget/ShapeConstrainLayout.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/widget/ShapeConstrainLayout.java rename to library/src/main/java/com/mango/xchat_android_library/widget/ShapeConstrainLayout.java index 57bb7bfcd..5f681d8bc 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/ShapeConstrainLayout.java +++ b/library/src/main/java/com/mango/xchat_android_library/widget/ShapeConstrainLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.widget; +package com.mango.xchat_android_library.widget; import android.content.Context; import android.content.res.TypedArray; @@ -7,7 +7,7 @@ import android.graphics.drawable.GradientDrawable; import androidx.constraintlayout.widget.ConstraintLayout; import android.util.AttributeSet; -import com.yizhuan.xchat_android_library.R; +import com.mango.xchat_android_library.R; /** * 带圆角的约束布局 diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/ViewItem.java b/library/src/main/java/com/mango/xchat_android_library/widget/ViewItem.java similarity index 96% rename from library/src/main/java/com/yizhuan/xchat_android_library/widget/ViewItem.java rename to library/src/main/java/com/mango/xchat_android_library/widget/ViewItem.java index f7c02c9c1..c950863ed 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/ViewItem.java +++ b/library/src/main/java/com/mango/xchat_android_library/widget/ViewItem.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_library.widget; +package com.mango.xchat_android_library.widget; -import com.yizhuan.xchat_android_library.R; +import com.mango.xchat_android_library.R; public class ViewItem { public static final int BUTTON_TYPE_NORMAL = 0; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java b/library/src/main/java/com/mango/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java similarity index 97% rename from library/src/main/java/com/yizhuan/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java rename to library/src/main/java/com/mango/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java index 82c8202b6..8c8c8935d 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java +++ b/library/src/main/java/com/mango/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.widget.decoration; +package com.mango.xchat_android_library.widget.decoration; import android.content.Context; import android.graphics.Rect; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java b/library/src/main/java/com/mango/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java rename to library/src/main/java/com/mango/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java index bb46796a0..3c789eaeb 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java +++ b/library/src/main/java/com/mango/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.widget.xlist; +package com.mango.xchat_android_library.widget.xlist; import android.graphics.Canvas; import android.graphics.Rect; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarRecyclerView.java b/library/src/main/java/com/mango/xchat_android_library/widget/xlist/FamiliarRecyclerView.java similarity index 99% rename from library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarRecyclerView.java rename to library/src/main/java/com/mango/xchat_android_library/widget/xlist/FamiliarRecyclerView.java index c277b9b7e..ebdfbd62e 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarRecyclerView.java +++ b/library/src/main/java/com/mango/xchat_android_library/widget/xlist/FamiliarRecyclerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.widget.xlist; +package com.mango.xchat_android_library.widget.xlist; import android.content.Context; import android.content.res.TypedArray; @@ -12,7 +12,7 @@ import android.util.AttributeSet; import android.view.View; -import com.yizhuan.xchat_android_library.R; +import com.mango.xchat_android_library.R; import java.util.ArrayList; import java.util.List; diff --git a/library/src/main/res/layout/swipeback_layout.xml b/library/src/main/res/layout/swipeback_layout.xml index 8b90cbd60..d107daeba 100644 --- a/library/src/main/res/layout/swipeback_layout.xml +++ b/library/src/main/res/layout/swipeback_layout.xml @@ -1,5 +1,5 @@ -